diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 0b718747d9d..a51284e3a1f 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,4 +1,5 @@
 {
+  "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
   "extensions": [
     "rust-lang.rust-analyzer",
     "bungcip.better-toml",
diff --git a/.github/workflows/compile-queries.yml b/.github/workflows/compile-queries.yml
index 38452f97d36..945515c0c53 100644
--- a/.github/workflows/compile-queries.yml
+++ b/.github/workflows/compile-queries.yml
@@ -7,6 +7,11 @@ on:
       - "rc/*"
       - "codeql-cli-*"
   pull_request:
+    paths:
+      - '**.ql'
+      - '**.qll'
+      - '**/qlpack.yml'
+      - '**.dbscheme'
 
 permissions:
   contents: read
@@ -33,9 +38,9 @@ jobs:
         # run with --check-only if running in a PR (github.sha != main)
         if : ${{ github.event_name == 'pull_request' }}
         shell: bash
-        run: codeql query compile -q -j0 */ql/{src,examples} --keep-going --warnings=error --check-only --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}" --compilation-cache-size=500
+        run: codeql query compile -q -j0 */ql/{src,examples} --keep-going --warnings=error --check-only --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}" --compilation-cache-size=500 --ram=56000
       - name: compile queries - full
         # do full compile if running on main - this populates the cache
         if : ${{ github.event_name != 'pull_request' }}
         shell: bash
-        run: codeql query compile -q -j0 */ql/{src,examples} --keep-going --warnings=error --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}" --compilation-cache-size=500
+        run: codeql query compile -q -j0 */ql/{src,examples} --keep-going --warnings=error --compilation-cache "${{ steps.query-cache.outputs.cache-dir }}" --compilation-cache-size=500 --ram=56000
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 2b677468025..c0bd4abd0d0 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -72,7 +72,7 @@ repos:
 
       - id: rust-codegen
         name: Run Rust checked in code generation
-        files: ^misc/codegen/|^rust/(schema.py$|codegen/|.*/generated/|ql/lib/(rust\.dbscheme$|codeql/rust/elements)|\.generated.list)
+        files: ^misc/codegen/|^rust/(prefix\.dbscheme|schema/|codegen/|.*/generated/|ql/lib/(rust\.dbscheme$|codeql/rust/elements)|\.generated.list)
         language: system
         entry: bazel run //rust/codegen -- --quiet
         pass_filenames: false
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 68df2f6f498..5d9a735d379 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -38,6 +38,93 @@
                 "command": "${config:python.pythonPath}",
             },
             "problemMatcher": []
+        },
+        {
+            "label": "Create query change note",
+            "type": "process",
+            "command": "python3",
+            "args": [
+                "misc/scripts/create-change-note.py",
+                "${input:language}",
+                "src",
+                "${input:name}",
+                "${input:categoryQuery}"
+            ],
+            "presentation": {
+                "reveal": "never",
+                "close": true
+            },
+            "problemMatcher": []
+        },
+                {
+            "label": "Create library change note",
+            "type": "process",
+            "command": "python3",
+            "args": [
+                "misc/scripts/create-change-note.py",
+                "${input:language}",
+                "lib",
+                "${input:name}",
+                "${input:categoryLibrary}"
+            ],
+            "presentation": {
+                "reveal": "never",
+                "close": true
+            },
+            "problemMatcher": []
+        }
+    ],
+    "inputs": [
+        {
+            "type": "pickString",
+            "id": "language",
+            "description": "Language",
+            "options":
+            [
+                "go",
+                "java",
+                "javascript",
+                "cpp",
+                "csharp",
+                "python",
+                "ruby",
+                "rust",
+                "swift",
+            ]
+        },
+        {
+            "type": "promptString",
+            "id": "name",
+            "description": "Short name (kebab-case)"
+        },
+        {
+            "type": "pickString",
+            "id": "categoryQuery",
+            "description": "Category (query change)",
+            "options":
+            [
+                "breaking",
+                "deprecated",
+                "newQuery",
+                "queryMetadata",
+                "majorAnalysis",
+                "minorAnalysis",
+                "fix",
+            ]
+        },
+                {
+            "type": "pickString",
+            "id": "categoryLibrary",
+            "description": "Category (library change)",
+            "options":
+            [
+                "breaking",
+                "deprecated",
+                "feature",
+                "majorAnalysis",
+                "minorAnalysis",
+                "fix",
+            ]
         }
     ]
 }
diff --git a/2024-11-25-ts57.md b/2024-11-25-ts57.md
new file mode 100644
index 00000000000..3a92872d6d6
--- /dev/null
+++ b/2024-11-25-ts57.md
@@ -0,0 +1,4 @@
+---
+category: majorAnalysis
+---
+* Added support for TypeScript 5.7.
diff --git a/CODEOWNERS b/CODEOWNERS
index 6e1c975ace7..1912a138758 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -42,3 +42,6 @@ MODULE.bazel @github/codeql-ci-reviewers
 # Misc
 /misc/scripts/accept-expected-changes-from-ci.py @RasmusWL
 /misc/scripts/generate-code-scanning-query-list.py @RasmusWL
+
+# .devcontainer
+/.devcontainer/ @github/codeql-ci-reviewers
diff --git a/Cargo.lock b/Cargo.lock
index 1d5b8824c84..65a77b316c9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -381,8 +381,10 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "argfile",
+ "chrono",
  "clap",
  "codeql-extractor",
+ "dunce",
  "figment",
  "glob",
  "itertools 0.13.0",
@@ -404,6 +406,7 @@ dependencies = [
  "ra_ap_vfs",
  "rust-extractor-macros",
  "serde",
+ "serde_json",
  "serde_with",
  "stderrlog",
  "triomphe",
@@ -540,6 +543,12 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1"
 
+[[package]]
+name = "dunce"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
+
 [[package]]
 name = "either"
 version = "1.13.0"
@@ -2034,9 +2043,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.132"
+version = "1.0.133"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
+checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
 dependencies = [
  "itoa",
  "memchr",
diff --git a/MODULE.bazel b/MODULE.bazel
index 13c801520b0..08a4aaa78af 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -68,7 +68,7 @@ use_repo(py_deps, "vendor__anyhow-1.0.44", "vendor__cc-1.0.70", "vendor__clap-2.
 # deps for ruby+rust
 # keep in sync by running `misc/bazel/3rdparty/update_cargo_deps.sh`
 tree_sitter_extractors_deps = use_extension("//misc/bazel/3rdparty:tree_sitter_extractors_extension.bzl", "r")
-use_repo(tree_sitter_extractors_deps, "vendor__anyhow-1.0.93", "vendor__argfile-0.2.1", "vendor__chrono-0.4.38", "vendor__clap-4.5.20", "vendor__encoding-0.2.33", "vendor__figment-0.10.19", "vendor__flate2-1.0.34", "vendor__glob-0.3.1", "vendor__globset-0.4.15", "vendor__itertools-0.10.5", "vendor__itertools-0.13.0", "vendor__lazy_static-1.5.0", "vendor__log-0.4.22", "vendor__num-traits-0.2.19", "vendor__num_cpus-1.16.0", "vendor__proc-macro2-1.0.89", "vendor__quote-1.0.37", "vendor__ra_ap_base_db-0.0.232", "vendor__ra_ap_cfg-0.0.232", "vendor__ra_ap_hir-0.0.232", "vendor__ra_ap_hir_def-0.0.232", "vendor__ra_ap_hir_expand-0.0.232", "vendor__ra_ap_ide_db-0.0.232", "vendor__ra_ap_intern-0.0.232", "vendor__ra_ap_load-cargo-0.0.232", "vendor__ra_ap_parser-0.0.232", "vendor__ra_ap_paths-0.0.232", "vendor__ra_ap_project_model-0.0.232", "vendor__ra_ap_span-0.0.232", "vendor__ra_ap_syntax-0.0.232", "vendor__ra_ap_vfs-0.0.232", "vendor__rand-0.8.5", "vendor__rayon-1.10.0", "vendor__regex-1.11.1", "vendor__serde-1.0.214", "vendor__serde_json-1.0.132", "vendor__serde_with-3.11.0", "vendor__stderrlog-0.6.0", "vendor__syn-2.0.87", "vendor__tracing-0.1.40", "vendor__tracing-subscriber-0.3.18", "vendor__tree-sitter-0.24.4", "vendor__tree-sitter-embedded-template-0.23.2", "vendor__tree-sitter-json-0.24.8", "vendor__tree-sitter-ql-0.23.1", "vendor__tree-sitter-ruby-0.23.1", "vendor__triomphe-0.1.14", "vendor__ungrammar-1.16.1")
+use_repo(tree_sitter_extractors_deps, "vendor__anyhow-1.0.93", "vendor__argfile-0.2.1", "vendor__chrono-0.4.38", "vendor__clap-4.5.20", "vendor__dunce-1.0.5", "vendor__encoding-0.2.33", "vendor__figment-0.10.19", "vendor__flate2-1.0.34", "vendor__glob-0.3.1", "vendor__globset-0.4.15", "vendor__itertools-0.10.5", "vendor__itertools-0.13.0", "vendor__lazy_static-1.5.0", "vendor__log-0.4.22", "vendor__num-traits-0.2.19", "vendor__num_cpus-1.16.0", "vendor__proc-macro2-1.0.89", "vendor__quote-1.0.37", "vendor__ra_ap_base_db-0.0.232", "vendor__ra_ap_cfg-0.0.232", "vendor__ra_ap_hir-0.0.232", "vendor__ra_ap_hir_def-0.0.232", "vendor__ra_ap_hir_expand-0.0.232", "vendor__ra_ap_ide_db-0.0.232", "vendor__ra_ap_intern-0.0.232", "vendor__ra_ap_load-cargo-0.0.232", "vendor__ra_ap_parser-0.0.232", "vendor__ra_ap_paths-0.0.232", "vendor__ra_ap_project_model-0.0.232", "vendor__ra_ap_span-0.0.232", "vendor__ra_ap_syntax-0.0.232", "vendor__ra_ap_vfs-0.0.232", "vendor__rand-0.8.5", "vendor__rayon-1.10.0", "vendor__regex-1.11.1", "vendor__serde-1.0.214", "vendor__serde_json-1.0.133", "vendor__serde_with-3.11.0", "vendor__stderrlog-0.6.0", "vendor__syn-2.0.87", "vendor__tracing-0.1.40", "vendor__tracing-subscriber-0.3.18", "vendor__tree-sitter-0.24.4", "vendor__tree-sitter-embedded-template-0.23.2", "vendor__tree-sitter-json-0.24.8", "vendor__tree-sitter-ql-0.23.1", "vendor__tree-sitter-ruby-0.23.1", "vendor__triomphe-0.1.14", "vendor__ungrammar-1.16.1")
 
 dotnet = use_extension("@rules_dotnet//dotnet:extensions.bzl", "dotnet")
 dotnet.toolchain(dotnet_version = "9.0.100")
diff --git a/config/identical-files.json b/config/identical-files.json
index c4436872b9a..579a22379e8 100644
--- a/config/identical-files.json
+++ b/config/identical-files.json
@@ -1,58 +1,4 @@
 {
-  "DataFlow Java/C++/C#/Go/Python/Ruby/Swift Legacy Configuration": [
-    "java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl1.qll",
-    "java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl2.qll",
-    "java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl3.qll",
-    "java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl4.qll",
-    "java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl5.qll",
-    "java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl6.qll",
-    "cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl1.qll",
-    "cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll",
-    "cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll",
-    "cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll",
-    "cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll",
-    "cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl1.qll",
-    "cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll",
-    "cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll",
-    "cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll",
-    "csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl1.qll",
-    "csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll",
-    "csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll",
-    "csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll",
-    "csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll",
-    "go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl1.qll",
-    "go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl2.qll",
-    "python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl1.qll",
-    "python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl2.qll",
-    "python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl3.qll",
-    "python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl4.qll",
-    "ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl1.qll",
-    "ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl2.qll",
-    "swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl1.qll"
-  ],
-  "TaintTracking Legacy Configuration Java/C++/C#/Go/Python/Ruby/Swift": [
-    "cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking1/TaintTrackingImpl.qll",
-    "cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking2/TaintTrackingImpl.qll",
-    "cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking1/TaintTrackingImpl.qll",
-    "cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking2/TaintTrackingImpl.qll",
-    "cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking3/TaintTrackingImpl.qll",
-    "csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking1/TaintTrackingImpl.qll",
-    "csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking2/TaintTrackingImpl.qll",
-    "csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking3/TaintTrackingImpl.qll",
-    "csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking4/TaintTrackingImpl.qll",
-    "csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking5/TaintTrackingImpl.qll",
-    "go/ql/lib/semmle/go/dataflow/internal/tainttracking1/TaintTrackingImpl.qll",
-    "go/ql/lib/semmle/go/dataflow/internal/tainttracking2/TaintTrackingImpl.qll",
-    "java/ql/lib/semmle/code/java/dataflow/internal/tainttracking1/TaintTrackingImpl.qll",
-    "java/ql/lib/semmle/code/java/dataflow/internal/tainttracking2/TaintTrackingImpl.qll",
-    "java/ql/lib/semmle/code/java/dataflow/internal/tainttracking3/TaintTrackingImpl.qll",
-    "python/ql/lib/semmle/python/dataflow/new/internal/tainttracking1/TaintTrackingImpl.qll",
-    "python/ql/lib/semmle/python/dataflow/new/internal/tainttracking2/TaintTrackingImpl.qll",
-    "python/ql/lib/semmle/python/dataflow/new/internal/tainttracking3/TaintTrackingImpl.qll",
-    "python/ql/lib/semmle/python/dataflow/new/internal/tainttracking4/TaintTrackingImpl.qll",
-    "ruby/ql/lib/codeql/ruby/dataflow/internal/tainttracking1/TaintTrackingImpl.qll",
-    "swift/ql/lib/codeql/swift/dataflow/internal/tainttracking1/TaintTrackingImpl.qll"
-  ],
   "SsaReadPosition Java/C#": [
     "java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SsaReadPositionCommon.qll",
     "csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/SsaReadPositionCommon.qll"
diff --git a/cpp/downgrades/f0156f5f88ab5967c79162012c20f30600ca5ebf/old.dbscheme b/cpp/downgrades/f0156f5f88ab5967c79162012c20f30600ca5ebf/old.dbscheme
new file mode 100644
index 00000000000..f0156f5f88a
--- /dev/null
+++ b/cpp/downgrades/f0156f5f88ab5967c79162012c20f30600ca5ebf/old.dbscheme
@@ -0,0 +1,2339 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+    int id : @externalDataElement,
+    string path : string ref,
+    int column: int ref,
+    string value : string ref
+);
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/**
+ * Information about packages that provide code used during compilation.
+ * The `id` is just a unique identifier.
+ * The `namespace` is typically the name of the package manager that
+ * provided the package (e.g. "dpkg" or "yum").
+ * The `package_name` is the name of the package, and `version` is its
+ * version (as a string).
+ */
+external_packages(
+    unique int id: @external_package,
+    string namespace : string ref,
+    string package_name : string ref,
+    string version : string ref
+);
+
+/**
+ * Holds if File `fileid` was provided by package `package`.
+ */
+header_to_external_package(
+    int fileid : @file ref,
+    int package : @external_package ref
+);
+
+/*
+ * Version history
+ */
+
+svnentries(
+    unique int id : @svnentry,
+    string revision : string ref,
+    string author : string ref,
+    date revisionDate : date ref,
+    int changeSize : int ref
+)
+
+svnaffectedfiles(
+    int id : @svnentry ref,
+    int file : @file ref,
+    string action : string ref
+)
+
+svnentrymsg(
+    unique int id : @svnentry ref,
+    string message : string ref
+)
+
+svnchurn(
+    int commit : @svnentry ref,
+    int file : @file ref,
+    int addedLines : int ref,
+    int deletedLines : int ref
+)
+
+/*
+ * C++ dbscheme
+ */
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+@location = @location_stmt | @location_expr | @location_default ;
+
+/**
+ * The location of an element that is not an expression or a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+    /** The location of an element that is not an expression or a statement. */
+    unique int id: @location_default,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_stmt(
+    /** The location of a statement. */
+    unique int id: @location_stmt,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of an expression.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_expr(
+    /** The location of an expression. */
+    unique int id: @location_expr,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+numlines(
+    int element_id: @sourceline ref,
+    int num_lines: int ref,
+    int num_code: int ref,
+    int num_comment: int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location_default ref
+);
+
+files(
+    unique int id: @file,
+    string name: string ref
+);
+
+folders(
+    unique int id: @folder,
+    string name: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+    int parent: @container ref,
+    unique int child: @container ref
+);
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+/*
+case @function.kind of
+  1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+| 6 = @builtin_function     // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+*/
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * would change the semantics of this decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @usertype.kind of
+   1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+|  5 = @typedef                       // classic C: typedef typedef type name
+|  6 = @template
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+| 14 = @using_alias                  // a using name = type style typedef
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    unique int templ_param_id: @usertype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      /* TODO | @fixedpointtype */
+      | @routinetype
+      | @ptrtomember
+      | @decltype;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_expr ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_expr ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@runtime_sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof;
+
+sizeof_bind(
+    unique int expr: @runtime_sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_stmt ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/* XML Files */
+
+xmlEncoding(unique int id: @file ref, string encoding: string ref);
+
+xmlDTDs(
+    unique int id: @xmldtd,
+    string root: string ref,
+    string publicId: string ref,
+    string systemId: string ref,
+    int fileid: @file ref
+);
+
+xmlElements(
+    unique int id: @xmlelement,
+    string name: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlAttrs(
+    unique int id: @xmlattribute,
+    int elementid: @xmlelement ref,
+    string name: string ref,
+    string value: string ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlNs(
+    int id: @xmlnamespace,
+    string prefixName: string ref,
+    string URI: string ref,
+    int fileid: @file ref
+);
+
+xmlHasNs(
+    int elementId: @xmlnamespaceable ref,
+    int nsId: @xmlnamespace ref,
+    int fileid: @file ref
+);
+
+xmlComments(
+    unique int id: @xmlcomment,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int fileid: @file ref
+);
+
+xmlChars(
+    unique int id: @xmlcharacters,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int isCDATA: int ref,
+    int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+    int xmlElement: @xmllocatable ref,
+    int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters
+              | @xmlelement
+              | @xmlcomment
+              | @xmlattribute
+              | @xmldtd
+              | @file
+              | @xmlnamespace;
diff --git a/cpp/downgrades/f0156f5f88ab5967c79162012c20f30600ca5ebf/semmlecode.cpp.dbscheme b/cpp/downgrades/f0156f5f88ab5967c79162012c20f30600ca5ebf/semmlecode.cpp.dbscheme
new file mode 100644
index 00000000000..e51fad7a243
--- /dev/null
+++ b/cpp/downgrades/f0156f5f88ab5967c79162012c20f30600ca5ebf/semmlecode.cpp.dbscheme
@@ -0,0 +1,2323 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+    int id : @externalDataElement,
+    string path : string ref,
+    int column: int ref,
+    string value : string ref
+);
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/**
+ * Information about packages that provide code used during compilation.
+ * The `id` is just a unique identifier.
+ * The `namespace` is typically the name of the package manager that
+ * provided the package (e.g. "dpkg" or "yum").
+ * The `package_name` is the name of the package, and `version` is its
+ * version (as a string).
+ */
+external_packages(
+    unique int id: @external_package,
+    string namespace : string ref,
+    string package_name : string ref,
+    string version : string ref
+);
+
+/**
+ * Holds if File `fileid` was provided by package `package`.
+ */
+header_to_external_package(
+    int fileid : @file ref,
+    int package : @external_package ref
+);
+
+/*
+ * Version history
+ */
+
+svnentries(
+    unique int id : @svnentry,
+    string revision : string ref,
+    string author : string ref,
+    date revisionDate : date ref,
+    int changeSize : int ref
+)
+
+svnaffectedfiles(
+    int id : @svnentry ref,
+    int file : @file ref,
+    string action : string ref
+)
+
+svnentrymsg(
+    unique int id : @svnentry ref,
+    string message : string ref
+)
+
+svnchurn(
+    int commit : @svnentry ref,
+    int file : @file ref,
+    int addedLines : int ref,
+    int deletedLines : int ref
+)
+
+/*
+ * C++ dbscheme
+ */
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+@location = @location_stmt | @location_expr | @location_default ;
+
+/**
+ * The location of an element that is not an expression or a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+    /** The location of an element that is not an expression or a statement. */
+    unique int id: @location_default,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_stmt(
+    /** The location of a statement. */
+    unique int id: @location_stmt,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of an expression.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_expr(
+    /** The location of an expression. */
+    unique int id: @location_expr,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+numlines(
+    int element_id: @sourceline ref,
+    int num_lines: int ref,
+    int num_code: int ref,
+    int num_comment: int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location_default ref
+);
+
+files(
+    unique int id: @file,
+    string name: string ref
+);
+
+folders(
+    unique int id: @folder,
+    string name: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+    int parent: @container ref,
+    unique int child: @container ref
+);
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+/*
+case @function.kind of
+  1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+| 6 = @builtin_function     // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+*/
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * would change the semantics of this decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @usertype.kind of
+   1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+|  5 = @typedef                       // classic C: typedef typedef type name
+|  6 = @template
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+| 14 = @using_alias                  // a using name = type style typedef
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    unique int templ_param_id: @usertype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      /* TODO | @fixedpointtype */
+      | @routinetype
+      | @ptrtomember
+      | @decltype;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_expr ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_expr ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@runtime_sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof;
+
+sizeof_bind(
+    unique int expr: @runtime_sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_stmt ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/* XML Files */
+
+xmlEncoding(unique int id: @file ref, string encoding: string ref);
+
+xmlDTDs(
+    unique int id: @xmldtd,
+    string root: string ref,
+    string publicId: string ref,
+    string systemId: string ref,
+    int fileid: @file ref
+);
+
+xmlElements(
+    unique int id: @xmlelement,
+    string name: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlAttrs(
+    unique int id: @xmlattribute,
+    int elementid: @xmlelement ref,
+    string name: string ref,
+    string value: string ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlNs(
+    int id: @xmlnamespace,
+    string prefixName: string ref,
+    string URI: string ref,
+    int fileid: @file ref
+);
+
+xmlHasNs(
+    int elementId: @xmlnamespaceable ref,
+    int nsId: @xmlnamespace ref,
+    int fileid: @file ref
+);
+
+xmlComments(
+    unique int id: @xmlcomment,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int fileid: @file ref
+);
+
+xmlChars(
+    unique int id: @xmlcharacters,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int isCDATA: int ref,
+    int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+    int xmlElement: @xmllocatable ref,
+    int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters
+              | @xmlelement
+              | @xmlcomment
+              | @xmlattribute
+              | @xmldtd
+              | @file
+              | @xmlnamespace;
diff --git a/cpp/downgrades/f0156f5f88ab5967c79162012c20f30600ca5ebf/upgrade.properties b/cpp/downgrades/f0156f5f88ab5967c79162012c20f30600ca5ebf/upgrade.properties
new file mode 100644
index 00000000000..cf362f384da
--- /dev/null
+++ b/cpp/downgrades/f0156f5f88ab5967c79162012c20f30600ca5ebf/upgrade.properties
@@ -0,0 +1,3 @@
+description: Implement compilation_build_mode/2
+compatibility: full
+compilation_build_mode.rel: delete
diff --git a/cpp/ql/lib/change-notes/2024-11-18-throwing-functions.md b/cpp/ql/lib/change-notes/2024-11-18-throwing-functions.md
new file mode 100644
index 00000000000..73b358a0e1f
--- /dev/null
+++ b/cpp/ql/lib/change-notes/2024-11-18-throwing-functions.md
@@ -0,0 +1,4 @@
+---
+category: deprecated
+---
+* The `NonThrowing` class (`semmle.code.cpp.models.interfaces.NonThrowing`) has been deprecated. Please use the `NonCppThrowingFunction` class instead.
\ No newline at end of file
diff --git a/cpp/ql/lib/change-notes/2024-12-03-remove-dataflow-config-class-api.md b/cpp/ql/lib/change-notes/2024-12-03-remove-dataflow-config-class-api.md
new file mode 100644
index 00000000000..d09ec528c99
--- /dev/null
+++ b/cpp/ql/lib/change-notes/2024-12-03-remove-dataflow-config-class-api.md
@@ -0,0 +1,4 @@
+---
+category: breaking
+---
+* Deleted the old deprecated data flow API that was based on extending a configuration class. See https://github.blog/changelog/2023-08-14-new-dataflow-api-for-writing-custom-codeql-queries for instructions on migrating your queries to use the new API.
diff --git a/cpp/ql/lib/semmle/code/cpp/Compilation.qll b/cpp/ql/lib/semmle/code/cpp/Compilation.qll
index 1a8d90f991c..407dc31e05f 100644
--- a/cpp/ql/lib/semmle/code/cpp/Compilation.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Compilation.qll
@@ -112,4 +112,7 @@ class Compilation extends @compilation {
    * termination, but crashing due to something like a segfault is not.
    */
   predicate normalTermination() { compilation_finished(this, _, _) }
+
+  /** Holds if this compilation was compiled using the "none" build mode. */
+  predicate buildModeNone() { compilation_build_mode(this, 0) }
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/DataFlow.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/DataFlow.qll
index 505b2e190e5..a478da5193e 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/DataFlow.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/DataFlow.qll
@@ -29,5 +29,5 @@ deprecated module DataFlow {
   private import semmle.code.cpp.dataflow.internal.DataFlowImplSpecific
   private import codeql.dataflow.DataFlow
   import DataFlowMake<Location, CppOldDataFlow>
-  import semmle.code.cpp.dataflow.internal.DataFlowImpl1
+  import Public
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/DataFlow2.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/DataFlow2.qll
deleted file mode 100644
index 19ffa16b76c..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/DataFlow2.qll
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Provides a `DataFlow2` module, which is a copy of the `DataFlow` module. Use
- * this class when data-flow configurations must depend on each other. Two
- * classes extending `DataFlow::Configuration` should never depend on each
- * other, but one of them should instead depend on a
- * `DataFlow2::Configuration`, a `DataFlow3::Configuration`, or a
- * `DataFlow4::Configuration`.
- *
- * See `semmle.code.cpp.dataflow.DataFlow` for the full documentation.
- */
-
-import cpp
-
-/**
- * DEPRECATED: Use `semmle.code.cpp.dataflow.new.DataFlow2` instead.
- *
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) data flow analyses.
- */
-deprecated module DataFlow2 {
-  import semmle.code.cpp.dataflow.internal.DataFlowImpl2
-}
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/DataFlow3.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/DataFlow3.qll
deleted file mode 100644
index 554b2e155b4..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/DataFlow3.qll
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Provides a `DataFlow3` module, which is a copy of the `DataFlow` module. Use
- * this class when data-flow configurations must depend on each other. Two
- * classes extending `DataFlow::Configuration` should never depend on each
- * other, but one of them should instead depend on a
- * `DataFlow2::Configuration`, a `DataFlow3::Configuration`, or a
- * `DataFlow4::Configuration`.
- *
- * See `semmle.code.cpp.dataflow.DataFlow` for the full documentation.
- */
-
-import cpp
-
-/**
- * DEPRECATED: Use `semmle.code.cpp.dataflow.new.DataFlow3` instead.
- *
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) data flow analyses.
- */
-deprecated module DataFlow3 {
-  import semmle.code.cpp.dataflow.internal.DataFlowImpl3
-}
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/DataFlow4.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/DataFlow4.qll
deleted file mode 100644
index fdd4e8ab7ae..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/DataFlow4.qll
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Provides a `DataFlow4` module, which is a copy of the `DataFlow` module. Use
- * this class when data-flow configurations must depend on each other. Two
- * classes extending `DataFlow::Configuration` should never depend on each
- * other, but one of them should instead depend on a
- * `DataFlow2::Configuration`, a `DataFlow3::Configuration`, or a
- * `DataFlow4::Configuration`.
- *
- * See `semmle.code.cpp.dataflow.DataFlow` for the full documentation.
- */
-
-import cpp
-
-/**
- * DEPRECATED: Use `semmle.code.cpp.dataflow.new.DataFlow4` instead.
- *
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) data flow analyses.
- */
-deprecated module DataFlow4 {
-  import semmle.code.cpp.dataflow.internal.DataFlowImpl4
-}
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/ExternalFlow.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/ExternalFlow.qll
index 07cb2670858..49610b7c85b 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/ExternalFlow.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/ExternalFlow.qll
@@ -793,28 +793,27 @@ private Element interpretElement0(
 ) {
   (
     // Non-member functions
-    elementSpec(namespace, type, subtypes, name, signature, _) and
+    funcHasQualifiedName(result, namespace, name) and
     subtypes = false and
     type = "" and
     (
       elementSpecMatchesSignature(result, namespace, type, subtypes, name, signature)
       or
       signature = "" and
-      elementSpec(namespace, type, subtypes, name, "", _) and
-      funcHasQualifiedName(result, namespace, name)
+      elementSpec(namespace, type, subtypes, name, signature, _)
     )
     or
     // Member functions
     exists(Class namedClass, Class classWithMethod |
+      hasClassAndName(classWithMethod, result, name) and
+      classHasQualifiedName(namedClass, namespace, type)
+    |
       (
-        elementSpecMatchesSignature(result, namespace, type, subtypes, name, signature) and
-        hasClassAndName(classWithMethod, result, name)
+        elementSpecMatchesSignature(result, namespace, type, subtypes, name, signature)
         or
         signature = "" and
-        elementSpec(namespace, type, subtypes, name, "", _) and
-        hasClassAndName(classWithMethod, result, name)
+        elementSpec(namespace, type, subtypes, name, "", _)
       ) and
-      classHasQualifiedName(namedClass, namespace, type) and
       (
         // member declared in the named type or a subtype of it
         subtypes = true and
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/RecursionPrevention.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/RecursionPrevention.qll
deleted file mode 100644
index 2d8b52f8622..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/RecursionPrevention.qll
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * DEPRECATED: Recursion through `DataFlow::Configuration` is impossible in
- * any supported tooling. There is no need for this module because it's
- * impossible to accidentally depend on recursion through
- * `DataFlow::Configuration` in current releases.
- *
- * When this module is imported, recursive use of `DataFlow::Configuration` is
- * disallowed. Importing this module will guarantee the absence of such
- * recursion, which is unsupported and will be unconditionally disallowed in a
- * future release.
- *
- * Recursive use of `DataFlow{2..4}::Configuration` is always disallowed, so no
- * import is needed for those.
- */
-
-import cpp
-private import semmle.code.cpp.dataflow.DataFlow
-
-/**
- * This class exists to prevent mutual recursion between the user-overridden
- * member predicates of `Configuration` and the rest of the data-flow library.
- * Good performance cannot be guaranteed in the presence of such recursion, so
- * it should be replaced by using more than one copy of the data flow library.
- * Four copies are available: `DataFlow` through `DataFlow4`.
- */
-abstract private class ConfigurationRecursionPrevention extends DataFlow::Configuration {
-  bindingset[this]
-  ConfigurationRecursionPrevention() { any() }
-
-  override predicate hasFlow(DataFlow::Node source, DataFlow::Node sink) {
-    strictcount(DataFlow::Node n | this.isSource(n)) < 0
-    or
-    strictcount(DataFlow::Node n | this.isSink(n)) < 0
-    or
-    strictcount(DataFlow::Node n1, DataFlow::Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0
-    or
-    super.hasFlow(source, sink)
-  }
-}
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/TaintTracking.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/TaintTracking.qll
index 1f93e2a74df..36af8d9660b 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/TaintTracking.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/TaintTracking.qll
@@ -16,7 +16,6 @@
  */
 
 import semmle.code.cpp.dataflow.DataFlow
-import semmle.code.cpp.dataflow.DataFlow2
 
 /**
  * DEPRECATED: Use `semmle.code.cpp.dataflow.new.TaintTracking` instead.
@@ -25,10 +24,9 @@ import semmle.code.cpp.dataflow.DataFlow2
  * global (inter-procedural) taint-tracking analyses.
  */
 deprecated module TaintTracking {
-  import semmle.code.cpp.dataflow.internal.tainttracking1.TaintTrackingParameter::Public
+  import semmle.code.cpp.dataflow.internal.TaintTrackingUtil
   private import semmle.code.cpp.dataflow.internal.DataFlowImplSpecific
   private import semmle.code.cpp.dataflow.internal.TaintTrackingImplSpecific
   private import codeql.dataflow.TaintTracking
   import TaintFlowMake<Location, CppOldDataFlow, CppOldTaintTracking>
-  import semmle.code.cpp.dataflow.internal.tainttracking1.TaintTrackingImpl
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/TaintTracking2.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/TaintTracking2.qll
deleted file mode 100644
index dce00316cbb..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/TaintTracking2.qll
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Provides a `TaintTracking2` module, which is a copy of the `TaintTracking`
- * module. Use this class when data-flow configurations or taint-tracking
- * configurations must depend on each other. Two classes extending
- * `DataFlow::Configuration` should never depend on each other, but one of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`. The
- * `TaintTracking::Configuration` class extends `DataFlow::Configuration`, and
- * `TaintTracking2::Configuration` extends `DataFlow2::Configuration`.
- *
- * See `semmle.code.cpp.dataflow.TaintTracking` for the full documentation.
- */
-
-/**
- * DEPRECATED: Use `semmle.code.cpp.dataflow.new.TaintTracking2` instead.
- *
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) taint-tracking analyses.
- */
-deprecated module TaintTracking2 {
-  import semmle.code.cpp.dataflow.internal.tainttracking2.TaintTrackingImpl
-}
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl1.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl1.qll
deleted file mode 100644
index 17def0c431d..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl1.qll
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides a `Configuration` class backwards-compatible interface to the data
- * flow library.
- */
-
-private import DataFlowImplCommon
-private import DataFlowImplSpecific::Private
-import DataFlowImplSpecific::Public
-private import DataFlowImpl
-import DataFlowImplCommonPublic
-deprecated import FlowStateString
-private import codeql.util.Unit
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural data flow analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the global data flow library must define its own unique extension
- * of this abstract class. To create a configuration, extend this class with
- * a subclass whose characteristic predicate is a unique singleton string.
- * For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends DataFlow::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isBarrier`.
- *   // Optionally override `isAdditionalFlowStep`.
- * }
- * ```
- * Conceptually, this defines a graph where the nodes are `DataFlow::Node`s and
- * the edges are those data-flow steps that preserve the value of the node
- * along with any additional edges defined by `isAdditionalFlowStep`.
- * Specifying nodes in `isBarrier` will remove those nodes from the graph, and
- * specifying nodes in `isBarrierIn` and/or `isBarrierOut` will remove in-going
- * and/or out-going edges from those nodes, respectively.
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but two classes extending
- * `DataFlow::Configuration` should never depend on each other. One of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`.
- */
-abstract deprecated class Configuration extends string {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant data flow source.
-   */
-  predicate isSource(Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant data flow source with the given initial
-   * `state`.
-   */
-  predicate isSource(Node source, FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink.
-   */
-  predicate isSink(Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink accepting `state`.
-   */
-  predicate isSink(Node sink, FlowState state) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited. This completely removes
-   * `node` from the data flow graph.
-   */
-  predicate isBarrier(Node node) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited when the flow state is
-   * `state`.
-   */
-  predicate isBarrier(Node node, FlowState state) { none() }
-
-  /** Holds if data flow into `node` is prohibited. */
-  predicate isBarrierIn(Node node) { none() }
-
-  /** Holds if data flow out of `node` is prohibited. */
-  predicate isBarrierOut(Node node) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   */
-  predicate isAdditionalFlowStep(Node node1, Node node2) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
-    none()
-  }
-
-  /**
-   * Holds if an arbitrary number of implicit read steps of content `c` may be
-   * taken at `node`.
-   */
-  predicate allowImplicitRead(Node node, ContentSet c) { none() }
-
-  /**
-   * Gets the virtual dispatch branching limit when calculating field flow.
-   * This can be overridden to a smaller value to improve performance (a
-   * value of 0 disables field flow), or a larger value to get more results.
-   */
-  int fieldFlowBranchLimit() { result = 2 }
-
-  /**
-   * Gets a data flow configuration feature to add restrictions to the set of
-   * valid flow paths.
-   *
-   * - `FeatureHasSourceCallContext`:
-   *    Assume that sources have some existing call context to disallow
-   *    conflicting return-flow directly following the source.
-   * - `FeatureHasSinkCallContext`:
-   *    Assume that sinks have some existing call context to disallow
-   *    conflicting argument-to-parameter flow directly preceding the sink.
-   * - `FeatureEqualSourceSinkCallContext`:
-   *    Implies both of the above and additionally ensures that the entire flow
-   *    path preserves the call context.
-   *
-   * These features are generally not relevant for typical end-to-end data flow
-   * queries, but should only be used for constructing paths that need to
-   * somehow be pluggable in another path context.
-   */
-  FlowFeature getAFeature() { none() }
-
-  /** Holds if sources should be grouped in the result of `hasFlowPath`. */
-  predicate sourceGrouping(Node source, string sourceGroup) { none() }
-
-  /** Holds if sinks should be grouped in the result of `hasFlowPath`. */
-  predicate sinkGrouping(Node sink, string sinkGroup) { none() }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   */
-  predicate hasFlow(Node source, Node sink) { hasFlow(source, sink, this) }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   *
-   * The corresponding paths are generated from the end-points and the graph
-   * included in the module `PathGraph`.
-   */
-  predicate hasFlowPath(PathNode source, PathNode sink) { hasFlowPath(source, sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowTo(Node sink) { hasFlowTo(sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowToExpr(DataFlowExpr sink) { this.hasFlowTo(exprNode(sink)) }
-
-  /**
-   * Holds if hidden nodes should be included in the data flow graph.
-   *
-   * This feature should only be used for debugging or when the data flow graph
-   * is not visualized (for example in a `path-problem` query).
-   */
-  predicate includeHiddenNodes() { none() }
-}
-
-/**
- * This class exists to prevent mutual recursion between the user-overridden
- * member predicates of `Configuration` and the rest of the data-flow library.
- * Good performance cannot be guaranteed in the presence of such recursion, so
- * it should be replaced by using more than one copy of the data flow library.
- */
-abstract deprecated private class ConfigurationRecursionPrevention extends Configuration {
-  bindingset[this]
-  ConfigurationRecursionPrevention() { any() }
-
-  override predicate hasFlow(Node source, Node sink) {
-    strictcount(Node n | this.isSource(n)) < 0
-    or
-    strictcount(Node n | this.isSource(n, _)) < 0
-    or
-    strictcount(Node n | this.isSink(n)) < 0
-    or
-    strictcount(Node n | this.isSink(n, _)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, _, n2, _)) < 0
-    or
-    super.hasFlow(source, sink)
-  }
-}
-
-deprecated private FlowState relevantState(Configuration config) {
-  config.isSource(_, result) or
-  config.isSink(_, result) or
-  config.isBarrier(_, result) or
-  config.isAdditionalFlowStep(_, result, _, _) or
-  config.isAdditionalFlowStep(_, _, _, result)
-}
-
-private newtype TConfigState =
-  deprecated TMkConfigState(Configuration config, FlowState state) {
-    state = relevantState(config) or state instanceof FlowStateEmpty
-  }
-
-deprecated private Configuration getConfig(TConfigState state) { state = TMkConfigState(result, _) }
-
-deprecated private FlowState getState(TConfigState state) { state = TMkConfigState(_, result) }
-
-deprecated private predicate singleConfiguration() { 1 = strictcount(Configuration c) }
-
-deprecated private module Config implements FullStateConfigSig {
-  class FlowState = TConfigState;
-
-  predicate isSource(Node source, FlowState state) {
-    getConfig(state).isSource(source, getState(state))
-    or
-    getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isSink(Node sink) { none() }
-
-  predicate isSink(Node sink, FlowState state) {
-    getConfig(state).isSink(sink, getState(state))
-    or
-    getConfig(state).isSink(sink) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isBarrier(Node node) { none() }
-
-  predicate isBarrier(Node node, FlowState state) {
-    getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node)
-  }
-
-  predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
-
-  predicate isBarrierOut(Node node) { any(Configuration config).isBarrierOut(node) }
-
-  predicate isBarrierIn(Node node, FlowState state) { none() }
-
-  predicate isBarrierOut(Node node, FlowState state) { none() }
-
-  predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
-    singleConfiguration() and
-    any(Configuration config).isAdditionalFlowStep(node1, node2) and
-    model = ""
-  }
-
-  predicate isAdditionalFlowStep(
-    Node node1, FlowState state1, Node node2, FlowState state2, string model
-  ) {
-    getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1) and
-    model = ""
-    or
-    not singleConfiguration() and
-    getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1 and
-    model = ""
-  }
-
-  predicate allowImplicitRead(Node node, ContentSet c) {
-    any(Configuration config).allowImplicitRead(node, c)
-  }
-
-  predicate neverSkip(Node node) { none() }
-
-  int fieldFlowBranchLimit() { result = min(any(Configuration config).fieldFlowBranchLimit()) }
-
-  int accessPathLimit() { result = 5 }
-
-  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
-
-  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
-
-  predicate observeDiffInformedIncrementalMode() { none() }
-}
-
-deprecated private import Impl<Config> as I
-
-/**
- * A `Node` augmented with a call context (except for sinks), an access path, and a configuration.
- * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
- */
-deprecated class PathNode instanceof I::PathNode {
-  /** Gets a textual representation of this element. */
-  final string toString() { result = super.toString() }
-
-  /**
-   * Gets a textual representation of this element, including a textual
-   * representation of the call context.
-   */
-  final string toStringWithContext() { result = super.toStringWithContext() }
-
-  /**
-   * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
-   * For more information, see
-   * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
-   */
-  final predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    super.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-
-  /** Gets the underlying `Node`. */
-  final Node getNode() { result = super.getNode() }
-
-  /** Gets the `FlowState` of this node. */
-  deprecated final FlowState getState() { result = getState(super.getState()) }
-
-  /** Gets the associated configuration. */
-  deprecated final Configuration getConfiguration() { result = getConfig(super.getState()) }
-
-  /** Gets a successor of this node, if any. */
-  final PathNode getASuccessor() { result = super.getASuccessor() }
-
-  /** Holds if this node is a source. */
-  final predicate isSource() { super.isSource() }
-
-  /** Holds if this node is a grouping of source nodes. */
-  final predicate isSourceGroup(string group) { super.isSourceGroup(group) }
-
-  /** Holds if this node is a grouping of sink nodes. */
-  final predicate isSinkGroup(string group) { super.isSinkGroup(group) }
-}
-
-deprecated module PathGraph = I::PathGraph;
-
-deprecated private predicate hasFlow(Node source, Node sink, Configuration config) {
-  exists(PathNode source0, PathNode sink0 |
-    hasFlowPath(source0, sink0, config) and
-    source0.getNode() = source and
-    sink0.getNode() = sink
-  )
-}
-
-deprecated private predicate hasFlowPath(PathNode source, PathNode sink, Configuration config) {
-  I::flowPath(source, sink) and source.getConfiguration() = config
-}
-
-deprecated private predicate hasFlowTo(Node sink, Configuration config) { hasFlow(_, sink, config) }
-
-deprecated predicate flowsTo = hasFlow/3;
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll
deleted file mode 100644
index 17def0c431d..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides a `Configuration` class backwards-compatible interface to the data
- * flow library.
- */
-
-private import DataFlowImplCommon
-private import DataFlowImplSpecific::Private
-import DataFlowImplSpecific::Public
-private import DataFlowImpl
-import DataFlowImplCommonPublic
-deprecated import FlowStateString
-private import codeql.util.Unit
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural data flow analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the global data flow library must define its own unique extension
- * of this abstract class. To create a configuration, extend this class with
- * a subclass whose characteristic predicate is a unique singleton string.
- * For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends DataFlow::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isBarrier`.
- *   // Optionally override `isAdditionalFlowStep`.
- * }
- * ```
- * Conceptually, this defines a graph where the nodes are `DataFlow::Node`s and
- * the edges are those data-flow steps that preserve the value of the node
- * along with any additional edges defined by `isAdditionalFlowStep`.
- * Specifying nodes in `isBarrier` will remove those nodes from the graph, and
- * specifying nodes in `isBarrierIn` and/or `isBarrierOut` will remove in-going
- * and/or out-going edges from those nodes, respectively.
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but two classes extending
- * `DataFlow::Configuration` should never depend on each other. One of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`.
- */
-abstract deprecated class Configuration extends string {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant data flow source.
-   */
-  predicate isSource(Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant data flow source with the given initial
-   * `state`.
-   */
-  predicate isSource(Node source, FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink.
-   */
-  predicate isSink(Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink accepting `state`.
-   */
-  predicate isSink(Node sink, FlowState state) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited. This completely removes
-   * `node` from the data flow graph.
-   */
-  predicate isBarrier(Node node) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited when the flow state is
-   * `state`.
-   */
-  predicate isBarrier(Node node, FlowState state) { none() }
-
-  /** Holds if data flow into `node` is prohibited. */
-  predicate isBarrierIn(Node node) { none() }
-
-  /** Holds if data flow out of `node` is prohibited. */
-  predicate isBarrierOut(Node node) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   */
-  predicate isAdditionalFlowStep(Node node1, Node node2) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
-    none()
-  }
-
-  /**
-   * Holds if an arbitrary number of implicit read steps of content `c` may be
-   * taken at `node`.
-   */
-  predicate allowImplicitRead(Node node, ContentSet c) { none() }
-
-  /**
-   * Gets the virtual dispatch branching limit when calculating field flow.
-   * This can be overridden to a smaller value to improve performance (a
-   * value of 0 disables field flow), or a larger value to get more results.
-   */
-  int fieldFlowBranchLimit() { result = 2 }
-
-  /**
-   * Gets a data flow configuration feature to add restrictions to the set of
-   * valid flow paths.
-   *
-   * - `FeatureHasSourceCallContext`:
-   *    Assume that sources have some existing call context to disallow
-   *    conflicting return-flow directly following the source.
-   * - `FeatureHasSinkCallContext`:
-   *    Assume that sinks have some existing call context to disallow
-   *    conflicting argument-to-parameter flow directly preceding the sink.
-   * - `FeatureEqualSourceSinkCallContext`:
-   *    Implies both of the above and additionally ensures that the entire flow
-   *    path preserves the call context.
-   *
-   * These features are generally not relevant for typical end-to-end data flow
-   * queries, but should only be used for constructing paths that need to
-   * somehow be pluggable in another path context.
-   */
-  FlowFeature getAFeature() { none() }
-
-  /** Holds if sources should be grouped in the result of `hasFlowPath`. */
-  predicate sourceGrouping(Node source, string sourceGroup) { none() }
-
-  /** Holds if sinks should be grouped in the result of `hasFlowPath`. */
-  predicate sinkGrouping(Node sink, string sinkGroup) { none() }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   */
-  predicate hasFlow(Node source, Node sink) { hasFlow(source, sink, this) }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   *
-   * The corresponding paths are generated from the end-points and the graph
-   * included in the module `PathGraph`.
-   */
-  predicate hasFlowPath(PathNode source, PathNode sink) { hasFlowPath(source, sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowTo(Node sink) { hasFlowTo(sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowToExpr(DataFlowExpr sink) { this.hasFlowTo(exprNode(sink)) }
-
-  /**
-   * Holds if hidden nodes should be included in the data flow graph.
-   *
-   * This feature should only be used for debugging or when the data flow graph
-   * is not visualized (for example in a `path-problem` query).
-   */
-  predicate includeHiddenNodes() { none() }
-}
-
-/**
- * This class exists to prevent mutual recursion between the user-overridden
- * member predicates of `Configuration` and the rest of the data-flow library.
- * Good performance cannot be guaranteed in the presence of such recursion, so
- * it should be replaced by using more than one copy of the data flow library.
- */
-abstract deprecated private class ConfigurationRecursionPrevention extends Configuration {
-  bindingset[this]
-  ConfigurationRecursionPrevention() { any() }
-
-  override predicate hasFlow(Node source, Node sink) {
-    strictcount(Node n | this.isSource(n)) < 0
-    or
-    strictcount(Node n | this.isSource(n, _)) < 0
-    or
-    strictcount(Node n | this.isSink(n)) < 0
-    or
-    strictcount(Node n | this.isSink(n, _)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, _, n2, _)) < 0
-    or
-    super.hasFlow(source, sink)
-  }
-}
-
-deprecated private FlowState relevantState(Configuration config) {
-  config.isSource(_, result) or
-  config.isSink(_, result) or
-  config.isBarrier(_, result) or
-  config.isAdditionalFlowStep(_, result, _, _) or
-  config.isAdditionalFlowStep(_, _, _, result)
-}
-
-private newtype TConfigState =
-  deprecated TMkConfigState(Configuration config, FlowState state) {
-    state = relevantState(config) or state instanceof FlowStateEmpty
-  }
-
-deprecated private Configuration getConfig(TConfigState state) { state = TMkConfigState(result, _) }
-
-deprecated private FlowState getState(TConfigState state) { state = TMkConfigState(_, result) }
-
-deprecated private predicate singleConfiguration() { 1 = strictcount(Configuration c) }
-
-deprecated private module Config implements FullStateConfigSig {
-  class FlowState = TConfigState;
-
-  predicate isSource(Node source, FlowState state) {
-    getConfig(state).isSource(source, getState(state))
-    or
-    getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isSink(Node sink) { none() }
-
-  predicate isSink(Node sink, FlowState state) {
-    getConfig(state).isSink(sink, getState(state))
-    or
-    getConfig(state).isSink(sink) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isBarrier(Node node) { none() }
-
-  predicate isBarrier(Node node, FlowState state) {
-    getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node)
-  }
-
-  predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
-
-  predicate isBarrierOut(Node node) { any(Configuration config).isBarrierOut(node) }
-
-  predicate isBarrierIn(Node node, FlowState state) { none() }
-
-  predicate isBarrierOut(Node node, FlowState state) { none() }
-
-  predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
-    singleConfiguration() and
-    any(Configuration config).isAdditionalFlowStep(node1, node2) and
-    model = ""
-  }
-
-  predicate isAdditionalFlowStep(
-    Node node1, FlowState state1, Node node2, FlowState state2, string model
-  ) {
-    getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1) and
-    model = ""
-    or
-    not singleConfiguration() and
-    getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1 and
-    model = ""
-  }
-
-  predicate allowImplicitRead(Node node, ContentSet c) {
-    any(Configuration config).allowImplicitRead(node, c)
-  }
-
-  predicate neverSkip(Node node) { none() }
-
-  int fieldFlowBranchLimit() { result = min(any(Configuration config).fieldFlowBranchLimit()) }
-
-  int accessPathLimit() { result = 5 }
-
-  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
-
-  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
-
-  predicate observeDiffInformedIncrementalMode() { none() }
-}
-
-deprecated private import Impl<Config> as I
-
-/**
- * A `Node` augmented with a call context (except for sinks), an access path, and a configuration.
- * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
- */
-deprecated class PathNode instanceof I::PathNode {
-  /** Gets a textual representation of this element. */
-  final string toString() { result = super.toString() }
-
-  /**
-   * Gets a textual representation of this element, including a textual
-   * representation of the call context.
-   */
-  final string toStringWithContext() { result = super.toStringWithContext() }
-
-  /**
-   * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
-   * For more information, see
-   * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
-   */
-  final predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    super.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-
-  /** Gets the underlying `Node`. */
-  final Node getNode() { result = super.getNode() }
-
-  /** Gets the `FlowState` of this node. */
-  deprecated final FlowState getState() { result = getState(super.getState()) }
-
-  /** Gets the associated configuration. */
-  deprecated final Configuration getConfiguration() { result = getConfig(super.getState()) }
-
-  /** Gets a successor of this node, if any. */
-  final PathNode getASuccessor() { result = super.getASuccessor() }
-
-  /** Holds if this node is a source. */
-  final predicate isSource() { super.isSource() }
-
-  /** Holds if this node is a grouping of source nodes. */
-  final predicate isSourceGroup(string group) { super.isSourceGroup(group) }
-
-  /** Holds if this node is a grouping of sink nodes. */
-  final predicate isSinkGroup(string group) { super.isSinkGroup(group) }
-}
-
-deprecated module PathGraph = I::PathGraph;
-
-deprecated private predicate hasFlow(Node source, Node sink, Configuration config) {
-  exists(PathNode source0, PathNode sink0 |
-    hasFlowPath(source0, sink0, config) and
-    source0.getNode() = source and
-    sink0.getNode() = sink
-  )
-}
-
-deprecated private predicate hasFlowPath(PathNode source, PathNode sink, Configuration config) {
-  I::flowPath(source, sink) and source.getConfiguration() = config
-}
-
-deprecated private predicate hasFlowTo(Node sink, Configuration config) { hasFlow(_, sink, config) }
-
-deprecated predicate flowsTo = hasFlow/3;
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll
deleted file mode 100644
index 17def0c431d..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides a `Configuration` class backwards-compatible interface to the data
- * flow library.
- */
-
-private import DataFlowImplCommon
-private import DataFlowImplSpecific::Private
-import DataFlowImplSpecific::Public
-private import DataFlowImpl
-import DataFlowImplCommonPublic
-deprecated import FlowStateString
-private import codeql.util.Unit
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural data flow analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the global data flow library must define its own unique extension
- * of this abstract class. To create a configuration, extend this class with
- * a subclass whose characteristic predicate is a unique singleton string.
- * For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends DataFlow::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isBarrier`.
- *   // Optionally override `isAdditionalFlowStep`.
- * }
- * ```
- * Conceptually, this defines a graph where the nodes are `DataFlow::Node`s and
- * the edges are those data-flow steps that preserve the value of the node
- * along with any additional edges defined by `isAdditionalFlowStep`.
- * Specifying nodes in `isBarrier` will remove those nodes from the graph, and
- * specifying nodes in `isBarrierIn` and/or `isBarrierOut` will remove in-going
- * and/or out-going edges from those nodes, respectively.
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but two classes extending
- * `DataFlow::Configuration` should never depend on each other. One of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`.
- */
-abstract deprecated class Configuration extends string {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant data flow source.
-   */
-  predicate isSource(Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant data flow source with the given initial
-   * `state`.
-   */
-  predicate isSource(Node source, FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink.
-   */
-  predicate isSink(Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink accepting `state`.
-   */
-  predicate isSink(Node sink, FlowState state) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited. This completely removes
-   * `node` from the data flow graph.
-   */
-  predicate isBarrier(Node node) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited when the flow state is
-   * `state`.
-   */
-  predicate isBarrier(Node node, FlowState state) { none() }
-
-  /** Holds if data flow into `node` is prohibited. */
-  predicate isBarrierIn(Node node) { none() }
-
-  /** Holds if data flow out of `node` is prohibited. */
-  predicate isBarrierOut(Node node) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   */
-  predicate isAdditionalFlowStep(Node node1, Node node2) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
-    none()
-  }
-
-  /**
-   * Holds if an arbitrary number of implicit read steps of content `c` may be
-   * taken at `node`.
-   */
-  predicate allowImplicitRead(Node node, ContentSet c) { none() }
-
-  /**
-   * Gets the virtual dispatch branching limit when calculating field flow.
-   * This can be overridden to a smaller value to improve performance (a
-   * value of 0 disables field flow), or a larger value to get more results.
-   */
-  int fieldFlowBranchLimit() { result = 2 }
-
-  /**
-   * Gets a data flow configuration feature to add restrictions to the set of
-   * valid flow paths.
-   *
-   * - `FeatureHasSourceCallContext`:
-   *    Assume that sources have some existing call context to disallow
-   *    conflicting return-flow directly following the source.
-   * - `FeatureHasSinkCallContext`:
-   *    Assume that sinks have some existing call context to disallow
-   *    conflicting argument-to-parameter flow directly preceding the sink.
-   * - `FeatureEqualSourceSinkCallContext`:
-   *    Implies both of the above and additionally ensures that the entire flow
-   *    path preserves the call context.
-   *
-   * These features are generally not relevant for typical end-to-end data flow
-   * queries, but should only be used for constructing paths that need to
-   * somehow be pluggable in another path context.
-   */
-  FlowFeature getAFeature() { none() }
-
-  /** Holds if sources should be grouped in the result of `hasFlowPath`. */
-  predicate sourceGrouping(Node source, string sourceGroup) { none() }
-
-  /** Holds if sinks should be grouped in the result of `hasFlowPath`. */
-  predicate sinkGrouping(Node sink, string sinkGroup) { none() }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   */
-  predicate hasFlow(Node source, Node sink) { hasFlow(source, sink, this) }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   *
-   * The corresponding paths are generated from the end-points and the graph
-   * included in the module `PathGraph`.
-   */
-  predicate hasFlowPath(PathNode source, PathNode sink) { hasFlowPath(source, sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowTo(Node sink) { hasFlowTo(sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowToExpr(DataFlowExpr sink) { this.hasFlowTo(exprNode(sink)) }
-
-  /**
-   * Holds if hidden nodes should be included in the data flow graph.
-   *
-   * This feature should only be used for debugging or when the data flow graph
-   * is not visualized (for example in a `path-problem` query).
-   */
-  predicate includeHiddenNodes() { none() }
-}
-
-/**
- * This class exists to prevent mutual recursion between the user-overridden
- * member predicates of `Configuration` and the rest of the data-flow library.
- * Good performance cannot be guaranteed in the presence of such recursion, so
- * it should be replaced by using more than one copy of the data flow library.
- */
-abstract deprecated private class ConfigurationRecursionPrevention extends Configuration {
-  bindingset[this]
-  ConfigurationRecursionPrevention() { any() }
-
-  override predicate hasFlow(Node source, Node sink) {
-    strictcount(Node n | this.isSource(n)) < 0
-    or
-    strictcount(Node n | this.isSource(n, _)) < 0
-    or
-    strictcount(Node n | this.isSink(n)) < 0
-    or
-    strictcount(Node n | this.isSink(n, _)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, _, n2, _)) < 0
-    or
-    super.hasFlow(source, sink)
-  }
-}
-
-deprecated private FlowState relevantState(Configuration config) {
-  config.isSource(_, result) or
-  config.isSink(_, result) or
-  config.isBarrier(_, result) or
-  config.isAdditionalFlowStep(_, result, _, _) or
-  config.isAdditionalFlowStep(_, _, _, result)
-}
-
-private newtype TConfigState =
-  deprecated TMkConfigState(Configuration config, FlowState state) {
-    state = relevantState(config) or state instanceof FlowStateEmpty
-  }
-
-deprecated private Configuration getConfig(TConfigState state) { state = TMkConfigState(result, _) }
-
-deprecated private FlowState getState(TConfigState state) { state = TMkConfigState(_, result) }
-
-deprecated private predicate singleConfiguration() { 1 = strictcount(Configuration c) }
-
-deprecated private module Config implements FullStateConfigSig {
-  class FlowState = TConfigState;
-
-  predicate isSource(Node source, FlowState state) {
-    getConfig(state).isSource(source, getState(state))
-    or
-    getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isSink(Node sink) { none() }
-
-  predicate isSink(Node sink, FlowState state) {
-    getConfig(state).isSink(sink, getState(state))
-    or
-    getConfig(state).isSink(sink) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isBarrier(Node node) { none() }
-
-  predicate isBarrier(Node node, FlowState state) {
-    getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node)
-  }
-
-  predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
-
-  predicate isBarrierOut(Node node) { any(Configuration config).isBarrierOut(node) }
-
-  predicate isBarrierIn(Node node, FlowState state) { none() }
-
-  predicate isBarrierOut(Node node, FlowState state) { none() }
-
-  predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
-    singleConfiguration() and
-    any(Configuration config).isAdditionalFlowStep(node1, node2) and
-    model = ""
-  }
-
-  predicate isAdditionalFlowStep(
-    Node node1, FlowState state1, Node node2, FlowState state2, string model
-  ) {
-    getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1) and
-    model = ""
-    or
-    not singleConfiguration() and
-    getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1 and
-    model = ""
-  }
-
-  predicate allowImplicitRead(Node node, ContentSet c) {
-    any(Configuration config).allowImplicitRead(node, c)
-  }
-
-  predicate neverSkip(Node node) { none() }
-
-  int fieldFlowBranchLimit() { result = min(any(Configuration config).fieldFlowBranchLimit()) }
-
-  int accessPathLimit() { result = 5 }
-
-  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
-
-  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
-
-  predicate observeDiffInformedIncrementalMode() { none() }
-}
-
-deprecated private import Impl<Config> as I
-
-/**
- * A `Node` augmented with a call context (except for sinks), an access path, and a configuration.
- * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
- */
-deprecated class PathNode instanceof I::PathNode {
-  /** Gets a textual representation of this element. */
-  final string toString() { result = super.toString() }
-
-  /**
-   * Gets a textual representation of this element, including a textual
-   * representation of the call context.
-   */
-  final string toStringWithContext() { result = super.toStringWithContext() }
-
-  /**
-   * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
-   * For more information, see
-   * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
-   */
-  final predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    super.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-
-  /** Gets the underlying `Node`. */
-  final Node getNode() { result = super.getNode() }
-
-  /** Gets the `FlowState` of this node. */
-  deprecated final FlowState getState() { result = getState(super.getState()) }
-
-  /** Gets the associated configuration. */
-  deprecated final Configuration getConfiguration() { result = getConfig(super.getState()) }
-
-  /** Gets a successor of this node, if any. */
-  final PathNode getASuccessor() { result = super.getASuccessor() }
-
-  /** Holds if this node is a source. */
-  final predicate isSource() { super.isSource() }
-
-  /** Holds if this node is a grouping of source nodes. */
-  final predicate isSourceGroup(string group) { super.isSourceGroup(group) }
-
-  /** Holds if this node is a grouping of sink nodes. */
-  final predicate isSinkGroup(string group) { super.isSinkGroup(group) }
-}
-
-deprecated module PathGraph = I::PathGraph;
-
-deprecated private predicate hasFlow(Node source, Node sink, Configuration config) {
-  exists(PathNode source0, PathNode sink0 |
-    hasFlowPath(source0, sink0, config) and
-    source0.getNode() = source and
-    sink0.getNode() = sink
-  )
-}
-
-deprecated private predicate hasFlowPath(PathNode source, PathNode sink, Configuration config) {
-  I::flowPath(source, sink) and source.getConfiguration() = config
-}
-
-deprecated private predicate hasFlowTo(Node sink, Configuration config) { hasFlow(_, sink, config) }
-
-deprecated predicate flowsTo = hasFlow/3;
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll
deleted file mode 100644
index 17def0c431d..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl4.qll
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides a `Configuration` class backwards-compatible interface to the data
- * flow library.
- */
-
-private import DataFlowImplCommon
-private import DataFlowImplSpecific::Private
-import DataFlowImplSpecific::Public
-private import DataFlowImpl
-import DataFlowImplCommonPublic
-deprecated import FlowStateString
-private import codeql.util.Unit
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural data flow analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the global data flow library must define its own unique extension
- * of this abstract class. To create a configuration, extend this class with
- * a subclass whose characteristic predicate is a unique singleton string.
- * For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends DataFlow::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isBarrier`.
- *   // Optionally override `isAdditionalFlowStep`.
- * }
- * ```
- * Conceptually, this defines a graph where the nodes are `DataFlow::Node`s and
- * the edges are those data-flow steps that preserve the value of the node
- * along with any additional edges defined by `isAdditionalFlowStep`.
- * Specifying nodes in `isBarrier` will remove those nodes from the graph, and
- * specifying nodes in `isBarrierIn` and/or `isBarrierOut` will remove in-going
- * and/or out-going edges from those nodes, respectively.
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but two classes extending
- * `DataFlow::Configuration` should never depend on each other. One of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`.
- */
-abstract deprecated class Configuration extends string {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant data flow source.
-   */
-  predicate isSource(Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant data flow source with the given initial
-   * `state`.
-   */
-  predicate isSource(Node source, FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink.
-   */
-  predicate isSink(Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink accepting `state`.
-   */
-  predicate isSink(Node sink, FlowState state) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited. This completely removes
-   * `node` from the data flow graph.
-   */
-  predicate isBarrier(Node node) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited when the flow state is
-   * `state`.
-   */
-  predicate isBarrier(Node node, FlowState state) { none() }
-
-  /** Holds if data flow into `node` is prohibited. */
-  predicate isBarrierIn(Node node) { none() }
-
-  /** Holds if data flow out of `node` is prohibited. */
-  predicate isBarrierOut(Node node) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   */
-  predicate isAdditionalFlowStep(Node node1, Node node2) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
-    none()
-  }
-
-  /**
-   * Holds if an arbitrary number of implicit read steps of content `c` may be
-   * taken at `node`.
-   */
-  predicate allowImplicitRead(Node node, ContentSet c) { none() }
-
-  /**
-   * Gets the virtual dispatch branching limit when calculating field flow.
-   * This can be overridden to a smaller value to improve performance (a
-   * value of 0 disables field flow), or a larger value to get more results.
-   */
-  int fieldFlowBranchLimit() { result = 2 }
-
-  /**
-   * Gets a data flow configuration feature to add restrictions to the set of
-   * valid flow paths.
-   *
-   * - `FeatureHasSourceCallContext`:
-   *    Assume that sources have some existing call context to disallow
-   *    conflicting return-flow directly following the source.
-   * - `FeatureHasSinkCallContext`:
-   *    Assume that sinks have some existing call context to disallow
-   *    conflicting argument-to-parameter flow directly preceding the sink.
-   * - `FeatureEqualSourceSinkCallContext`:
-   *    Implies both of the above and additionally ensures that the entire flow
-   *    path preserves the call context.
-   *
-   * These features are generally not relevant for typical end-to-end data flow
-   * queries, but should only be used for constructing paths that need to
-   * somehow be pluggable in another path context.
-   */
-  FlowFeature getAFeature() { none() }
-
-  /** Holds if sources should be grouped in the result of `hasFlowPath`. */
-  predicate sourceGrouping(Node source, string sourceGroup) { none() }
-
-  /** Holds if sinks should be grouped in the result of `hasFlowPath`. */
-  predicate sinkGrouping(Node sink, string sinkGroup) { none() }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   */
-  predicate hasFlow(Node source, Node sink) { hasFlow(source, sink, this) }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   *
-   * The corresponding paths are generated from the end-points and the graph
-   * included in the module `PathGraph`.
-   */
-  predicate hasFlowPath(PathNode source, PathNode sink) { hasFlowPath(source, sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowTo(Node sink) { hasFlowTo(sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowToExpr(DataFlowExpr sink) { this.hasFlowTo(exprNode(sink)) }
-
-  /**
-   * Holds if hidden nodes should be included in the data flow graph.
-   *
-   * This feature should only be used for debugging or when the data flow graph
-   * is not visualized (for example in a `path-problem` query).
-   */
-  predicate includeHiddenNodes() { none() }
-}
-
-/**
- * This class exists to prevent mutual recursion between the user-overridden
- * member predicates of `Configuration` and the rest of the data-flow library.
- * Good performance cannot be guaranteed in the presence of such recursion, so
- * it should be replaced by using more than one copy of the data flow library.
- */
-abstract deprecated private class ConfigurationRecursionPrevention extends Configuration {
-  bindingset[this]
-  ConfigurationRecursionPrevention() { any() }
-
-  override predicate hasFlow(Node source, Node sink) {
-    strictcount(Node n | this.isSource(n)) < 0
-    or
-    strictcount(Node n | this.isSource(n, _)) < 0
-    or
-    strictcount(Node n | this.isSink(n)) < 0
-    or
-    strictcount(Node n | this.isSink(n, _)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, _, n2, _)) < 0
-    or
-    super.hasFlow(source, sink)
-  }
-}
-
-deprecated private FlowState relevantState(Configuration config) {
-  config.isSource(_, result) or
-  config.isSink(_, result) or
-  config.isBarrier(_, result) or
-  config.isAdditionalFlowStep(_, result, _, _) or
-  config.isAdditionalFlowStep(_, _, _, result)
-}
-
-private newtype TConfigState =
-  deprecated TMkConfigState(Configuration config, FlowState state) {
-    state = relevantState(config) or state instanceof FlowStateEmpty
-  }
-
-deprecated private Configuration getConfig(TConfigState state) { state = TMkConfigState(result, _) }
-
-deprecated private FlowState getState(TConfigState state) { state = TMkConfigState(_, result) }
-
-deprecated private predicate singleConfiguration() { 1 = strictcount(Configuration c) }
-
-deprecated private module Config implements FullStateConfigSig {
-  class FlowState = TConfigState;
-
-  predicate isSource(Node source, FlowState state) {
-    getConfig(state).isSource(source, getState(state))
-    or
-    getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isSink(Node sink) { none() }
-
-  predicate isSink(Node sink, FlowState state) {
-    getConfig(state).isSink(sink, getState(state))
-    or
-    getConfig(state).isSink(sink) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isBarrier(Node node) { none() }
-
-  predicate isBarrier(Node node, FlowState state) {
-    getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node)
-  }
-
-  predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
-
-  predicate isBarrierOut(Node node) { any(Configuration config).isBarrierOut(node) }
-
-  predicate isBarrierIn(Node node, FlowState state) { none() }
-
-  predicate isBarrierOut(Node node, FlowState state) { none() }
-
-  predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
-    singleConfiguration() and
-    any(Configuration config).isAdditionalFlowStep(node1, node2) and
-    model = ""
-  }
-
-  predicate isAdditionalFlowStep(
-    Node node1, FlowState state1, Node node2, FlowState state2, string model
-  ) {
-    getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1) and
-    model = ""
-    or
-    not singleConfiguration() and
-    getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1 and
-    model = ""
-  }
-
-  predicate allowImplicitRead(Node node, ContentSet c) {
-    any(Configuration config).allowImplicitRead(node, c)
-  }
-
-  predicate neverSkip(Node node) { none() }
-
-  int fieldFlowBranchLimit() { result = min(any(Configuration config).fieldFlowBranchLimit()) }
-
-  int accessPathLimit() { result = 5 }
-
-  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
-
-  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
-
-  predicate observeDiffInformedIncrementalMode() { none() }
-}
-
-deprecated private import Impl<Config> as I
-
-/**
- * A `Node` augmented with a call context (except for sinks), an access path, and a configuration.
- * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
- */
-deprecated class PathNode instanceof I::PathNode {
-  /** Gets a textual representation of this element. */
-  final string toString() { result = super.toString() }
-
-  /**
-   * Gets a textual representation of this element, including a textual
-   * representation of the call context.
-   */
-  final string toStringWithContext() { result = super.toStringWithContext() }
-
-  /**
-   * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
-   * For more information, see
-   * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
-   */
-  final predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    super.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-
-  /** Gets the underlying `Node`. */
-  final Node getNode() { result = super.getNode() }
-
-  /** Gets the `FlowState` of this node. */
-  deprecated final FlowState getState() { result = getState(super.getState()) }
-
-  /** Gets the associated configuration. */
-  deprecated final Configuration getConfiguration() { result = getConfig(super.getState()) }
-
-  /** Gets a successor of this node, if any. */
-  final PathNode getASuccessor() { result = super.getASuccessor() }
-
-  /** Holds if this node is a source. */
-  final predicate isSource() { super.isSource() }
-
-  /** Holds if this node is a grouping of source nodes. */
-  final predicate isSourceGroup(string group) { super.isSourceGroup(group) }
-
-  /** Holds if this node is a grouping of sink nodes. */
-  final predicate isSinkGroup(string group) { super.isSinkGroup(group) }
-}
-
-deprecated module PathGraph = I::PathGraph;
-
-deprecated private predicate hasFlow(Node source, Node sink, Configuration config) {
-  exists(PathNode source0, PathNode sink0 |
-    hasFlowPath(source0, sink0, config) and
-    source0.getNode() = source and
-    sink0.getNode() = sink
-  )
-}
-
-deprecated private predicate hasFlowPath(PathNode source, PathNode sink, Configuration config) {
-  I::flowPath(source, sink) and source.getConfiguration() = config
-}
-
-deprecated private predicate hasFlowTo(Node sink, Configuration config) { hasFlow(_, sink, config) }
-
-deprecated predicate flowsTo = hasFlow/3;
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll
deleted file mode 100644
index 17def0c431d..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplLocal.qll
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides a `Configuration` class backwards-compatible interface to the data
- * flow library.
- */
-
-private import DataFlowImplCommon
-private import DataFlowImplSpecific::Private
-import DataFlowImplSpecific::Public
-private import DataFlowImpl
-import DataFlowImplCommonPublic
-deprecated import FlowStateString
-private import codeql.util.Unit
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural data flow analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the global data flow library must define its own unique extension
- * of this abstract class. To create a configuration, extend this class with
- * a subclass whose characteristic predicate is a unique singleton string.
- * For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends DataFlow::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isBarrier`.
- *   // Optionally override `isAdditionalFlowStep`.
- * }
- * ```
- * Conceptually, this defines a graph where the nodes are `DataFlow::Node`s and
- * the edges are those data-flow steps that preserve the value of the node
- * along with any additional edges defined by `isAdditionalFlowStep`.
- * Specifying nodes in `isBarrier` will remove those nodes from the graph, and
- * specifying nodes in `isBarrierIn` and/or `isBarrierOut` will remove in-going
- * and/or out-going edges from those nodes, respectively.
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but two classes extending
- * `DataFlow::Configuration` should never depend on each other. One of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`.
- */
-abstract deprecated class Configuration extends string {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant data flow source.
-   */
-  predicate isSource(Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant data flow source with the given initial
-   * `state`.
-   */
-  predicate isSource(Node source, FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink.
-   */
-  predicate isSink(Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink accepting `state`.
-   */
-  predicate isSink(Node sink, FlowState state) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited. This completely removes
-   * `node` from the data flow graph.
-   */
-  predicate isBarrier(Node node) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited when the flow state is
-   * `state`.
-   */
-  predicate isBarrier(Node node, FlowState state) { none() }
-
-  /** Holds if data flow into `node` is prohibited. */
-  predicate isBarrierIn(Node node) { none() }
-
-  /** Holds if data flow out of `node` is prohibited. */
-  predicate isBarrierOut(Node node) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   */
-  predicate isAdditionalFlowStep(Node node1, Node node2) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
-    none()
-  }
-
-  /**
-   * Holds if an arbitrary number of implicit read steps of content `c` may be
-   * taken at `node`.
-   */
-  predicate allowImplicitRead(Node node, ContentSet c) { none() }
-
-  /**
-   * Gets the virtual dispatch branching limit when calculating field flow.
-   * This can be overridden to a smaller value to improve performance (a
-   * value of 0 disables field flow), or a larger value to get more results.
-   */
-  int fieldFlowBranchLimit() { result = 2 }
-
-  /**
-   * Gets a data flow configuration feature to add restrictions to the set of
-   * valid flow paths.
-   *
-   * - `FeatureHasSourceCallContext`:
-   *    Assume that sources have some existing call context to disallow
-   *    conflicting return-flow directly following the source.
-   * - `FeatureHasSinkCallContext`:
-   *    Assume that sinks have some existing call context to disallow
-   *    conflicting argument-to-parameter flow directly preceding the sink.
-   * - `FeatureEqualSourceSinkCallContext`:
-   *    Implies both of the above and additionally ensures that the entire flow
-   *    path preserves the call context.
-   *
-   * These features are generally not relevant for typical end-to-end data flow
-   * queries, but should only be used for constructing paths that need to
-   * somehow be pluggable in another path context.
-   */
-  FlowFeature getAFeature() { none() }
-
-  /** Holds if sources should be grouped in the result of `hasFlowPath`. */
-  predicate sourceGrouping(Node source, string sourceGroup) { none() }
-
-  /** Holds if sinks should be grouped in the result of `hasFlowPath`. */
-  predicate sinkGrouping(Node sink, string sinkGroup) { none() }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   */
-  predicate hasFlow(Node source, Node sink) { hasFlow(source, sink, this) }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   *
-   * The corresponding paths are generated from the end-points and the graph
-   * included in the module `PathGraph`.
-   */
-  predicate hasFlowPath(PathNode source, PathNode sink) { hasFlowPath(source, sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowTo(Node sink) { hasFlowTo(sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowToExpr(DataFlowExpr sink) { this.hasFlowTo(exprNode(sink)) }
-
-  /**
-   * Holds if hidden nodes should be included in the data flow graph.
-   *
-   * This feature should only be used for debugging or when the data flow graph
-   * is not visualized (for example in a `path-problem` query).
-   */
-  predicate includeHiddenNodes() { none() }
-}
-
-/**
- * This class exists to prevent mutual recursion between the user-overridden
- * member predicates of `Configuration` and the rest of the data-flow library.
- * Good performance cannot be guaranteed in the presence of such recursion, so
- * it should be replaced by using more than one copy of the data flow library.
- */
-abstract deprecated private class ConfigurationRecursionPrevention extends Configuration {
-  bindingset[this]
-  ConfigurationRecursionPrevention() { any() }
-
-  override predicate hasFlow(Node source, Node sink) {
-    strictcount(Node n | this.isSource(n)) < 0
-    or
-    strictcount(Node n | this.isSource(n, _)) < 0
-    or
-    strictcount(Node n | this.isSink(n)) < 0
-    or
-    strictcount(Node n | this.isSink(n, _)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, _, n2, _)) < 0
-    or
-    super.hasFlow(source, sink)
-  }
-}
-
-deprecated private FlowState relevantState(Configuration config) {
-  config.isSource(_, result) or
-  config.isSink(_, result) or
-  config.isBarrier(_, result) or
-  config.isAdditionalFlowStep(_, result, _, _) or
-  config.isAdditionalFlowStep(_, _, _, result)
-}
-
-private newtype TConfigState =
-  deprecated TMkConfigState(Configuration config, FlowState state) {
-    state = relevantState(config) or state instanceof FlowStateEmpty
-  }
-
-deprecated private Configuration getConfig(TConfigState state) { state = TMkConfigState(result, _) }
-
-deprecated private FlowState getState(TConfigState state) { state = TMkConfigState(_, result) }
-
-deprecated private predicate singleConfiguration() { 1 = strictcount(Configuration c) }
-
-deprecated private module Config implements FullStateConfigSig {
-  class FlowState = TConfigState;
-
-  predicate isSource(Node source, FlowState state) {
-    getConfig(state).isSource(source, getState(state))
-    or
-    getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isSink(Node sink) { none() }
-
-  predicate isSink(Node sink, FlowState state) {
-    getConfig(state).isSink(sink, getState(state))
-    or
-    getConfig(state).isSink(sink) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isBarrier(Node node) { none() }
-
-  predicate isBarrier(Node node, FlowState state) {
-    getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node)
-  }
-
-  predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
-
-  predicate isBarrierOut(Node node) { any(Configuration config).isBarrierOut(node) }
-
-  predicate isBarrierIn(Node node, FlowState state) { none() }
-
-  predicate isBarrierOut(Node node, FlowState state) { none() }
-
-  predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
-    singleConfiguration() and
-    any(Configuration config).isAdditionalFlowStep(node1, node2) and
-    model = ""
-  }
-
-  predicate isAdditionalFlowStep(
-    Node node1, FlowState state1, Node node2, FlowState state2, string model
-  ) {
-    getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1) and
-    model = ""
-    or
-    not singleConfiguration() and
-    getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1 and
-    model = ""
-  }
-
-  predicate allowImplicitRead(Node node, ContentSet c) {
-    any(Configuration config).allowImplicitRead(node, c)
-  }
-
-  predicate neverSkip(Node node) { none() }
-
-  int fieldFlowBranchLimit() { result = min(any(Configuration config).fieldFlowBranchLimit()) }
-
-  int accessPathLimit() { result = 5 }
-
-  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
-
-  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
-
-  predicate observeDiffInformedIncrementalMode() { none() }
-}
-
-deprecated private import Impl<Config> as I
-
-/**
- * A `Node` augmented with a call context (except for sinks), an access path, and a configuration.
- * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
- */
-deprecated class PathNode instanceof I::PathNode {
-  /** Gets a textual representation of this element. */
-  final string toString() { result = super.toString() }
-
-  /**
-   * Gets a textual representation of this element, including a textual
-   * representation of the call context.
-   */
-  final string toStringWithContext() { result = super.toStringWithContext() }
-
-  /**
-   * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
-   * For more information, see
-   * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
-   */
-  final predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    super.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-
-  /** Gets the underlying `Node`. */
-  final Node getNode() { result = super.getNode() }
-
-  /** Gets the `FlowState` of this node. */
-  deprecated final FlowState getState() { result = getState(super.getState()) }
-
-  /** Gets the associated configuration. */
-  deprecated final Configuration getConfiguration() { result = getConfig(super.getState()) }
-
-  /** Gets a successor of this node, if any. */
-  final PathNode getASuccessor() { result = super.getASuccessor() }
-
-  /** Holds if this node is a source. */
-  final predicate isSource() { super.isSource() }
-
-  /** Holds if this node is a grouping of source nodes. */
-  final predicate isSourceGroup(string group) { super.isSourceGroup(group) }
-
-  /** Holds if this node is a grouping of sink nodes. */
-  final predicate isSinkGroup(string group) { super.isSinkGroup(group) }
-}
-
-deprecated module PathGraph = I::PathGraph;
-
-deprecated private predicate hasFlow(Node source, Node sink, Configuration config) {
-  exists(PathNode source0, PathNode sink0 |
-    hasFlowPath(source0, sink0, config) and
-    source0.getNode() = source and
-    sink0.getNode() = sink
-  )
-}
-
-deprecated private predicate hasFlowPath(PathNode source, PathNode sink, Configuration config) {
-  I::flowPath(source, sink) and source.getConfiguration() = config
-}
-
-deprecated private predicate hasFlowTo(Node sink, Configuration config) { hasFlow(_, sink, config) }
-
-deprecated predicate flowsTo = hasFlow/3;
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowUtil.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowUtil.qll
index b4f325e01df..4a8ea4ebd43 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowUtil.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowUtil.qll
@@ -729,41 +729,39 @@ private predicate exprToDefinitionByReferenceStep(Expr exprIn, Expr argOut) {
 
 private module FieldFlow {
   private import DataFlowImplCommon
-  private import DataFlowImplLocal
   private import DataFlowPrivate
+  private import semmle.code.cpp.dataflow.DataFlow
 
   /**
-   * A configuration for finding local-only flow through fields. This uses the
-   * `Configuration` class in the dedicated `DataFlowImplLocal` copy of the
-   * shared library that's not user-exposed directly.
+   * A configuration for finding local-only flow through fields.
    *
    * To keep the flow local to a single function, we put barriers on parameters
    * and return statements. Sources and sinks are the values that go into and
    * out of fields, respectively.
    */
-  private class FieldConfiguration extends Configuration {
-    FieldConfiguration() { this = "FieldConfiguration" }
-
-    override predicate isSource(Node source) {
+  private module FieldConfig implements DataFlow::ConfigSig {
+    predicate isSource(Node source) {
       storeStep(source, _, _)
       or
       // Also mark `foo(a.b);` as a source when `a.b` may be overwritten by `foo`.
       readStep(_, _, any(Node node | node.asExpr() = source.asDefiningArgument()))
     }
 
-    override predicate isSink(Node sink) { readStep(_, _, sink) }
+    predicate isSink(Node sink) { readStep(_, _, sink) }
 
-    override predicate isBarrier(Node node) { node instanceof ParameterNode }
+    predicate isBarrier(Node node) { node instanceof ParameterNode }
 
-    override predicate isBarrierOut(Node node) {
+    predicate isBarrierOut(Node node) {
       node.asExpr().getParent() instanceof ReturnStmt
       or
       node.asExpr().getParent() instanceof ThrowExpr
     }
   }
 
+  private module Flow = DataFlow::Global<FieldConfig>;
+
   predicate fieldFlow(Node node1, Node node2) {
-    exists(FieldConfiguration cfg | cfg.hasFlow(node1, node2)) and
+    Flow::flow(node1, node2) and
     // This configuration should not be able to cross function boundaries, but
     // we double-check here just to be sure.
     getNodeEnclosingCallable(node1) = getNodeEnclosingCallable(node2)
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking1/TaintTrackingImpl.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
deleted file mode 100644
index 75e7856fd26..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides an implementation of global (interprocedural) taint tracking.
- * This file re-exports the local (intraprocedural) taint-tracking analysis
- * from `TaintTrackingParameter::Public` and adds a global analysis, mainly
- * exposed through the `Configuration` class. For some languages, this file
- * exists in several identical copies, allowing queries to use multiple
- * `Configuration` classes that depend on each other without introducing
- * mutual recursion among those configurations.
- */
-
-import TaintTrackingParameter::Public
-private import TaintTrackingParameter::Private
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural taint tracking analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the taint tracking library must define its own unique extension of
- * this abstract class.
- *
- * A taint-tracking configuration is a special data flow configuration
- * (`DataFlow::Configuration`) that allows for flow through nodes that do not
- * necessarily preserve values but are still relevant from a taint tracking
- * perspective. (For example, string concatenation, where one of the operands
- * is tainted.)
- *
- * To create a configuration, extend this class with a subclass whose
- * characteristic predicate is a unique singleton string. For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends TaintTracking::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isSanitizer`.
- *   // Optionally override `isSanitizerIn`.
- *   // Optionally override `isSanitizerOut`.
- *   // Optionally override `isSanitizerGuard`.
- *   // Optionally override `isAdditionalTaintStep`.
- * }
- * ```
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but it is unsupported to depend on
- * another `TaintTracking::Configuration` or a `DataFlow::Configuration` in the
- * overridden predicates that define sources, sinks, or additional steps.
- * Instead, the dependency should go to a `TaintTracking2::Configuration` or a
- * `DataFlow2::Configuration`, `DataFlow3::Configuration`, etc.
- */
-abstract deprecated class Configuration extends DataFlow::Configuration {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant taint source.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant taint source with the given initial
-   * `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink accepting `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
-
-  /** Holds if the node `node` is a taint sanitizer. */
-  predicate isSanitizer(DataFlow::Node node) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node) {
-    this.isSanitizer(node) or
-    defaultTaintSanitizer(node)
-  }
-
-  /**
-   * Holds if the node `node` is a taint sanitizer when the flow state is
-   * `state`.
-   */
-  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
-    this.isSanitizer(node, state)
-  }
-
-  /** Holds if taint propagation into `node` is prohibited. */
-  predicate isSanitizerIn(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierIn(DataFlow::Node node) { this.isSanitizerIn(node) }
-
-  /** Holds if taint propagation out of `node` is prohibited. */
-  predicate isSanitizerOut(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   */
-  predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) { none() }
-
-  final override predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
-    this.isAdditionalTaintStep(node1, node2) or
-    defaultAdditionalTaintStep(node1, node2, _)
-  }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalTaintStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    none()
-  }
-
-  final override predicate isAdditionalFlowStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    this.isAdditionalTaintStep(node1, state1, node2, state2)
-  }
-
-  override predicate allowImplicitRead(DataFlow::Node node, DataFlow::ContentSet c) {
-    (
-      this.isSink(node) or
-      this.isSink(node, _) or
-      this.isAdditionalTaintStep(node, _) or
-      this.isAdditionalTaintStep(node, _, _, _)
-    ) and
-    defaultImplicitTaintRead(node, c)
-  }
-
-  /**
-   * Holds if taint may flow from `source` to `sink` for this configuration.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate hasFlow(DataFlow::Node source, DataFlow::Node sink) {
-    super.hasFlow(source, sink)
-  }
-}
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking1/TaintTrackingParameter.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking1/TaintTrackingParameter.qll
deleted file mode 100644
index f9346e28434..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking1/TaintTrackingParameter.qll
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- */
-
-import semmle.code.cpp.dataflow.internal.TaintTrackingUtil as Public
-
-module Private {
-  import semmle.code.cpp.dataflow.DataFlow::DataFlow as DataFlow
-  import semmle.code.cpp.dataflow.internal.DataFlowImpl as DataFlowInternal
-}
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking2/TaintTrackingImpl.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking2/TaintTrackingImpl.qll
deleted file mode 100644
index 75e7856fd26..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking2/TaintTrackingImpl.qll
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides an implementation of global (interprocedural) taint tracking.
- * This file re-exports the local (intraprocedural) taint-tracking analysis
- * from `TaintTrackingParameter::Public` and adds a global analysis, mainly
- * exposed through the `Configuration` class. For some languages, this file
- * exists in several identical copies, allowing queries to use multiple
- * `Configuration` classes that depend on each other without introducing
- * mutual recursion among those configurations.
- */
-
-import TaintTrackingParameter::Public
-private import TaintTrackingParameter::Private
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural taint tracking analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the taint tracking library must define its own unique extension of
- * this abstract class.
- *
- * A taint-tracking configuration is a special data flow configuration
- * (`DataFlow::Configuration`) that allows for flow through nodes that do not
- * necessarily preserve values but are still relevant from a taint tracking
- * perspective. (For example, string concatenation, where one of the operands
- * is tainted.)
- *
- * To create a configuration, extend this class with a subclass whose
- * characteristic predicate is a unique singleton string. For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends TaintTracking::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isSanitizer`.
- *   // Optionally override `isSanitizerIn`.
- *   // Optionally override `isSanitizerOut`.
- *   // Optionally override `isSanitizerGuard`.
- *   // Optionally override `isAdditionalTaintStep`.
- * }
- * ```
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but it is unsupported to depend on
- * another `TaintTracking::Configuration` or a `DataFlow::Configuration` in the
- * overridden predicates that define sources, sinks, or additional steps.
- * Instead, the dependency should go to a `TaintTracking2::Configuration` or a
- * `DataFlow2::Configuration`, `DataFlow3::Configuration`, etc.
- */
-abstract deprecated class Configuration extends DataFlow::Configuration {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant taint source.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant taint source with the given initial
-   * `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink accepting `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
-
-  /** Holds if the node `node` is a taint sanitizer. */
-  predicate isSanitizer(DataFlow::Node node) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node) {
-    this.isSanitizer(node) or
-    defaultTaintSanitizer(node)
-  }
-
-  /**
-   * Holds if the node `node` is a taint sanitizer when the flow state is
-   * `state`.
-   */
-  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
-    this.isSanitizer(node, state)
-  }
-
-  /** Holds if taint propagation into `node` is prohibited. */
-  predicate isSanitizerIn(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierIn(DataFlow::Node node) { this.isSanitizerIn(node) }
-
-  /** Holds if taint propagation out of `node` is prohibited. */
-  predicate isSanitizerOut(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   */
-  predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) { none() }
-
-  final override predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
-    this.isAdditionalTaintStep(node1, node2) or
-    defaultAdditionalTaintStep(node1, node2, _)
-  }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalTaintStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    none()
-  }
-
-  final override predicate isAdditionalFlowStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    this.isAdditionalTaintStep(node1, state1, node2, state2)
-  }
-
-  override predicate allowImplicitRead(DataFlow::Node node, DataFlow::ContentSet c) {
-    (
-      this.isSink(node) or
-      this.isSink(node, _) or
-      this.isAdditionalTaintStep(node, _) or
-      this.isAdditionalTaintStep(node, _, _, _)
-    ) and
-    defaultImplicitTaintRead(node, c)
-  }
-
-  /**
-   * Holds if taint may flow from `source` to `sink` for this configuration.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate hasFlow(DataFlow::Node source, DataFlow::Node sink) {
-    super.hasFlow(source, sink)
-  }
-}
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking2/TaintTrackingParameter.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking2/TaintTrackingParameter.qll
deleted file mode 100644
index e935b8d4d08..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/internal/tainttracking2/TaintTrackingParameter.qll
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- */
-
-import semmle.code.cpp.dataflow.internal.TaintTrackingUtil as Public
-
-module Private {
-  import semmle.code.cpp.dataflow.DataFlow2::DataFlow2 as DataFlow
-}
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/new/DataFlow.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/new/DataFlow.qll
index bcbebd0de1e..2067dc8aac0 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/new/DataFlow.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/new/DataFlow.qll
@@ -29,5 +29,5 @@ module DataFlow {
   private import semmle.code.cpp.ir.dataflow.internal.DataFlowImplSpecific
   private import codeql.dataflow.DataFlow
   import DataFlowMake<Location, CppDataFlow>
-  import semmle.code.cpp.ir.dataflow.internal.DataFlowImpl1
+  import Public
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/new/DataFlow2.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/new/DataFlow2.qll
deleted file mode 100644
index 35c5a34a656..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/new/DataFlow2.qll
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Provides a `DataFlow2` module, which is a copy of the `DataFlow` module. Use
- * this class when data-flow configurations must depend on each other. Two
- * classes extending `DataFlow::Configuration` should never depend on each
- * other, but one of them should instead depend on a
- * `DataFlow2::Configuration`, a `DataFlow3::Configuration`, or a
- * `DataFlow4::Configuration`.
- *
- * See `semmle.code.cpp.dataflow.new.DataFlow` for the full documentation.
- */
-
-import cpp
-
-/**
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) data flow analyses.
- */
-module DataFlow2 {
-  import semmle.code.cpp.ir.dataflow.internal.DataFlowImpl2
-}
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/new/DataFlow3.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/new/DataFlow3.qll
deleted file mode 100644
index e2e402835f2..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/new/DataFlow3.qll
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Provides a `DataFlow3` module, which is a copy of the `DataFlow` module. Use
- * this class when data-flow configurations must depend on each other. Two
- * classes extending `DataFlow::Configuration` should never depend on each
- * other, but one of them should instead depend on a
- * `DataFlow2::Configuration`, a `DataFlow3::Configuration`, or a
- * `DataFlow4::Configuration`.
- *
- * See `semmle.code.cpp.dataflow.new.DataFlow` for the full documentation.
- */
-
-import cpp
-
-/**
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) data flow analyses.
- */
-module DataFlow3 {
-  import semmle.code.cpp.ir.dataflow.internal.DataFlowImpl3
-}
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/new/DataFlow4.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/new/DataFlow4.qll
deleted file mode 100644
index f9209abe1e1..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/new/DataFlow4.qll
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Provides a `DataFlow4` module, which is a copy of the `DataFlow` module. Use
- * this class when data-flow configurations must depend on each other. Two
- * classes extending `DataFlow::Configuration` should never depend on each
- * other, but one of them should instead depend on a
- * `DataFlow2::Configuration`, a `DataFlow3::Configuration`, or a
- * `DataFlow4::Configuration`.
- *
- * See `semmle.code.cpp.dataflow.new.DataFlow` for the full documentation.
- */
-
-import cpp
-
-/**
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) data flow analyses.
- */
-module DataFlow4 {
-  import semmle.code.cpp.ir.dataflow.internal.DataFlowImpl4
-}
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/new/TaintTracking.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/new/TaintTracking.qll
index d28a389203f..ecc927ecad7 100644
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/new/TaintTracking.qll
+++ b/cpp/ql/lib/semmle/code/cpp/dataflow/new/TaintTracking.qll
@@ -16,18 +16,16 @@
  */
 
 import semmle.code.cpp.dataflow.new.DataFlow
-import semmle.code.cpp.dataflow.new.DataFlow2
 
 /**
  * Provides classes for performing local (intra-procedural) and
  * global (inter-procedural) taint-tracking analyses.
  */
 module TaintTracking {
-  import semmle.code.cpp.ir.dataflow.internal.tainttracking1.TaintTrackingParameter::Public
+  import semmle.code.cpp.ir.dataflow.internal.TaintTrackingUtil
   private import semmle.code.cpp.ir.dataflow.internal.DataFlowImplSpecific
   private import semmle.code.cpp.ir.dataflow.internal.TaintTrackingImplSpecific
   private import codeql.dataflow.TaintTracking
   private import semmle.code.cpp.Location
   import TaintFlowMake<Location, CppDataFlow, CppTaintTracking>
-  import semmle.code.cpp.ir.dataflow.internal.tainttracking1.TaintTrackingImpl
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/new/TaintTracking2.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/new/TaintTracking2.qll
deleted file mode 100644
index 2da049cefaf..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/new/TaintTracking2.qll
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Provides a `TaintTracking2` module, which is a copy of the `TaintTracking`
- * module. Use this class when data-flow configurations or taint-tracking
- * configurations must depend on each other. Two classes extending
- * `DataFlow::Configuration` should never depend on each other, but one of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`. The
- * `TaintTracking::Configuration` class extends `DataFlow::Configuration`, and
- * `TaintTracking2::Configuration` extends `DataFlow2::Configuration`.
- *
- * See `semmle.code.cpp.dataflow.new.TaintTracking` for the full documentation.
- */
-
-/**
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) taint-tracking analyses.
- */
-module TaintTracking2 {
-  import semmle.code.cpp.ir.dataflow.internal.tainttracking2.TaintTrackingImpl
-}
diff --git a/cpp/ql/lib/semmle/code/cpp/dataflow/new/TaintTracking3.qll b/cpp/ql/lib/semmle/code/cpp/dataflow/new/TaintTracking3.qll
deleted file mode 100644
index 113175d8369..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/dataflow/new/TaintTracking3.qll
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Provides a `TaintTracking3` module, which is a copy of the `TaintTracking`
- * module. Use this class when data-flow configurations or taint-tracking
- * configurations must depend on each other. Two classes extending
- * `DataFlow::Configuration` should never depend on each other, but one of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`. The
- * `TaintTracking::Configuration` class extends `DataFlow::Configuration`, and
- * `TaintTracking2::Configuration` extends `DataFlow2::Configuration`.
- *
- * See `semmle.code.cpp.dataflow.new.TaintTracking` for the full documentation.
- */
-
-/**
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) taint-tracking analyses.
- */
-module TaintTracking3 {
-  import semmle.code.cpp.ir.dataflow.internal.tainttracking3.TaintTrackingImpl
-}
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/DataFlow.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/DataFlow.qll
index 671d82c74ef..ecd474d64b2 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/DataFlow.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/DataFlow.qll
@@ -25,5 +25,5 @@ module DataFlow {
   private import semmle.code.cpp.ir.dataflow.internal.DataFlowImplSpecific
   private import codeql.dataflow.DataFlow
   import DataFlowMake<Location, CppDataFlow>
-  import semmle.code.cpp.ir.dataflow.internal.DataFlowImpl1
+  import Public
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/DataFlow2.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/DataFlow2.qll
deleted file mode 100644
index 95eb979192d..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/DataFlow2.qll
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Provides a `DataFlow2` module, which is a copy of the `DataFlow` module. Use
- * this class when data-flow configurations must depend on each other. Two
- * classes extending `DataFlow::Configuration` should never depend on each
- * other, but one of them should instead depend on a
- * `DataFlow2::Configuration`, a `DataFlow3::Configuration`, or a
- * `DataFlow4::Configuration`.
- *
- * See `semmle.code.cpp.ir.dataflow.DataFlow` for the full documentation.
- */
-
-import cpp
-
-module DataFlow2 {
-  import semmle.code.cpp.ir.dataflow.internal.DataFlowImpl2
-}
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/DataFlow3.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/DataFlow3.qll
deleted file mode 100644
index 42529f78e5b..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/DataFlow3.qll
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Provides a `DataFlow3` module, which is a copy of the `DataFlow` module. Use
- * this class when data-flow configurations must depend on each other. Two
- * classes extending `DataFlow::Configuration` should never depend on each
- * other, but one of them should instead depend on a
- * `DataFlow2::Configuration`, a `DataFlow3::Configuration`, or a
- * `DataFlow4::Configuration`.
- *
- * See `semmle.code.cpp.ir.dataflow.DataFlow` for the full documentation.
- */
-
-import cpp
-
-module DataFlow3 {
-  import semmle.code.cpp.ir.dataflow.internal.DataFlowImpl3
-}
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/DataFlow4.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/DataFlow4.qll
deleted file mode 100644
index 6cd49e39e71..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/DataFlow4.qll
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Provides a `DataFlow4` module, which is a copy of the `DataFlow` module. Use
- * this class when data-flow configurations must depend on each other. Two
- * classes extending `DataFlow::Configuration` should never depend on each
- * other, but one of them should instead depend on a
- * `DataFlow2::Configuration`, a `DataFlow3::Configuration`, or a
- * `DataFlow4::Configuration`.
- *
- * See `semmle.code.cpp.ir.dataflow.DataFlow` for the full documentation.
- */
-
-import cpp
-
-module DataFlow4 {
-  import semmle.code.cpp.ir.dataflow.internal.DataFlowImpl4
-}
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/TaintTracking.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/TaintTracking.qll
index 9ca1315ec3e..69bb1978cf6 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/TaintTracking.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/TaintTracking.qll
@@ -16,13 +16,11 @@
  */
 
 import semmle.code.cpp.ir.dataflow.DataFlow
-import semmle.code.cpp.ir.dataflow.DataFlow2
 
 module TaintTracking {
-  import semmle.code.cpp.ir.dataflow.internal.tainttracking1.TaintTrackingParameter::Public
+  import semmle.code.cpp.ir.dataflow.internal.TaintTrackingUtil
   private import semmle.code.cpp.ir.dataflow.internal.DataFlowImplSpecific
   private import semmle.code.cpp.ir.dataflow.internal.TaintTrackingImplSpecific
   private import codeql.dataflow.TaintTracking
   import TaintFlowMake<Location, CppDataFlow, CppTaintTracking>
-  import semmle.code.cpp.ir.dataflow.internal.tainttracking1.TaintTrackingImpl
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/TaintTracking2.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/TaintTracking2.qll
deleted file mode 100644
index 3ef03a3bd2c..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/TaintTracking2.qll
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Provides a `TaintTracking2` module, which is a copy of the `TaintTracking`
- * module. Use this class when data-flow configurations or taint-tracking
- * configurations must depend on each other. Two classes extending
- * `DataFlow::Configuration` should never depend on each other, but one of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`. The
- * `TaintTracking::Configuration` class extends `DataFlow::Configuration`, and
- * `TaintTracking2::Configuration` extends `DataFlow2::Configuration`.
- *
- * See `semmle.code.cpp.ir.dataflow.TaintTracking` for the full documentation.
- */
-module TaintTracking2 {
-  import semmle.code.cpp.ir.dataflow.internal.tainttracking2.TaintTrackingImpl
-}
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/TaintTracking3.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/TaintTracking3.qll
deleted file mode 100644
index 98e1caebf38..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/TaintTracking3.qll
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Provides a `TaintTracking3` module, which is a copy of the `TaintTracking`
- * module. Use this class when data-flow configurations or taint-tracking
- * configurations must depend on each other. Two classes extending
- * `DataFlow::Configuration` should never depend on each other, but one of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`. The
- * `TaintTracking::Configuration` class extends `DataFlow::Configuration`, and
- * `TaintTracking2::Configuration` extends `DataFlow2::Configuration`.
- *
- * See `semmle.code.cpp.ir.dataflow.TaintTracking` for the full documentation.
- */
-module TaintTracking3 {
-  import semmle.code.cpp.ir.dataflow.internal.tainttracking3.TaintTrackingImpl
-}
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl1.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl1.qll
deleted file mode 100644
index 17def0c431d..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl1.qll
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides a `Configuration` class backwards-compatible interface to the data
- * flow library.
- */
-
-private import DataFlowImplCommon
-private import DataFlowImplSpecific::Private
-import DataFlowImplSpecific::Public
-private import DataFlowImpl
-import DataFlowImplCommonPublic
-deprecated import FlowStateString
-private import codeql.util.Unit
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural data flow analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the global data flow library must define its own unique extension
- * of this abstract class. To create a configuration, extend this class with
- * a subclass whose characteristic predicate is a unique singleton string.
- * For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends DataFlow::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isBarrier`.
- *   // Optionally override `isAdditionalFlowStep`.
- * }
- * ```
- * Conceptually, this defines a graph where the nodes are `DataFlow::Node`s and
- * the edges are those data-flow steps that preserve the value of the node
- * along with any additional edges defined by `isAdditionalFlowStep`.
- * Specifying nodes in `isBarrier` will remove those nodes from the graph, and
- * specifying nodes in `isBarrierIn` and/or `isBarrierOut` will remove in-going
- * and/or out-going edges from those nodes, respectively.
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but two classes extending
- * `DataFlow::Configuration` should never depend on each other. One of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`.
- */
-abstract deprecated class Configuration extends string {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant data flow source.
-   */
-  predicate isSource(Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant data flow source with the given initial
-   * `state`.
-   */
-  predicate isSource(Node source, FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink.
-   */
-  predicate isSink(Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink accepting `state`.
-   */
-  predicate isSink(Node sink, FlowState state) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited. This completely removes
-   * `node` from the data flow graph.
-   */
-  predicate isBarrier(Node node) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited when the flow state is
-   * `state`.
-   */
-  predicate isBarrier(Node node, FlowState state) { none() }
-
-  /** Holds if data flow into `node` is prohibited. */
-  predicate isBarrierIn(Node node) { none() }
-
-  /** Holds if data flow out of `node` is prohibited. */
-  predicate isBarrierOut(Node node) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   */
-  predicate isAdditionalFlowStep(Node node1, Node node2) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
-    none()
-  }
-
-  /**
-   * Holds if an arbitrary number of implicit read steps of content `c` may be
-   * taken at `node`.
-   */
-  predicate allowImplicitRead(Node node, ContentSet c) { none() }
-
-  /**
-   * Gets the virtual dispatch branching limit when calculating field flow.
-   * This can be overridden to a smaller value to improve performance (a
-   * value of 0 disables field flow), or a larger value to get more results.
-   */
-  int fieldFlowBranchLimit() { result = 2 }
-
-  /**
-   * Gets a data flow configuration feature to add restrictions to the set of
-   * valid flow paths.
-   *
-   * - `FeatureHasSourceCallContext`:
-   *    Assume that sources have some existing call context to disallow
-   *    conflicting return-flow directly following the source.
-   * - `FeatureHasSinkCallContext`:
-   *    Assume that sinks have some existing call context to disallow
-   *    conflicting argument-to-parameter flow directly preceding the sink.
-   * - `FeatureEqualSourceSinkCallContext`:
-   *    Implies both of the above and additionally ensures that the entire flow
-   *    path preserves the call context.
-   *
-   * These features are generally not relevant for typical end-to-end data flow
-   * queries, but should only be used for constructing paths that need to
-   * somehow be pluggable in another path context.
-   */
-  FlowFeature getAFeature() { none() }
-
-  /** Holds if sources should be grouped in the result of `hasFlowPath`. */
-  predicate sourceGrouping(Node source, string sourceGroup) { none() }
-
-  /** Holds if sinks should be grouped in the result of `hasFlowPath`. */
-  predicate sinkGrouping(Node sink, string sinkGroup) { none() }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   */
-  predicate hasFlow(Node source, Node sink) { hasFlow(source, sink, this) }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   *
-   * The corresponding paths are generated from the end-points and the graph
-   * included in the module `PathGraph`.
-   */
-  predicate hasFlowPath(PathNode source, PathNode sink) { hasFlowPath(source, sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowTo(Node sink) { hasFlowTo(sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowToExpr(DataFlowExpr sink) { this.hasFlowTo(exprNode(sink)) }
-
-  /**
-   * Holds if hidden nodes should be included in the data flow graph.
-   *
-   * This feature should only be used for debugging or when the data flow graph
-   * is not visualized (for example in a `path-problem` query).
-   */
-  predicate includeHiddenNodes() { none() }
-}
-
-/**
- * This class exists to prevent mutual recursion between the user-overridden
- * member predicates of `Configuration` and the rest of the data-flow library.
- * Good performance cannot be guaranteed in the presence of such recursion, so
- * it should be replaced by using more than one copy of the data flow library.
- */
-abstract deprecated private class ConfigurationRecursionPrevention extends Configuration {
-  bindingset[this]
-  ConfigurationRecursionPrevention() { any() }
-
-  override predicate hasFlow(Node source, Node sink) {
-    strictcount(Node n | this.isSource(n)) < 0
-    or
-    strictcount(Node n | this.isSource(n, _)) < 0
-    or
-    strictcount(Node n | this.isSink(n)) < 0
-    or
-    strictcount(Node n | this.isSink(n, _)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, _, n2, _)) < 0
-    or
-    super.hasFlow(source, sink)
-  }
-}
-
-deprecated private FlowState relevantState(Configuration config) {
-  config.isSource(_, result) or
-  config.isSink(_, result) or
-  config.isBarrier(_, result) or
-  config.isAdditionalFlowStep(_, result, _, _) or
-  config.isAdditionalFlowStep(_, _, _, result)
-}
-
-private newtype TConfigState =
-  deprecated TMkConfigState(Configuration config, FlowState state) {
-    state = relevantState(config) or state instanceof FlowStateEmpty
-  }
-
-deprecated private Configuration getConfig(TConfigState state) { state = TMkConfigState(result, _) }
-
-deprecated private FlowState getState(TConfigState state) { state = TMkConfigState(_, result) }
-
-deprecated private predicate singleConfiguration() { 1 = strictcount(Configuration c) }
-
-deprecated private module Config implements FullStateConfigSig {
-  class FlowState = TConfigState;
-
-  predicate isSource(Node source, FlowState state) {
-    getConfig(state).isSource(source, getState(state))
-    or
-    getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isSink(Node sink) { none() }
-
-  predicate isSink(Node sink, FlowState state) {
-    getConfig(state).isSink(sink, getState(state))
-    or
-    getConfig(state).isSink(sink) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isBarrier(Node node) { none() }
-
-  predicate isBarrier(Node node, FlowState state) {
-    getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node)
-  }
-
-  predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
-
-  predicate isBarrierOut(Node node) { any(Configuration config).isBarrierOut(node) }
-
-  predicate isBarrierIn(Node node, FlowState state) { none() }
-
-  predicate isBarrierOut(Node node, FlowState state) { none() }
-
-  predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
-    singleConfiguration() and
-    any(Configuration config).isAdditionalFlowStep(node1, node2) and
-    model = ""
-  }
-
-  predicate isAdditionalFlowStep(
-    Node node1, FlowState state1, Node node2, FlowState state2, string model
-  ) {
-    getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1) and
-    model = ""
-    or
-    not singleConfiguration() and
-    getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1 and
-    model = ""
-  }
-
-  predicate allowImplicitRead(Node node, ContentSet c) {
-    any(Configuration config).allowImplicitRead(node, c)
-  }
-
-  predicate neverSkip(Node node) { none() }
-
-  int fieldFlowBranchLimit() { result = min(any(Configuration config).fieldFlowBranchLimit()) }
-
-  int accessPathLimit() { result = 5 }
-
-  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
-
-  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
-
-  predicate observeDiffInformedIncrementalMode() { none() }
-}
-
-deprecated private import Impl<Config> as I
-
-/**
- * A `Node` augmented with a call context (except for sinks), an access path, and a configuration.
- * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
- */
-deprecated class PathNode instanceof I::PathNode {
-  /** Gets a textual representation of this element. */
-  final string toString() { result = super.toString() }
-
-  /**
-   * Gets a textual representation of this element, including a textual
-   * representation of the call context.
-   */
-  final string toStringWithContext() { result = super.toStringWithContext() }
-
-  /**
-   * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
-   * For more information, see
-   * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
-   */
-  final predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    super.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-
-  /** Gets the underlying `Node`. */
-  final Node getNode() { result = super.getNode() }
-
-  /** Gets the `FlowState` of this node. */
-  deprecated final FlowState getState() { result = getState(super.getState()) }
-
-  /** Gets the associated configuration. */
-  deprecated final Configuration getConfiguration() { result = getConfig(super.getState()) }
-
-  /** Gets a successor of this node, if any. */
-  final PathNode getASuccessor() { result = super.getASuccessor() }
-
-  /** Holds if this node is a source. */
-  final predicate isSource() { super.isSource() }
-
-  /** Holds if this node is a grouping of source nodes. */
-  final predicate isSourceGroup(string group) { super.isSourceGroup(group) }
-
-  /** Holds if this node is a grouping of sink nodes. */
-  final predicate isSinkGroup(string group) { super.isSinkGroup(group) }
-}
-
-deprecated module PathGraph = I::PathGraph;
-
-deprecated private predicate hasFlow(Node source, Node sink, Configuration config) {
-  exists(PathNode source0, PathNode sink0 |
-    hasFlowPath(source0, sink0, config) and
-    source0.getNode() = source and
-    sink0.getNode() = sink
-  )
-}
-
-deprecated private predicate hasFlowPath(PathNode source, PathNode sink, Configuration config) {
-  I::flowPath(source, sink) and source.getConfiguration() = config
-}
-
-deprecated private predicate hasFlowTo(Node sink, Configuration config) { hasFlow(_, sink, config) }
-
-deprecated predicate flowsTo = hasFlow/3;
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll
deleted file mode 100644
index 17def0c431d..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides a `Configuration` class backwards-compatible interface to the data
- * flow library.
- */
-
-private import DataFlowImplCommon
-private import DataFlowImplSpecific::Private
-import DataFlowImplSpecific::Public
-private import DataFlowImpl
-import DataFlowImplCommonPublic
-deprecated import FlowStateString
-private import codeql.util.Unit
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural data flow analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the global data flow library must define its own unique extension
- * of this abstract class. To create a configuration, extend this class with
- * a subclass whose characteristic predicate is a unique singleton string.
- * For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends DataFlow::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isBarrier`.
- *   // Optionally override `isAdditionalFlowStep`.
- * }
- * ```
- * Conceptually, this defines a graph where the nodes are `DataFlow::Node`s and
- * the edges are those data-flow steps that preserve the value of the node
- * along with any additional edges defined by `isAdditionalFlowStep`.
- * Specifying nodes in `isBarrier` will remove those nodes from the graph, and
- * specifying nodes in `isBarrierIn` and/or `isBarrierOut` will remove in-going
- * and/or out-going edges from those nodes, respectively.
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but two classes extending
- * `DataFlow::Configuration` should never depend on each other. One of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`.
- */
-abstract deprecated class Configuration extends string {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant data flow source.
-   */
-  predicate isSource(Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant data flow source with the given initial
-   * `state`.
-   */
-  predicate isSource(Node source, FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink.
-   */
-  predicate isSink(Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink accepting `state`.
-   */
-  predicate isSink(Node sink, FlowState state) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited. This completely removes
-   * `node` from the data flow graph.
-   */
-  predicate isBarrier(Node node) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited when the flow state is
-   * `state`.
-   */
-  predicate isBarrier(Node node, FlowState state) { none() }
-
-  /** Holds if data flow into `node` is prohibited. */
-  predicate isBarrierIn(Node node) { none() }
-
-  /** Holds if data flow out of `node` is prohibited. */
-  predicate isBarrierOut(Node node) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   */
-  predicate isAdditionalFlowStep(Node node1, Node node2) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
-    none()
-  }
-
-  /**
-   * Holds if an arbitrary number of implicit read steps of content `c` may be
-   * taken at `node`.
-   */
-  predicate allowImplicitRead(Node node, ContentSet c) { none() }
-
-  /**
-   * Gets the virtual dispatch branching limit when calculating field flow.
-   * This can be overridden to a smaller value to improve performance (a
-   * value of 0 disables field flow), or a larger value to get more results.
-   */
-  int fieldFlowBranchLimit() { result = 2 }
-
-  /**
-   * Gets a data flow configuration feature to add restrictions to the set of
-   * valid flow paths.
-   *
-   * - `FeatureHasSourceCallContext`:
-   *    Assume that sources have some existing call context to disallow
-   *    conflicting return-flow directly following the source.
-   * - `FeatureHasSinkCallContext`:
-   *    Assume that sinks have some existing call context to disallow
-   *    conflicting argument-to-parameter flow directly preceding the sink.
-   * - `FeatureEqualSourceSinkCallContext`:
-   *    Implies both of the above and additionally ensures that the entire flow
-   *    path preserves the call context.
-   *
-   * These features are generally not relevant for typical end-to-end data flow
-   * queries, but should only be used for constructing paths that need to
-   * somehow be pluggable in another path context.
-   */
-  FlowFeature getAFeature() { none() }
-
-  /** Holds if sources should be grouped in the result of `hasFlowPath`. */
-  predicate sourceGrouping(Node source, string sourceGroup) { none() }
-
-  /** Holds if sinks should be grouped in the result of `hasFlowPath`. */
-  predicate sinkGrouping(Node sink, string sinkGroup) { none() }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   */
-  predicate hasFlow(Node source, Node sink) { hasFlow(source, sink, this) }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   *
-   * The corresponding paths are generated from the end-points and the graph
-   * included in the module `PathGraph`.
-   */
-  predicate hasFlowPath(PathNode source, PathNode sink) { hasFlowPath(source, sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowTo(Node sink) { hasFlowTo(sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowToExpr(DataFlowExpr sink) { this.hasFlowTo(exprNode(sink)) }
-
-  /**
-   * Holds if hidden nodes should be included in the data flow graph.
-   *
-   * This feature should only be used for debugging or when the data flow graph
-   * is not visualized (for example in a `path-problem` query).
-   */
-  predicate includeHiddenNodes() { none() }
-}
-
-/**
- * This class exists to prevent mutual recursion between the user-overridden
- * member predicates of `Configuration` and the rest of the data-flow library.
- * Good performance cannot be guaranteed in the presence of such recursion, so
- * it should be replaced by using more than one copy of the data flow library.
- */
-abstract deprecated private class ConfigurationRecursionPrevention extends Configuration {
-  bindingset[this]
-  ConfigurationRecursionPrevention() { any() }
-
-  override predicate hasFlow(Node source, Node sink) {
-    strictcount(Node n | this.isSource(n)) < 0
-    or
-    strictcount(Node n | this.isSource(n, _)) < 0
-    or
-    strictcount(Node n | this.isSink(n)) < 0
-    or
-    strictcount(Node n | this.isSink(n, _)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, _, n2, _)) < 0
-    or
-    super.hasFlow(source, sink)
-  }
-}
-
-deprecated private FlowState relevantState(Configuration config) {
-  config.isSource(_, result) or
-  config.isSink(_, result) or
-  config.isBarrier(_, result) or
-  config.isAdditionalFlowStep(_, result, _, _) or
-  config.isAdditionalFlowStep(_, _, _, result)
-}
-
-private newtype TConfigState =
-  deprecated TMkConfigState(Configuration config, FlowState state) {
-    state = relevantState(config) or state instanceof FlowStateEmpty
-  }
-
-deprecated private Configuration getConfig(TConfigState state) { state = TMkConfigState(result, _) }
-
-deprecated private FlowState getState(TConfigState state) { state = TMkConfigState(_, result) }
-
-deprecated private predicate singleConfiguration() { 1 = strictcount(Configuration c) }
-
-deprecated private module Config implements FullStateConfigSig {
-  class FlowState = TConfigState;
-
-  predicate isSource(Node source, FlowState state) {
-    getConfig(state).isSource(source, getState(state))
-    or
-    getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isSink(Node sink) { none() }
-
-  predicate isSink(Node sink, FlowState state) {
-    getConfig(state).isSink(sink, getState(state))
-    or
-    getConfig(state).isSink(sink) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isBarrier(Node node) { none() }
-
-  predicate isBarrier(Node node, FlowState state) {
-    getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node)
-  }
-
-  predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
-
-  predicate isBarrierOut(Node node) { any(Configuration config).isBarrierOut(node) }
-
-  predicate isBarrierIn(Node node, FlowState state) { none() }
-
-  predicate isBarrierOut(Node node, FlowState state) { none() }
-
-  predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
-    singleConfiguration() and
-    any(Configuration config).isAdditionalFlowStep(node1, node2) and
-    model = ""
-  }
-
-  predicate isAdditionalFlowStep(
-    Node node1, FlowState state1, Node node2, FlowState state2, string model
-  ) {
-    getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1) and
-    model = ""
-    or
-    not singleConfiguration() and
-    getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1 and
-    model = ""
-  }
-
-  predicate allowImplicitRead(Node node, ContentSet c) {
-    any(Configuration config).allowImplicitRead(node, c)
-  }
-
-  predicate neverSkip(Node node) { none() }
-
-  int fieldFlowBranchLimit() { result = min(any(Configuration config).fieldFlowBranchLimit()) }
-
-  int accessPathLimit() { result = 5 }
-
-  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
-
-  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
-
-  predicate observeDiffInformedIncrementalMode() { none() }
-}
-
-deprecated private import Impl<Config> as I
-
-/**
- * A `Node` augmented with a call context (except for sinks), an access path, and a configuration.
- * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
- */
-deprecated class PathNode instanceof I::PathNode {
-  /** Gets a textual representation of this element. */
-  final string toString() { result = super.toString() }
-
-  /**
-   * Gets a textual representation of this element, including a textual
-   * representation of the call context.
-   */
-  final string toStringWithContext() { result = super.toStringWithContext() }
-
-  /**
-   * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
-   * For more information, see
-   * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
-   */
-  final predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    super.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-
-  /** Gets the underlying `Node`. */
-  final Node getNode() { result = super.getNode() }
-
-  /** Gets the `FlowState` of this node. */
-  deprecated final FlowState getState() { result = getState(super.getState()) }
-
-  /** Gets the associated configuration. */
-  deprecated final Configuration getConfiguration() { result = getConfig(super.getState()) }
-
-  /** Gets a successor of this node, if any. */
-  final PathNode getASuccessor() { result = super.getASuccessor() }
-
-  /** Holds if this node is a source. */
-  final predicate isSource() { super.isSource() }
-
-  /** Holds if this node is a grouping of source nodes. */
-  final predicate isSourceGroup(string group) { super.isSourceGroup(group) }
-
-  /** Holds if this node is a grouping of sink nodes. */
-  final predicate isSinkGroup(string group) { super.isSinkGroup(group) }
-}
-
-deprecated module PathGraph = I::PathGraph;
-
-deprecated private predicate hasFlow(Node source, Node sink, Configuration config) {
-  exists(PathNode source0, PathNode sink0 |
-    hasFlowPath(source0, sink0, config) and
-    source0.getNode() = source and
-    sink0.getNode() = sink
-  )
-}
-
-deprecated private predicate hasFlowPath(PathNode source, PathNode sink, Configuration config) {
-  I::flowPath(source, sink) and source.getConfiguration() = config
-}
-
-deprecated private predicate hasFlowTo(Node sink, Configuration config) { hasFlow(_, sink, config) }
-
-deprecated predicate flowsTo = hasFlow/3;
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll
deleted file mode 100644
index 17def0c431d..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides a `Configuration` class backwards-compatible interface to the data
- * flow library.
- */
-
-private import DataFlowImplCommon
-private import DataFlowImplSpecific::Private
-import DataFlowImplSpecific::Public
-private import DataFlowImpl
-import DataFlowImplCommonPublic
-deprecated import FlowStateString
-private import codeql.util.Unit
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural data flow analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the global data flow library must define its own unique extension
- * of this abstract class. To create a configuration, extend this class with
- * a subclass whose characteristic predicate is a unique singleton string.
- * For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends DataFlow::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isBarrier`.
- *   // Optionally override `isAdditionalFlowStep`.
- * }
- * ```
- * Conceptually, this defines a graph where the nodes are `DataFlow::Node`s and
- * the edges are those data-flow steps that preserve the value of the node
- * along with any additional edges defined by `isAdditionalFlowStep`.
- * Specifying nodes in `isBarrier` will remove those nodes from the graph, and
- * specifying nodes in `isBarrierIn` and/or `isBarrierOut` will remove in-going
- * and/or out-going edges from those nodes, respectively.
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but two classes extending
- * `DataFlow::Configuration` should never depend on each other. One of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`.
- */
-abstract deprecated class Configuration extends string {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant data flow source.
-   */
-  predicate isSource(Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant data flow source with the given initial
-   * `state`.
-   */
-  predicate isSource(Node source, FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink.
-   */
-  predicate isSink(Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink accepting `state`.
-   */
-  predicate isSink(Node sink, FlowState state) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited. This completely removes
-   * `node` from the data flow graph.
-   */
-  predicate isBarrier(Node node) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited when the flow state is
-   * `state`.
-   */
-  predicate isBarrier(Node node, FlowState state) { none() }
-
-  /** Holds if data flow into `node` is prohibited. */
-  predicate isBarrierIn(Node node) { none() }
-
-  /** Holds if data flow out of `node` is prohibited. */
-  predicate isBarrierOut(Node node) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   */
-  predicate isAdditionalFlowStep(Node node1, Node node2) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
-    none()
-  }
-
-  /**
-   * Holds if an arbitrary number of implicit read steps of content `c` may be
-   * taken at `node`.
-   */
-  predicate allowImplicitRead(Node node, ContentSet c) { none() }
-
-  /**
-   * Gets the virtual dispatch branching limit when calculating field flow.
-   * This can be overridden to a smaller value to improve performance (a
-   * value of 0 disables field flow), or a larger value to get more results.
-   */
-  int fieldFlowBranchLimit() { result = 2 }
-
-  /**
-   * Gets a data flow configuration feature to add restrictions to the set of
-   * valid flow paths.
-   *
-   * - `FeatureHasSourceCallContext`:
-   *    Assume that sources have some existing call context to disallow
-   *    conflicting return-flow directly following the source.
-   * - `FeatureHasSinkCallContext`:
-   *    Assume that sinks have some existing call context to disallow
-   *    conflicting argument-to-parameter flow directly preceding the sink.
-   * - `FeatureEqualSourceSinkCallContext`:
-   *    Implies both of the above and additionally ensures that the entire flow
-   *    path preserves the call context.
-   *
-   * These features are generally not relevant for typical end-to-end data flow
-   * queries, but should only be used for constructing paths that need to
-   * somehow be pluggable in another path context.
-   */
-  FlowFeature getAFeature() { none() }
-
-  /** Holds if sources should be grouped in the result of `hasFlowPath`. */
-  predicate sourceGrouping(Node source, string sourceGroup) { none() }
-
-  /** Holds if sinks should be grouped in the result of `hasFlowPath`. */
-  predicate sinkGrouping(Node sink, string sinkGroup) { none() }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   */
-  predicate hasFlow(Node source, Node sink) { hasFlow(source, sink, this) }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   *
-   * The corresponding paths are generated from the end-points and the graph
-   * included in the module `PathGraph`.
-   */
-  predicate hasFlowPath(PathNode source, PathNode sink) { hasFlowPath(source, sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowTo(Node sink) { hasFlowTo(sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowToExpr(DataFlowExpr sink) { this.hasFlowTo(exprNode(sink)) }
-
-  /**
-   * Holds if hidden nodes should be included in the data flow graph.
-   *
-   * This feature should only be used for debugging or when the data flow graph
-   * is not visualized (for example in a `path-problem` query).
-   */
-  predicate includeHiddenNodes() { none() }
-}
-
-/**
- * This class exists to prevent mutual recursion between the user-overridden
- * member predicates of `Configuration` and the rest of the data-flow library.
- * Good performance cannot be guaranteed in the presence of such recursion, so
- * it should be replaced by using more than one copy of the data flow library.
- */
-abstract deprecated private class ConfigurationRecursionPrevention extends Configuration {
-  bindingset[this]
-  ConfigurationRecursionPrevention() { any() }
-
-  override predicate hasFlow(Node source, Node sink) {
-    strictcount(Node n | this.isSource(n)) < 0
-    or
-    strictcount(Node n | this.isSource(n, _)) < 0
-    or
-    strictcount(Node n | this.isSink(n)) < 0
-    or
-    strictcount(Node n | this.isSink(n, _)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, _, n2, _)) < 0
-    or
-    super.hasFlow(source, sink)
-  }
-}
-
-deprecated private FlowState relevantState(Configuration config) {
-  config.isSource(_, result) or
-  config.isSink(_, result) or
-  config.isBarrier(_, result) or
-  config.isAdditionalFlowStep(_, result, _, _) or
-  config.isAdditionalFlowStep(_, _, _, result)
-}
-
-private newtype TConfigState =
-  deprecated TMkConfigState(Configuration config, FlowState state) {
-    state = relevantState(config) or state instanceof FlowStateEmpty
-  }
-
-deprecated private Configuration getConfig(TConfigState state) { state = TMkConfigState(result, _) }
-
-deprecated private FlowState getState(TConfigState state) { state = TMkConfigState(_, result) }
-
-deprecated private predicate singleConfiguration() { 1 = strictcount(Configuration c) }
-
-deprecated private module Config implements FullStateConfigSig {
-  class FlowState = TConfigState;
-
-  predicate isSource(Node source, FlowState state) {
-    getConfig(state).isSource(source, getState(state))
-    or
-    getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isSink(Node sink) { none() }
-
-  predicate isSink(Node sink, FlowState state) {
-    getConfig(state).isSink(sink, getState(state))
-    or
-    getConfig(state).isSink(sink) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isBarrier(Node node) { none() }
-
-  predicate isBarrier(Node node, FlowState state) {
-    getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node)
-  }
-
-  predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
-
-  predicate isBarrierOut(Node node) { any(Configuration config).isBarrierOut(node) }
-
-  predicate isBarrierIn(Node node, FlowState state) { none() }
-
-  predicate isBarrierOut(Node node, FlowState state) { none() }
-
-  predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
-    singleConfiguration() and
-    any(Configuration config).isAdditionalFlowStep(node1, node2) and
-    model = ""
-  }
-
-  predicate isAdditionalFlowStep(
-    Node node1, FlowState state1, Node node2, FlowState state2, string model
-  ) {
-    getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1) and
-    model = ""
-    or
-    not singleConfiguration() and
-    getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1 and
-    model = ""
-  }
-
-  predicate allowImplicitRead(Node node, ContentSet c) {
-    any(Configuration config).allowImplicitRead(node, c)
-  }
-
-  predicate neverSkip(Node node) { none() }
-
-  int fieldFlowBranchLimit() { result = min(any(Configuration config).fieldFlowBranchLimit()) }
-
-  int accessPathLimit() { result = 5 }
-
-  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
-
-  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
-
-  predicate observeDiffInformedIncrementalMode() { none() }
-}
-
-deprecated private import Impl<Config> as I
-
-/**
- * A `Node` augmented with a call context (except for sinks), an access path, and a configuration.
- * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
- */
-deprecated class PathNode instanceof I::PathNode {
-  /** Gets a textual representation of this element. */
-  final string toString() { result = super.toString() }
-
-  /**
-   * Gets a textual representation of this element, including a textual
-   * representation of the call context.
-   */
-  final string toStringWithContext() { result = super.toStringWithContext() }
-
-  /**
-   * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
-   * For more information, see
-   * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
-   */
-  final predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    super.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-
-  /** Gets the underlying `Node`. */
-  final Node getNode() { result = super.getNode() }
-
-  /** Gets the `FlowState` of this node. */
-  deprecated final FlowState getState() { result = getState(super.getState()) }
-
-  /** Gets the associated configuration. */
-  deprecated final Configuration getConfiguration() { result = getConfig(super.getState()) }
-
-  /** Gets a successor of this node, if any. */
-  final PathNode getASuccessor() { result = super.getASuccessor() }
-
-  /** Holds if this node is a source. */
-  final predicate isSource() { super.isSource() }
-
-  /** Holds if this node is a grouping of source nodes. */
-  final predicate isSourceGroup(string group) { super.isSourceGroup(group) }
-
-  /** Holds if this node is a grouping of sink nodes. */
-  final predicate isSinkGroup(string group) { super.isSinkGroup(group) }
-}
-
-deprecated module PathGraph = I::PathGraph;
-
-deprecated private predicate hasFlow(Node source, Node sink, Configuration config) {
-  exists(PathNode source0, PathNode sink0 |
-    hasFlowPath(source0, sink0, config) and
-    source0.getNode() = source and
-    sink0.getNode() = sink
-  )
-}
-
-deprecated private predicate hasFlowPath(PathNode source, PathNode sink, Configuration config) {
-  I::flowPath(source, sink) and source.getConfiguration() = config
-}
-
-deprecated private predicate hasFlowTo(Node sink, Configuration config) { hasFlow(_, sink, config) }
-
-deprecated predicate flowsTo = hasFlow/3;
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll
deleted file mode 100644
index 17def0c431d..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides a `Configuration` class backwards-compatible interface to the data
- * flow library.
- */
-
-private import DataFlowImplCommon
-private import DataFlowImplSpecific::Private
-import DataFlowImplSpecific::Public
-private import DataFlowImpl
-import DataFlowImplCommonPublic
-deprecated import FlowStateString
-private import codeql.util.Unit
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural data flow analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the global data flow library must define its own unique extension
- * of this abstract class. To create a configuration, extend this class with
- * a subclass whose characteristic predicate is a unique singleton string.
- * For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends DataFlow::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isBarrier`.
- *   // Optionally override `isAdditionalFlowStep`.
- * }
- * ```
- * Conceptually, this defines a graph where the nodes are `DataFlow::Node`s and
- * the edges are those data-flow steps that preserve the value of the node
- * along with any additional edges defined by `isAdditionalFlowStep`.
- * Specifying nodes in `isBarrier` will remove those nodes from the graph, and
- * specifying nodes in `isBarrierIn` and/or `isBarrierOut` will remove in-going
- * and/or out-going edges from those nodes, respectively.
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but two classes extending
- * `DataFlow::Configuration` should never depend on each other. One of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`.
- */
-abstract deprecated class Configuration extends string {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant data flow source.
-   */
-  predicate isSource(Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant data flow source with the given initial
-   * `state`.
-   */
-  predicate isSource(Node source, FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink.
-   */
-  predicate isSink(Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink accepting `state`.
-   */
-  predicate isSink(Node sink, FlowState state) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited. This completely removes
-   * `node` from the data flow graph.
-   */
-  predicate isBarrier(Node node) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited when the flow state is
-   * `state`.
-   */
-  predicate isBarrier(Node node, FlowState state) { none() }
-
-  /** Holds if data flow into `node` is prohibited. */
-  predicate isBarrierIn(Node node) { none() }
-
-  /** Holds if data flow out of `node` is prohibited. */
-  predicate isBarrierOut(Node node) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   */
-  predicate isAdditionalFlowStep(Node node1, Node node2) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
-    none()
-  }
-
-  /**
-   * Holds if an arbitrary number of implicit read steps of content `c` may be
-   * taken at `node`.
-   */
-  predicate allowImplicitRead(Node node, ContentSet c) { none() }
-
-  /**
-   * Gets the virtual dispatch branching limit when calculating field flow.
-   * This can be overridden to a smaller value to improve performance (a
-   * value of 0 disables field flow), or a larger value to get more results.
-   */
-  int fieldFlowBranchLimit() { result = 2 }
-
-  /**
-   * Gets a data flow configuration feature to add restrictions to the set of
-   * valid flow paths.
-   *
-   * - `FeatureHasSourceCallContext`:
-   *    Assume that sources have some existing call context to disallow
-   *    conflicting return-flow directly following the source.
-   * - `FeatureHasSinkCallContext`:
-   *    Assume that sinks have some existing call context to disallow
-   *    conflicting argument-to-parameter flow directly preceding the sink.
-   * - `FeatureEqualSourceSinkCallContext`:
-   *    Implies both of the above and additionally ensures that the entire flow
-   *    path preserves the call context.
-   *
-   * These features are generally not relevant for typical end-to-end data flow
-   * queries, but should only be used for constructing paths that need to
-   * somehow be pluggable in another path context.
-   */
-  FlowFeature getAFeature() { none() }
-
-  /** Holds if sources should be grouped in the result of `hasFlowPath`. */
-  predicate sourceGrouping(Node source, string sourceGroup) { none() }
-
-  /** Holds if sinks should be grouped in the result of `hasFlowPath`. */
-  predicate sinkGrouping(Node sink, string sinkGroup) { none() }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   */
-  predicate hasFlow(Node source, Node sink) { hasFlow(source, sink, this) }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   *
-   * The corresponding paths are generated from the end-points and the graph
-   * included in the module `PathGraph`.
-   */
-  predicate hasFlowPath(PathNode source, PathNode sink) { hasFlowPath(source, sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowTo(Node sink) { hasFlowTo(sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowToExpr(DataFlowExpr sink) { this.hasFlowTo(exprNode(sink)) }
-
-  /**
-   * Holds if hidden nodes should be included in the data flow graph.
-   *
-   * This feature should only be used for debugging or when the data flow graph
-   * is not visualized (for example in a `path-problem` query).
-   */
-  predicate includeHiddenNodes() { none() }
-}
-
-/**
- * This class exists to prevent mutual recursion between the user-overridden
- * member predicates of `Configuration` and the rest of the data-flow library.
- * Good performance cannot be guaranteed in the presence of such recursion, so
- * it should be replaced by using more than one copy of the data flow library.
- */
-abstract deprecated private class ConfigurationRecursionPrevention extends Configuration {
-  bindingset[this]
-  ConfigurationRecursionPrevention() { any() }
-
-  override predicate hasFlow(Node source, Node sink) {
-    strictcount(Node n | this.isSource(n)) < 0
-    or
-    strictcount(Node n | this.isSource(n, _)) < 0
-    or
-    strictcount(Node n | this.isSink(n)) < 0
-    or
-    strictcount(Node n | this.isSink(n, _)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, _, n2, _)) < 0
-    or
-    super.hasFlow(source, sink)
-  }
-}
-
-deprecated private FlowState relevantState(Configuration config) {
-  config.isSource(_, result) or
-  config.isSink(_, result) or
-  config.isBarrier(_, result) or
-  config.isAdditionalFlowStep(_, result, _, _) or
-  config.isAdditionalFlowStep(_, _, _, result)
-}
-
-private newtype TConfigState =
-  deprecated TMkConfigState(Configuration config, FlowState state) {
-    state = relevantState(config) or state instanceof FlowStateEmpty
-  }
-
-deprecated private Configuration getConfig(TConfigState state) { state = TMkConfigState(result, _) }
-
-deprecated private FlowState getState(TConfigState state) { state = TMkConfigState(_, result) }
-
-deprecated private predicate singleConfiguration() { 1 = strictcount(Configuration c) }
-
-deprecated private module Config implements FullStateConfigSig {
-  class FlowState = TConfigState;
-
-  predicate isSource(Node source, FlowState state) {
-    getConfig(state).isSource(source, getState(state))
-    or
-    getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isSink(Node sink) { none() }
-
-  predicate isSink(Node sink, FlowState state) {
-    getConfig(state).isSink(sink, getState(state))
-    or
-    getConfig(state).isSink(sink) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isBarrier(Node node) { none() }
-
-  predicate isBarrier(Node node, FlowState state) {
-    getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node)
-  }
-
-  predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
-
-  predicate isBarrierOut(Node node) { any(Configuration config).isBarrierOut(node) }
-
-  predicate isBarrierIn(Node node, FlowState state) { none() }
-
-  predicate isBarrierOut(Node node, FlowState state) { none() }
-
-  predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
-    singleConfiguration() and
-    any(Configuration config).isAdditionalFlowStep(node1, node2) and
-    model = ""
-  }
-
-  predicate isAdditionalFlowStep(
-    Node node1, FlowState state1, Node node2, FlowState state2, string model
-  ) {
-    getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1) and
-    model = ""
-    or
-    not singleConfiguration() and
-    getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1 and
-    model = ""
-  }
-
-  predicate allowImplicitRead(Node node, ContentSet c) {
-    any(Configuration config).allowImplicitRead(node, c)
-  }
-
-  predicate neverSkip(Node node) { none() }
-
-  int fieldFlowBranchLimit() { result = min(any(Configuration config).fieldFlowBranchLimit()) }
-
-  int accessPathLimit() { result = 5 }
-
-  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
-
-  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
-
-  predicate observeDiffInformedIncrementalMode() { none() }
-}
-
-deprecated private import Impl<Config> as I
-
-/**
- * A `Node` augmented with a call context (except for sinks), an access path, and a configuration.
- * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
- */
-deprecated class PathNode instanceof I::PathNode {
-  /** Gets a textual representation of this element. */
-  final string toString() { result = super.toString() }
-
-  /**
-   * Gets a textual representation of this element, including a textual
-   * representation of the call context.
-   */
-  final string toStringWithContext() { result = super.toStringWithContext() }
-
-  /**
-   * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
-   * For more information, see
-   * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
-   */
-  final predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    super.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-
-  /** Gets the underlying `Node`. */
-  final Node getNode() { result = super.getNode() }
-
-  /** Gets the `FlowState` of this node. */
-  deprecated final FlowState getState() { result = getState(super.getState()) }
-
-  /** Gets the associated configuration. */
-  deprecated final Configuration getConfiguration() { result = getConfig(super.getState()) }
-
-  /** Gets a successor of this node, if any. */
-  final PathNode getASuccessor() { result = super.getASuccessor() }
-
-  /** Holds if this node is a source. */
-  final predicate isSource() { super.isSource() }
-
-  /** Holds if this node is a grouping of source nodes. */
-  final predicate isSourceGroup(string group) { super.isSourceGroup(group) }
-
-  /** Holds if this node is a grouping of sink nodes. */
-  final predicate isSinkGroup(string group) { super.isSinkGroup(group) }
-}
-
-deprecated module PathGraph = I::PathGraph;
-
-deprecated private predicate hasFlow(Node source, Node sink, Configuration config) {
-  exists(PathNode source0, PathNode sink0 |
-    hasFlowPath(source0, sink0, config) and
-    source0.getNode() = source and
-    sink0.getNode() = sink
-  )
-}
-
-deprecated private predicate hasFlowPath(PathNode source, PathNode sink, Configuration config) {
-  I::flowPath(source, sink) and source.getConfiguration() = config
-}
-
-deprecated private predicate hasFlowTo(Node sink, Configuration config) { hasFlow(_, sink, config) }
-
-deprecated predicate flowsTo = hasFlow/3;
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/ProductFlow.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/ProductFlow.qll
index 0c474b0e75d..ff5f3e46e64 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/ProductFlow.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/ProductFlow.qll
@@ -545,7 +545,7 @@ module ProductFlow {
     private predicate outImpl1(Flow1::PathNode pred1, Flow1::PathNode succ1, DataFlowCall call) {
       Flow1::PathGraph::edges(pred1, succ1, _, _) and
       exists(ReturnKindExt returnKind |
-        succ1.getNode() = returnKind.getAnOutNode(call) and
+        succ1.getNode() = getAnOutNodeExt(call, returnKind) and
         returnKind = getParamReturnPosition(_, pred1.asParameterReturnNode()).getKind()
       )
     }
@@ -573,7 +573,7 @@ module ProductFlow {
     private predicate outImpl2(Flow2::PathNode pred2, Flow2::PathNode succ2, DataFlowCall call) {
       Flow2::PathGraph::edges(pred2, succ2, _, _) and
       exists(ReturnKindExt returnKind |
-        succ2.getNode() = returnKind.getAnOutNode(call) and
+        succ2.getNode() = getAnOutNodeExt(call, returnKind) and
         returnKind = getParamReturnPosition(_, pred2.asParameterReturnNode()).getKind()
       )
     }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking1/TaintTrackingImpl.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
deleted file mode 100644
index 75e7856fd26..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides an implementation of global (interprocedural) taint tracking.
- * This file re-exports the local (intraprocedural) taint-tracking analysis
- * from `TaintTrackingParameter::Public` and adds a global analysis, mainly
- * exposed through the `Configuration` class. For some languages, this file
- * exists in several identical copies, allowing queries to use multiple
- * `Configuration` classes that depend on each other without introducing
- * mutual recursion among those configurations.
- */
-
-import TaintTrackingParameter::Public
-private import TaintTrackingParameter::Private
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural taint tracking analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the taint tracking library must define its own unique extension of
- * this abstract class.
- *
- * A taint-tracking configuration is a special data flow configuration
- * (`DataFlow::Configuration`) that allows for flow through nodes that do not
- * necessarily preserve values but are still relevant from a taint tracking
- * perspective. (For example, string concatenation, where one of the operands
- * is tainted.)
- *
- * To create a configuration, extend this class with a subclass whose
- * characteristic predicate is a unique singleton string. For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends TaintTracking::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isSanitizer`.
- *   // Optionally override `isSanitizerIn`.
- *   // Optionally override `isSanitizerOut`.
- *   // Optionally override `isSanitizerGuard`.
- *   // Optionally override `isAdditionalTaintStep`.
- * }
- * ```
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but it is unsupported to depend on
- * another `TaintTracking::Configuration` or a `DataFlow::Configuration` in the
- * overridden predicates that define sources, sinks, or additional steps.
- * Instead, the dependency should go to a `TaintTracking2::Configuration` or a
- * `DataFlow2::Configuration`, `DataFlow3::Configuration`, etc.
- */
-abstract deprecated class Configuration extends DataFlow::Configuration {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant taint source.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant taint source with the given initial
-   * `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink accepting `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
-
-  /** Holds if the node `node` is a taint sanitizer. */
-  predicate isSanitizer(DataFlow::Node node) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node) {
-    this.isSanitizer(node) or
-    defaultTaintSanitizer(node)
-  }
-
-  /**
-   * Holds if the node `node` is a taint sanitizer when the flow state is
-   * `state`.
-   */
-  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
-    this.isSanitizer(node, state)
-  }
-
-  /** Holds if taint propagation into `node` is prohibited. */
-  predicate isSanitizerIn(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierIn(DataFlow::Node node) { this.isSanitizerIn(node) }
-
-  /** Holds if taint propagation out of `node` is prohibited. */
-  predicate isSanitizerOut(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   */
-  predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) { none() }
-
-  final override predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
-    this.isAdditionalTaintStep(node1, node2) or
-    defaultAdditionalTaintStep(node1, node2, _)
-  }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalTaintStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    none()
-  }
-
-  final override predicate isAdditionalFlowStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    this.isAdditionalTaintStep(node1, state1, node2, state2)
-  }
-
-  override predicate allowImplicitRead(DataFlow::Node node, DataFlow::ContentSet c) {
-    (
-      this.isSink(node) or
-      this.isSink(node, _) or
-      this.isAdditionalTaintStep(node, _) or
-      this.isAdditionalTaintStep(node, _, _, _)
-    ) and
-    defaultImplicitTaintRead(node, c)
-  }
-
-  /**
-   * Holds if taint may flow from `source` to `sink` for this configuration.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate hasFlow(DataFlow::Node source, DataFlow::Node sink) {
-    super.hasFlow(source, sink)
-  }
-}
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking1/TaintTrackingParameter.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking1/TaintTrackingParameter.qll
deleted file mode 100644
index 19e10871a78..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking1/TaintTrackingParameter.qll
+++ /dev/null
@@ -1,6 +0,0 @@
-import semmle.code.cpp.ir.dataflow.internal.TaintTrackingUtil as Public
-
-module Private {
-  import semmle.code.cpp.ir.dataflow.DataFlow::DataFlow as DataFlow
-  import semmle.code.cpp.ir.dataflow.internal.DataFlowImpl as DataFlowInternal
-}
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking2/TaintTrackingImpl.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking2/TaintTrackingImpl.qll
deleted file mode 100644
index 75e7856fd26..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking2/TaintTrackingImpl.qll
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides an implementation of global (interprocedural) taint tracking.
- * This file re-exports the local (intraprocedural) taint-tracking analysis
- * from `TaintTrackingParameter::Public` and adds a global analysis, mainly
- * exposed through the `Configuration` class. For some languages, this file
- * exists in several identical copies, allowing queries to use multiple
- * `Configuration` classes that depend on each other without introducing
- * mutual recursion among those configurations.
- */
-
-import TaintTrackingParameter::Public
-private import TaintTrackingParameter::Private
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural taint tracking analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the taint tracking library must define its own unique extension of
- * this abstract class.
- *
- * A taint-tracking configuration is a special data flow configuration
- * (`DataFlow::Configuration`) that allows for flow through nodes that do not
- * necessarily preserve values but are still relevant from a taint tracking
- * perspective. (For example, string concatenation, where one of the operands
- * is tainted.)
- *
- * To create a configuration, extend this class with a subclass whose
- * characteristic predicate is a unique singleton string. For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends TaintTracking::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isSanitizer`.
- *   // Optionally override `isSanitizerIn`.
- *   // Optionally override `isSanitizerOut`.
- *   // Optionally override `isSanitizerGuard`.
- *   // Optionally override `isAdditionalTaintStep`.
- * }
- * ```
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but it is unsupported to depend on
- * another `TaintTracking::Configuration` or a `DataFlow::Configuration` in the
- * overridden predicates that define sources, sinks, or additional steps.
- * Instead, the dependency should go to a `TaintTracking2::Configuration` or a
- * `DataFlow2::Configuration`, `DataFlow3::Configuration`, etc.
- */
-abstract deprecated class Configuration extends DataFlow::Configuration {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant taint source.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant taint source with the given initial
-   * `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink accepting `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
-
-  /** Holds if the node `node` is a taint sanitizer. */
-  predicate isSanitizer(DataFlow::Node node) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node) {
-    this.isSanitizer(node) or
-    defaultTaintSanitizer(node)
-  }
-
-  /**
-   * Holds if the node `node` is a taint sanitizer when the flow state is
-   * `state`.
-   */
-  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
-    this.isSanitizer(node, state)
-  }
-
-  /** Holds if taint propagation into `node` is prohibited. */
-  predicate isSanitizerIn(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierIn(DataFlow::Node node) { this.isSanitizerIn(node) }
-
-  /** Holds if taint propagation out of `node` is prohibited. */
-  predicate isSanitizerOut(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   */
-  predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) { none() }
-
-  final override predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
-    this.isAdditionalTaintStep(node1, node2) or
-    defaultAdditionalTaintStep(node1, node2, _)
-  }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalTaintStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    none()
-  }
-
-  final override predicate isAdditionalFlowStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    this.isAdditionalTaintStep(node1, state1, node2, state2)
-  }
-
-  override predicate allowImplicitRead(DataFlow::Node node, DataFlow::ContentSet c) {
-    (
-      this.isSink(node) or
-      this.isSink(node, _) or
-      this.isAdditionalTaintStep(node, _) or
-      this.isAdditionalTaintStep(node, _, _, _)
-    ) and
-    defaultImplicitTaintRead(node, c)
-  }
-
-  /**
-   * Holds if taint may flow from `source` to `sink` for this configuration.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate hasFlow(DataFlow::Node source, DataFlow::Node sink) {
-    super.hasFlow(source, sink)
-  }
-}
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking2/TaintTrackingParameter.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking2/TaintTrackingParameter.qll
deleted file mode 100644
index ac0b79d067e..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking2/TaintTrackingParameter.qll
+++ /dev/null
@@ -1,5 +0,0 @@
-import semmle.code.cpp.ir.dataflow.internal.TaintTrackingUtil as Public
-
-module Private {
-  import semmle.code.cpp.ir.dataflow.DataFlow2::DataFlow2 as DataFlow
-}
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking3/TaintTrackingImpl.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking3/TaintTrackingImpl.qll
deleted file mode 100644
index 75e7856fd26..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking3/TaintTrackingImpl.qll
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides an implementation of global (interprocedural) taint tracking.
- * This file re-exports the local (intraprocedural) taint-tracking analysis
- * from `TaintTrackingParameter::Public` and adds a global analysis, mainly
- * exposed through the `Configuration` class. For some languages, this file
- * exists in several identical copies, allowing queries to use multiple
- * `Configuration` classes that depend on each other without introducing
- * mutual recursion among those configurations.
- */
-
-import TaintTrackingParameter::Public
-private import TaintTrackingParameter::Private
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural taint tracking analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the taint tracking library must define its own unique extension of
- * this abstract class.
- *
- * A taint-tracking configuration is a special data flow configuration
- * (`DataFlow::Configuration`) that allows for flow through nodes that do not
- * necessarily preserve values but are still relevant from a taint tracking
- * perspective. (For example, string concatenation, where one of the operands
- * is tainted.)
- *
- * To create a configuration, extend this class with a subclass whose
- * characteristic predicate is a unique singleton string. For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends TaintTracking::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isSanitizer`.
- *   // Optionally override `isSanitizerIn`.
- *   // Optionally override `isSanitizerOut`.
- *   // Optionally override `isSanitizerGuard`.
- *   // Optionally override `isAdditionalTaintStep`.
- * }
- * ```
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but it is unsupported to depend on
- * another `TaintTracking::Configuration` or a `DataFlow::Configuration` in the
- * overridden predicates that define sources, sinks, or additional steps.
- * Instead, the dependency should go to a `TaintTracking2::Configuration` or a
- * `DataFlow2::Configuration`, `DataFlow3::Configuration`, etc.
- */
-abstract deprecated class Configuration extends DataFlow::Configuration {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant taint source.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant taint source with the given initial
-   * `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink accepting `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
-
-  /** Holds if the node `node` is a taint sanitizer. */
-  predicate isSanitizer(DataFlow::Node node) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node) {
-    this.isSanitizer(node) or
-    defaultTaintSanitizer(node)
-  }
-
-  /**
-   * Holds if the node `node` is a taint sanitizer when the flow state is
-   * `state`.
-   */
-  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
-    this.isSanitizer(node, state)
-  }
-
-  /** Holds if taint propagation into `node` is prohibited. */
-  predicate isSanitizerIn(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierIn(DataFlow::Node node) { this.isSanitizerIn(node) }
-
-  /** Holds if taint propagation out of `node` is prohibited. */
-  predicate isSanitizerOut(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   */
-  predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) { none() }
-
-  final override predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
-    this.isAdditionalTaintStep(node1, node2) or
-    defaultAdditionalTaintStep(node1, node2, _)
-  }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalTaintStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    none()
-  }
-
-  final override predicate isAdditionalFlowStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    this.isAdditionalTaintStep(node1, state1, node2, state2)
-  }
-
-  override predicate allowImplicitRead(DataFlow::Node node, DataFlow::ContentSet c) {
-    (
-      this.isSink(node) or
-      this.isSink(node, _) or
-      this.isAdditionalTaintStep(node, _) or
-      this.isAdditionalTaintStep(node, _, _, _)
-    ) and
-    defaultImplicitTaintRead(node, c)
-  }
-
-  /**
-   * Holds if taint may flow from `source` to `sink` for this configuration.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate hasFlow(DataFlow::Node source, DataFlow::Node sink) {
-    super.hasFlow(source, sink)
-  }
-}
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking3/TaintTrackingParameter.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking3/TaintTrackingParameter.qll
deleted file mode 100644
index 2a3b69f55cd..00000000000
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking3/TaintTrackingParameter.qll
+++ /dev/null
@@ -1,5 +0,0 @@
-import semmle.code.cpp.ir.dataflow.internal.TaintTrackingUtil as Public
-
-module Private {
-  import semmle.code.cpp.ir.dataflow.DataFlow3::DataFlow3 as DataFlow
-}
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedCall.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedCall.qll
index daa6bdaafcf..2ddc55f91f5 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedCall.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedCall.qll
@@ -364,10 +364,14 @@ class TranslatedFunctionCall extends TranslatedCallExpr, TranslatedDirectCall {
 
   final override predicate mayThrowException() {
     expr.getTarget().(ThrowingFunction).mayThrowException(_)
+    or
+    expr.getTarget() instanceof AlwaysSehThrowingFunction
   }
 
   final override predicate mustThrowException() {
     expr.getTarget().(ThrowingFunction).mayThrowException(true)
+    or
+    expr.getTarget() instanceof AlwaysSehThrowingFunction
   }
 }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/models/Models.qll b/cpp/ql/lib/semmle/code/cpp/models/Models.qll
index 1e0b6cd33ed..f6776a623ff 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/Models.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/Models.qll
@@ -49,3 +49,4 @@ private import implementations.PostgreSql
 private import implementations.System
 private import implementations.StructuredExceptionHandling
 private import implementations.ZMQ
+private import implementations.Win32CommandExecution
diff --git a/cpp/ql/lib/semmle/code/cpp/models/implementations/Memcpy.qll b/cpp/ql/lib/semmle/code/cpp/models/implementations/Memcpy.qll
index 0bf2dd31fe4..311847e8aec 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/implementations/Memcpy.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/implementations/Memcpy.qll
@@ -16,7 +16,7 @@ import semmle.code.cpp.models.interfaces.NonThrowing
  * `__builtin___memcpy_chk`.
  */
 private class MemcpyFunction extends ArrayFunction, DataFlowFunction, SideEffectFunction,
-  AliasFunction, NonThrowingFunction
+  AliasFunction, NonCppThrowingFunction
 {
   MemcpyFunction() {
     // memcpy(dest, src, num)
diff --git a/cpp/ql/lib/semmle/code/cpp/models/implementations/Memset.qll b/cpp/ql/lib/semmle/code/cpp/models/implementations/Memset.qll
index ab2e0af99f3..51234e50f94 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/implementations/Memset.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/implementations/Memset.qll
@@ -11,7 +11,7 @@ import semmle.code.cpp.models.interfaces.SideEffect
 import semmle.code.cpp.models.interfaces.NonThrowing
 
 private class MemsetFunctionModel extends ArrayFunction, DataFlowFunction, AliasFunction,
-  SideEffectFunction, NonThrowingFunction
+  SideEffectFunction, NonCppThrowingFunction
 {
   MemsetFunctionModel() {
     this.hasGlobalOrStdOrBslName("memset")
diff --git a/cpp/ql/lib/semmle/code/cpp/models/implementations/NoexceptFunction.qll b/cpp/ql/lib/semmle/code/cpp/models/implementations/NoexceptFunction.qll
index b0f76ee6538..22f860bc593 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/implementations/NoexceptFunction.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/implementations/NoexceptFunction.qll
@@ -6,6 +6,6 @@ import semmle.code.cpp.models.interfaces.NonThrowing
  *
  * Note: The `throw` specifier was deprecated in C++11 and removed in C++17.
  */
-class NoexceptFunction extends NonThrowingFunction {
+class NoexceptFunction extends NonCppThrowingFunction {
   NoexceptFunction() { this.isNoExcept() or this.isNoThrow() }
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/models/implementations/Printf.qll b/cpp/ql/lib/semmle/code/cpp/models/implementations/Printf.qll
index 9c3bfb4f35e..d4b054ea0b5 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/implementations/Printf.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/implementations/Printf.qll
@@ -13,7 +13,7 @@ import semmle.code.cpp.models.interfaces.NonThrowing
 /**
  * The standard functions `printf`, `wprintf` and their glib variants.
  */
-private class Printf extends FormattingFunction, AliasFunction, NonThrowingFunction {
+private class Printf extends FormattingFunction, AliasFunction, NonCppThrowingFunction {
   Printf() {
     this instanceof TopLevelFunction and
     (
@@ -37,7 +37,7 @@ private class Printf extends FormattingFunction, AliasFunction, NonThrowingFunct
 /**
  * The standard functions `fprintf`, `fwprintf` and their glib variants.
  */
-private class Fprintf extends FormattingFunction, NonThrowingFunction {
+private class Fprintf extends FormattingFunction, NonCppThrowingFunction {
   Fprintf() {
     this instanceof TopLevelFunction and
     (
@@ -55,7 +55,7 @@ private class Fprintf extends FormattingFunction, NonThrowingFunction {
 /**
  * The standard function `sprintf` and its Microsoft and glib variants.
  */
-private class Sprintf extends FormattingFunction, NonThrowingFunction {
+private class Sprintf extends FormattingFunction, NonCppThrowingFunction {
   Sprintf() {
     this instanceof TopLevelFunction and
     (
@@ -98,7 +98,9 @@ private class Sprintf extends FormattingFunction, NonThrowingFunction {
 /**
  * Implements `Snprintf`.
  */
-private class SnprintfImpl extends Snprintf, AliasFunction, SideEffectFunction, NonThrowingFunction {
+private class SnprintfImpl extends Snprintf, AliasFunction, SideEffectFunction,
+  NonCppThrowingFunction
+{
   SnprintfImpl() {
     this instanceof TopLevelFunction and
     (
@@ -205,7 +207,7 @@ private class StringCchPrintf extends FormattingFunction {
 /**
  * The standard function `syslog`.
  */
-private class Syslog extends FormattingFunction, NonThrowingFunction {
+private class Syslog extends FormattingFunction, NonCppThrowingFunction {
   Syslog() {
     this instanceof TopLevelFunction and
     this.hasGlobalName("syslog") and
diff --git a/cpp/ql/lib/semmle/code/cpp/models/implementations/Strcat.qll b/cpp/ql/lib/semmle/code/cpp/models/implementations/Strcat.qll
index 9b11ed0af15..966c7425dc4 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/implementations/Strcat.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/implementations/Strcat.qll
@@ -15,7 +15,7 @@ import semmle.code.cpp.models.interfaces.NonThrowing
  * Does not include `strlcat`, which is covered by `StrlcatFunction`
  */
 class StrcatFunction extends TaintFunction, DataFlowFunction, ArrayFunction, SideEffectFunction,
-  NonThrowingFunction
+  NonCppThrowingFunction
 {
   StrcatFunction() {
     this.hasGlobalOrStdOrBslName([
diff --git a/cpp/ql/lib/semmle/code/cpp/models/implementations/Strcpy.qll b/cpp/ql/lib/semmle/code/cpp/models/implementations/Strcpy.qll
index b7f06f0cebf..b7ed20f1bab 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/implementations/Strcpy.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/implementations/Strcpy.qll
@@ -13,7 +13,7 @@ import semmle.code.cpp.models.interfaces.NonThrowing
  * The standard function `strcpy` and its wide, sized, and Microsoft variants.
  */
 class StrcpyFunction extends ArrayFunction, DataFlowFunction, TaintFunction, SideEffectFunction,
-  NonThrowingFunction
+  NonCppThrowingFunction
 {
   StrcpyFunction() {
     this.hasGlobalOrStdOrBslName([
diff --git a/cpp/ql/lib/semmle/code/cpp/models/implementations/StructuredExceptionHandling.qll b/cpp/ql/lib/semmle/code/cpp/models/implementations/StructuredExceptionHandling.qll
index af8f3088f25..e561bfadee6 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/implementations/StructuredExceptionHandling.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/implementations/StructuredExceptionHandling.qll
@@ -1,9 +1,7 @@
 import semmle.code.cpp.models.interfaces.Throwing
 
-class WindowsDriverFunction extends ThrowingFunction {
-  WindowsDriverFunction() {
+class WindowsDriverExceptionAnnotation extends AlwaysSehThrowingFunction {
+  WindowsDriverExceptionAnnotation() {
     this.hasGlobalName(["RaiseException", "ExRaiseAccessViolation", "ExRaiseDatatypeMisalignment"])
   }
-
-  final override predicate mayThrowException(boolean unconditional) { unconditional = true }
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/models/implementations/Win32CommandExecution.qll b/cpp/ql/lib/semmle/code/cpp/models/implementations/Win32CommandExecution.qll
new file mode 100644
index 00000000000..13d7ffae807
--- /dev/null
+++ b/cpp/ql/lib/semmle/code/cpp/models/implementations/Win32CommandExecution.qll
@@ -0,0 +1,56 @@
+private import semmle.code.cpp.models.interfaces.CommandExecution
+
+/** The `ShellExecute` family of functions from Win32. */
+class ShellExecute extends Function {
+  ShellExecute() { this.hasGlobalName("ShellExecute" + ["", "A", "W"]) }
+}
+
+private class ShellExecuteModel extends ShellExecute, CommandExecutionFunction {
+  override predicate hasCommandArgument(FunctionInput input) { input.isParameterDeref(2) }
+}
+
+/** The `WinExec` function from Win32. */
+class WinExec extends Function {
+  WinExec() { this.hasGlobalName("WinExec") }
+}
+
+private class WinExecModel extends WinExec, CommandExecutionFunction {
+  override predicate hasCommandArgument(FunctionInput input) { input.isParameterDeref(0) }
+}
+
+/** The `CreateProcess` family of functions from Win32. */
+class CreateProcess extends Function {
+  CreateProcess() { this.hasGlobalName("CreateProcess" + ["", "A", "W"]) }
+}
+
+private class CreateProcessModel extends CreateProcess, CommandExecutionFunction {
+  override predicate hasCommandArgument(FunctionInput input) { input.isParameterDeref(0) }
+}
+
+/** The `CreateProcessAsUser` family of functions from Win32. */
+class CreateProcessAsUser extends Function {
+  CreateProcessAsUser() { this.hasGlobalName("CreateProcessAsUser" + ["", "A", "W"]) }
+}
+
+private class CreateProcessAsUserModel extends CreateProcessAsUser, CommandExecutionFunction {
+  override predicate hasCommandArgument(FunctionInput input) { input.isParameterDeref(1) }
+}
+
+/** The `CreateProcessWithLogonW` function from Win32. */
+class CreateProcessWithLogonW extends Function {
+  CreateProcessWithLogonW() { this.hasGlobalName("CreateProcessWithLogonW") }
+}
+
+private class CreateProcessWithLogonModel extends CreateProcessWithLogonW, CommandExecutionFunction {
+  override predicate hasCommandArgument(FunctionInput input) { input.isParameterDeref(4) }
+}
+
+/** The `CreateProcessWithTokenW` function from Win32. */
+class CreateProcessWithTokenW extends Function {
+  CreateProcessWithTokenW() { this.hasGlobalName("CreateProcessWithTokenW") }
+}
+
+private class CreateProcessWithTokenWModel extends CreateProcessWithTokenW, CommandExecutionFunction
+{
+  override predicate hasCommandArgument(FunctionInput input) { input.isParameterDeref(2) }
+}
diff --git a/cpp/ql/lib/semmle/code/cpp/models/interfaces/NonThrowing.qll b/cpp/ql/lib/semmle/code/cpp/models/interfaces/NonThrowing.qll
index 64901d39ad3..85b9b66cd66 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/interfaces/NonThrowing.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/interfaces/NonThrowing.qll
@@ -6,6 +6,15 @@ import semmle.code.cpp.Function
 import semmle.code.cpp.models.Models
 
 /**
- * A function that is guaranteed to never throw.
+ * A function that is guaranteed to never throw a C++ exception
+ *
+ * The function may still raise a structured exception handling (SEH) exception.
  */
-abstract class NonThrowingFunction extends Function { }
+abstract class NonCppThrowingFunction extends Function { }
+
+/**
+ * A function that is guaranteed to never throw.
+ *
+ * DEPRECATED: use `NonCppThrowingFunction` instead.
+ */
+deprecated class NonThrowingFunction = NonCppThrowingFunction;
diff --git a/cpp/ql/lib/semmle/code/cpp/models/interfaces/Throwing.qll b/cpp/ql/lib/semmle/code/cpp/models/interfaces/Throwing.qll
index 79b7523f1d9..cc294806709 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/interfaces/Throwing.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/interfaces/Throwing.qll
@@ -11,7 +11,7 @@ import semmle.code.cpp.models.Models
 import semmle.code.cpp.models.interfaces.FunctionInputsAndOutputs
 
 /**
- * A class that models the exceptional behavior of a function.
+ * A function that is known to raise an exception.
  */
 abstract class ThrowingFunction extends Function {
   /**
@@ -20,3 +20,8 @@ abstract class ThrowingFunction extends Function {
    */
   abstract predicate mayThrowException(boolean unconditional);
 }
+
+/**
+ * A function that unconditionally raises a structured exception handling (SEH) exception.
+ */
+abstract class AlwaysSehThrowingFunction extends Function { }
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme b/cpp/ql/lib/semmlecode.cpp.dbscheme
index e51fad7a243..f0156f5f88a 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme
@@ -46,6 +46,22 @@ compilation_args(
     string arg : string ref
 );
 
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
 /**
  * The source files that are compiled by a compiler invocation.
  * If `id` is for the compiler invocation
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
index 7f0d99272e7..758aba34608 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
@@ -18,7 +18,7 @@
         </e>
         <e>
             <k>@location_default</k>
-            <v>29764890</v>
+            <v>29746763</v>
         </e>
         <e>
             <k>@location_stmt</k>
@@ -34,11 +34,11 @@
         </e>
         <e>
             <k>@file</k>
-            <v>123251</v>
+            <v>123176</v>
         </e>
         <e>
             <k>@folder</k>
-            <v>16340</v>
+            <v>16330</v>
         </e>
         <e>
             <k>@macro_expansion</k>
@@ -46,23 +46,23 @@
         </e>
         <e>
             <k>@other_macro_reference</k>
-            <v>859029</v>
+            <v>858505</v>
         </e>
         <e>
             <k>@function</k>
-            <v>4179363</v>
+            <v>4176817</v>
         </e>
         <e>
             <k>@fun_decl</k>
-            <v>4543516</v>
+            <v>4541216</v>
         </e>
         <e>
             <k>@var_decl</k>
-            <v>8039391</v>
+            <v>8034962</v>
         </e>
         <e>
             <k>@type_decl</k>
-            <v>3283451</v>
+            <v>3281452</v>
         </e>
         <e>
             <k>@namespace_decl</k>
@@ -70,11 +70,11 @@
         </e>
         <e>
             <k>@using_declaration</k>
-            <v>363219</v>
+            <v>362998</v>
         </e>
         <e>
             <k>@using_directive</k>
-            <v>6536</v>
+            <v>6532</v>
         </e>
         <e>
             <k>@using_enum_declaration</k>
@@ -86,7 +86,7 @@
         </e>
         <e>
             <k>@parameter</k>
-            <v>6190611</v>
+            <v>6186841</v>
         </e>
         <e>
             <k>@membervariable</k>
@@ -98,7 +98,7 @@
         </e>
         <e>
             <k>@localvariable</k>
-            <v>576945</v>
+            <v>576952</v>
         </e>
         <e>
             <k>@enumconstant</k>
@@ -330,15 +330,15 @@
         </e>
         <e>
             <k>@pointer</k>
-            <v>568173</v>
+            <v>567827</v>
         </e>
         <e>
             <k>@type_with_specifiers</k>
-            <v>852026</v>
+            <v>851507</v>
         </e>
         <e>
             <k>@array</k>
-            <v>110179</v>
+            <v>110112</v>
         </e>
         <e>
             <k>@routineptr</k>
@@ -346,7 +346,7 @@
         </e>
         <e>
             <k>@reference</k>
-            <v>1276405</v>
+            <v>1275627</v>
         </e>
         <e>
             <k>@gnu_vector</k>
@@ -358,7 +358,7 @@
         </e>
         <e>
             <k>@rvalue_reference</k>
-            <v>333340</v>
+            <v>333137</v>
         </e>
         <e>
             <k>@block</k>
@@ -366,15 +366,15 @@
         </e>
         <e>
             <k>@decltype</k>
-            <v>27078</v>
+            <v>27061</v>
         </e>
         <e>
             <k>@usertype</k>
-            <v>5234008</v>
+            <v>5230820</v>
         </e>
         <e>
             <k>@mangledname</k>
-            <v>6061757</v>
+            <v>6058065</v>
         </e>
         <e>
             <k>@type_mention</k>
@@ -386,15 +386,15 @@
         </e>
         <e>
             <k>@ptrtomember</k>
-            <v>37815</v>
+            <v>37792</v>
         </e>
         <e>
             <k>@specifier</k>
-            <v>24743</v>
+            <v>24728</v>
         </e>
         <e>
             <k>@gnuattribute</k>
-            <v>553700</v>
+            <v>553363</v>
         </e>
         <e>
             <k>@stdattribute</k>
@@ -410,15 +410,15 @@
         </e>
         <e>
             <k>@alignas</k>
-            <v>4668</v>
+            <v>4665</v>
         </e>
         <e>
             <k>@attribute_arg_token</k>
-            <v>25210</v>
+            <v>25195</v>
         </e>
         <e>
             <k>@attribute_arg_constant_expr</k>
-            <v>318400</v>
+            <v>318207</v>
         </e>
         <e>
             <k>@attribute_arg_empty</k>
@@ -450,7 +450,7 @@
         </e>
         <e>
             <k>@namespace</k>
-            <v>12138</v>
+            <v>12131</v>
         </e>
         <e>
             <k>@specialnamequalifyingelement</k>
@@ -482,7 +482,7 @@
         </e>
         <e>
             <k>@parexpr</k>
-            <v>3587463</v>
+            <v>3587464</v>
         </e>
         <e>
             <k>@arithnegexpr</k>
@@ -582,11 +582,11 @@
         </e>
         <e>
             <k>@gtexpr</k>
-            <v>104110</v>
+            <v>104047</v>
         </e>
         <e>
             <k>@ltexpr</k>
-            <v>101776</v>
+            <v>101714</v>
         </e>
         <e>
             <k>@geexpr</k>
@@ -634,7 +634,7 @@
         </e>
         <e>
             <k>@assignorexpr</k>
-            <v>23627</v>
+            <v>23628</v>
         </e>
         <e>
             <k>@assignxorexpr</k>
@@ -662,11 +662,11 @@
         </e>
         <e>
             <k>@subscriptexpr</k>
-            <v>364477</v>
+            <v>364481</v>
         </e>
         <e>
             <k>@callexpr</k>
-            <v>316533</v>
+            <v>316340</v>
         </e>
         <e>
             <k>@vastartexpr</k>
@@ -678,7 +678,7 @@
         </e>
         <e>
             <k>@vaendexpr</k>
-            <v>2801</v>
+            <v>2799</v>
         </e>
         <e>
             <k>@vacopyexpr</k>
@@ -830,7 +830,7 @@
         </e>
         <e>
             <k>@sizeof_pack</k>
-            <v>5602</v>
+            <v>5598</v>
         </e>
         <e>
             <k>@hasassignexpr</k>
@@ -978,7 +978,7 @@
         </e>
         <e>
             <k>@lambdaexpr</k>
-            <v>21475</v>
+            <v>21462</v>
         </e>
         <e>
             <k>@param_ref</k>
@@ -1022,7 +1022,7 @@
         </e>
         <e>
             <k>@istriviallycopyableexpr</k>
-            <v>3734</v>
+            <v>3732</v>
         </e>
         <e>
             <k>@isliteraltypeexpr</k>
@@ -1374,7 +1374,7 @@
         </e>
         <e>
             <k>@lambdacapture</k>
-            <v>28011</v>
+            <v>27994</v>
         </e>
         <e>
             <k>@stmt_expr</k>
@@ -1398,11 +1398,11 @@
         </e>
         <e>
             <k>@stmt_return</k>
-            <v>1280140</v>
+            <v>1279827</v>
         </e>
         <e>
             <k>@stmt_block</k>
-            <v>1419265</v>
+            <v>1418867</v>
         </e>
         <e>
             <k>@stmt_end_test_while</k>
@@ -1430,7 +1430,7 @@
         </e>
         <e>
             <k>@stmt_empty</k>
-            <v>192682</v>
+            <v>192685</v>
         </e>
         <e>
             <k>@stmt_continue</k>
@@ -1462,7 +1462,7 @@
         </e>
         <e>
             <k>@stmt_range_based_for</k>
-            <v>8403</v>
+            <v>8398</v>
         </e>
         <e>
             <k>@stmt_handler</k>
@@ -1478,31 +1478,31 @@
         </e>
         <e>
             <k>@ppd_if</k>
-            <v>667148</v>
+            <v>666741</v>
         </e>
         <e>
             <k>@ppd_ifdef</k>
-            <v>263311</v>
+            <v>263150</v>
         </e>
         <e>
             <k>@ppd_ifndef</k>
-            <v>266579</v>
+            <v>266416</v>
         </e>
         <e>
             <k>@ppd_elif</k>
-            <v>25210</v>
+            <v>25195</v>
         </e>
         <e>
             <k>@ppd_else</k>
-            <v>209154</v>
+            <v>209027</v>
         </e>
         <e>
             <k>@ppd_endif</k>
-            <v>1197038</v>
+            <v>1196309</v>
         </e>
         <e>
             <k>@ppd_plain_include</k>
-            <v>311398</v>
+            <v>311208</v>
         </e>
         <e>
             <k>@ppd_define</k>
@@ -1510,15 +1510,15 @@
         </e>
         <e>
             <k>@ppd_undef</k>
-            <v>258642</v>
+            <v>258484</v>
         </e>
         <e>
             <k>@ppd_include_next</k>
-            <v>1867</v>
+            <v>1866</v>
         </e>
         <e>
             <k>@ppd_line</k>
-            <v>27520</v>
+            <v>27521</v>
         </e>
         <e>
             <k>@ppd_error</k>
@@ -1900,6 +1900,54 @@
                 </dep>
             </dependencies>
         </relation>
+        <relation>
+            <name>compilation_build_mode</name>
+            <cardinality>9742</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>9742</v>
+                </e>
+                <e>
+                    <k>mode</k>
+                    <v>11</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>mode</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>9742</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>mode</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>863</a>
+                                    <b>864</b>
+                                    <v>11</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
         <relation>
             <name>compilation_compiling_files</name>
             <cardinality>11546</cardinality>
@@ -2164,7 +2212,7 @@
                 </e>
                 <e>
                     <k>seconds</k>
-                    <v>8429</v>
+                    <v>8030</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2245,47 +2293,52 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>639</v>
+                                    <v>799</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>359</v>
+                                    <v>199</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
+                                    <a>5</a>
                                     <b>7</b>
                                     <v>119</v>
                                 </b>
                                 <b>
                                     <a>8</a>
+                                    <b>9</b>
+                                    <v>79</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
                                     <b>10</b>
-                                    <v>159</v>
+                                    <v>119</v>
                                 </b>
                                 <b>
                                     <a>10</a>
-                                    <b>11</b>
+                                    <b>12</b>
+                                    <v>159</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>16</b>
                                     <v>119</v>
                                 </b>
                                 <b>
-                                    <a>11</a>
-                                    <b>15</b>
+                                    <a>17</a>
+                                    <b>20</b>
                                     <v>159</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>19</b>
+                                    <a>21</a>
+                                    <b>42</b>
                                     <v>159</v>
                                 </b>
                                 <b>
-                                    <a>19</a>
-                                    <b>24</b>
-                                    <v>159</v>
-                                </b>
-                                <b>
-                                    <a>40</a>
-                                    <b>89</b>
-                                    <v>119</v>
+                                    <a>55</a>
+                                    <b>90</b>
+                                    <v>79</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2368,7 +2421,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>439</v>
+                                    <v>399</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -2377,19 +2430,19 @@
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>10</b>
+                                    <b>9</b>
+                                    <v>239</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>24</b>
                                     <v>279</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>26</b>
+                                    <a>25</a>
+                                    <b>85</b>
                                     <v>279</v>
                                 </b>
-                                <b>
-                                    <a>28</a>
-                                    <b>81</b>
-                                    <v>199</v>
-                                </b>
                             </bs>
                         </hist>
                     </val>
@@ -2439,8 +2492,8 @@
                                     <v>79</v>
                                 </b>
                                 <b>
-                                    <a>125</a>
-                                    <b>126</b>
+                                    <a>124</a>
+                                    <b>125</b>
                                     <v>39</v>
                                 </b>
                                 <b>
@@ -2462,27 +2515,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3635</v>
+                                    <v>3755</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1917</v>
+                                    <v>1398</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1558</v>
+                                    <v>998</v>
                                 </b>
                                 <b>
                                     <a>4</a>
+                                    <b>5</b>
+                                    <v>759</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
                                     <b>6</b>
-                                    <v>719</v>
+                                    <v>439</v>
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>48</b>
-                                    <v>599</v>
+                                    <b>25</b>
+                                    <v>639</v>
+                                </b>
+                                <b>
+                                    <a>46</a>
+                                    <b>47</b>
+                                    <v>39</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2498,27 +2561,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3595</v>
+                                    <v>3515</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1438</v>
+                                    <v>1278</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1358</v>
+                                    <v>599</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>639</v>
+                                    <v>878</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>479</v>
+                                    <v>759</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -2527,8 +2590,8 @@
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>73</b>
-                                    <v>239</v>
+                                    <b>76</b>
+                                    <v>319</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2544,12 +2607,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6512</v>
+                                    <v>5753</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1917</v>
+                                    <v>2277</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2893,7 +2956,7 @@
                 </e>
                 <e>
                     <k>cpu_seconds</k>
-                    <v>7507</v>
+                    <v>7292</v>
                 </e>
                 <e>
                     <k>elapsed_seconds</k>
@@ -2943,17 +3006,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6242</v>
+                                    <v>5937</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>835</v>
+                                    <v>846</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>15</b>
-                                    <v>428</v>
+                                    <b>16</b>
+                                    <v>507</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2969,12 +3032,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6976</v>
+                                    <v>6682</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>530</v>
+                                    <v>609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3003,48 +3066,48 @@
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>7</b>
+                                    <a>7</a>
+                                    <b>8</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
-                                    <b>10</b>
+                                    <a>8</a>
+                                    <b>9</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>11</a>
-                                    <b>12</b>
+                                    <a>12</a>
+                                    <b>13</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>17</b>
+                                    <a>13</a>
+                                    <b>14</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>49</a>
-                                    <b>50</b>
+                                    <a>51</a>
+                                    <b>52</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>154</a>
-                                    <b>155</b>
+                                    <a>163</a>
+                                    <b>164</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>160</a>
-                                    <b>161</b>
+                                    <a>167</a>
+                                    <b>168</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>204</a>
-                                    <b>205</b>
+                                    <a>187</a>
+                                    <b>188</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>248</a>
-                                    <b>249</b>
+                                    <a>249</a>
+                                    <b>250</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -3074,48 +3137,48 @@
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>7</b>
+                                    <a>7</a>
+                                    <b>8</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
-                                    <b>10</b>
+                                    <a>8</a>
+                                    <b>9</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>11</a>
-                                    <b>12</b>
+                                    <a>12</a>
+                                    <b>13</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>17</b>
+                                    <a>13</a>
+                                    <b>14</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>47</a>
-                                    <b>48</b>
+                                    <a>49</a>
+                                    <b>50</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>118</a>
-                                    <b>119</b>
+                                    <a>120</a>
+                                    <b>121</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>128</a>
-                                    <b>129</b>
+                                    <a>123</a>
+                                    <b>124</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>149</a>
-                                    <b>150</b>
+                                    <a>138</a>
+                                    <b>139</b>
                                     <v>11</v>
                                 </b>
                                 <b>
-                                    <a>222</a>
-                                    <b>223</b>
+                                    <a>224</a>
+                                    <b>225</b>
                                     <v>11</v>
                                 </b>
                             </bs>
@@ -4888,31 +4951,31 @@
         </relation>
         <relation>
             <name>locations_default</name>
-            <cardinality>29764890</cardinality>
+            <cardinality>29746763</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>29764890</v>
+                    <v>29746763</v>
                 </e>
                 <e>
                     <k>container</k>
-                    <v>123251</v>
+                    <v>123176</v>
                 </e>
                 <e>
                     <k>startLine</k>
-                    <v>2095283</v>
+                    <v>2094007</v>
                 </e>
                 <e>
                     <k>startColumn</k>
-                    <v>36882</v>
+                    <v>36859</v>
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>2099485</v>
+                    <v>2098207</v>
                 </e>
                 <e>
                     <k>endColumn</k>
-                    <v>48086</v>
+                    <v>48057</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -4926,7 +4989,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29764890</v>
+                                    <v>29746763</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4942,7 +5005,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29764890</v>
+                                    <v>29746763</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4958,7 +5021,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29764890</v>
+                                    <v>29746763</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4974,7 +5037,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29764890</v>
+                                    <v>29746763</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4990,7 +5053,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29764890</v>
+                                    <v>29746763</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5006,67 +5069,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>11</b>
-                                    <v>9804</v>
+                                    <v>9798</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>18</b>
-                                    <v>10270</v>
+                                    <v>10264</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>30</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>30</a>
                                     <b>42</b>
-                                    <v>9804</v>
+                                    <v>9798</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>61</b>
-                                    <v>9804</v>
+                                    <v>9798</v>
                                 </b>
                                 <b>
                                     <a>61</a>
                                     <b>79</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>80</a>
                                     <b>106</b>
-                                    <v>9804</v>
+                                    <v>9798</v>
                                 </b>
                                 <b>
                                     <a>108</a>
                                     <b>149</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>149</a>
                                     <b>199</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>206</a>
                                     <b>291</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>304</a>
                                     <b>469</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>482</a>
                                     <b>850</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>936</a>
                                     <b>2380</b>
-                                    <v>8403</v>
+                                    <v>8398</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5082,67 +5145,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>8</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>13</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>20</b>
-                                    <v>9804</v>
+                                    <v>9798</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>32</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>43</b>
-                                    <v>9804</v>
+                                    <v>9798</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>61</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>62</a>
                                     <b>72</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>73</a>
                                     <b>93</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>97</a>
                                     <b>128</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>128</a>
                                     <b>180</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>180</a>
                                     <b>267</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>277</a>
                                     <b>414</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>439</a>
                                     <b>1465</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>1557</a>
@@ -5163,67 +5226,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>4</b>
-                                    <v>8870</v>
+                                    <v>8865</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>7936</v>
+                                    <v>7931</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>7469</v>
+                                    <v>7465</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>11204</v>
+                                    <v>11197</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>10</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>10737</v>
+                                    <v>10731</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>23</b>
-                                    <v>9804</v>
+                                    <v>9798</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>28</b>
-                                    <v>11204</v>
+                                    <v>11197</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>34</b>
-                                    <v>9804</v>
+                                    <v>9798</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>44</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>55</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>55</a>
                                     <b>66</b>
-                                    <v>9804</v>
+                                    <v>9798</v>
                                 </b>
                                 <b>
                                     <a>66</a>
                                     <b>77</b>
-                                    <v>8403</v>
+                                    <v>8398</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5239,67 +5302,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>8</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>13</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>20</b>
-                                    <v>9804</v>
+                                    <v>9798</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>32</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>43</b>
-                                    <v>9804</v>
+                                    <v>9798</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>60</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>61</a>
                                     <b>71</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>72</a>
                                     <b>93</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>94</a>
                                     <b>127</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>128</a>
                                     <b>179</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>180</a>
                                     <b>268</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>278</a>
                                     <b>413</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>437</a>
                                     <b>1465</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>1554</a>
@@ -5320,67 +5383,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>9</b>
-                                    <v>9804</v>
+                                    <v>9798</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>18</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>26</b>
-                                    <v>10270</v>
+                                    <v>10264</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>33</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>33</a>
                                     <b>39</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>39</a>
                                     <b>47</b>
-                                    <v>10270</v>
+                                    <v>10264</v>
                                 </b>
                                 <b>
                                     <a>47</a>
                                     <b>53</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>53</a>
                                     <b>60</b>
-                                    <v>10270</v>
+                                    <v>10264</v>
                                 </b>
                                 <b>
                                     <a>60</a>
                                     <b>66</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>66</a>
                                     <b>74</b>
-                                    <v>9804</v>
+                                    <v>9798</v>
                                 </b>
                                 <b>
                                     <a>74</a>
                                     <b>78</b>
-                                    <v>9804</v>
+                                    <v>9798</v>
                                 </b>
                                 <b>
                                     <a>78</a>
                                     <b>90</b>
-                                    <v>7002</v>
+                                    <v>6998</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5396,52 +5459,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>583112</v>
+                                    <v>582757</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>314199</v>
+                                    <v>314007</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>195615</v>
+                                    <v>195496</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>162001</v>
+                                    <v>161903</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>183010</v>
+                                    <v>182899</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>16</b>
-                                    <v>162935</v>
+                                    <v>162836</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>169004</v>
+                                    <v>168901</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>46</b>
-                                    <v>161067</v>
+                                    <v>160969</v>
                                 </b>
                                 <b>
                                     <a>46</a>
                                     <b>169</b>
-                                    <v>157333</v>
+                                    <v>157237</v>
                                 </b>
                                 <b>
                                     <a>169</a>
                                     <b>265</b>
-                                    <v>7002</v>
+                                    <v>6998</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5457,42 +5520,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>871167</v>
+                                    <v>870636</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>273582</v>
+                                    <v>273415</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>193748</v>
+                                    <v>193630</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>173673</v>
+                                    <v>173567</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>13</b>
-                                    <v>188146</v>
+                                    <v>188031</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>20</b>
-                                    <v>161067</v>
+                                    <v>160969</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>51</b>
-                                    <v>159667</v>
+                                    <v>159570</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>265</b>
-                                    <v>74231</v>
+                                    <v>74186</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5508,47 +5571,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>612058</v>
+                                    <v>611685</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>313265</v>
+                                    <v>313074</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>198417</v>
+                                    <v>198296</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>183010</v>
+                                    <v>182899</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>173206</v>
+                                    <v>173100</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>163402</v>
+                                    <v>163302</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>19</b>
-                                    <v>174606</v>
+                                    <v>174500</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>29</b>
-                                    <v>164802</v>
+                                    <v>164702</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>52</b>
-                                    <v>112514</v>
+                                    <v>112445</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5564,22 +5627,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1531779</v>
+                                    <v>1530846</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>348747</v>
+                                    <v>348534</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>162001</v>
+                                    <v>161903</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>16</b>
-                                    <v>52755</v>
+                                    <v>52723</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5595,47 +5658,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>587781</v>
+                                    <v>587423</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>316066</v>
+                                    <v>315874</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>197483</v>
+                                    <v>197363</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>168537</v>
+                                    <v>168435</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>158266</v>
+                                    <v>158170</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>14</b>
-                                    <v>170872</v>
+                                    <v>170768</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>21</b>
-                                    <v>175073</v>
+                                    <v>174967</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>32</b>
-                                    <v>162468</v>
+                                    <v>162369</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>63</b>
-                                    <v>157799</v>
+                                    <v>157703</v>
                                 </b>
                                 <b>
                                     <a>64</a>
@@ -5656,67 +5719,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>31</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>85</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>86</a>
                                     <b>128</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>129</a>
                                     <b>229</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>247</a>
                                     <b>286</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>291</a>
                                     <b>360</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>373</a>
                                     <b>457</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>473</a>
                                     <b>565</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>566</a>
                                     <b>619</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>619</a>
                                     <b>689</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>696</a>
                                     <b>807</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>819</a>
                                     <b>1563</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>1634</a>
                                     <b>5631</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>15295</a>
@@ -5737,67 +5800,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>18</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>35</b>
-                                    <v>3268</v>
+                                    <v>3266</v>
                                 </b>
                                 <b>
                                     <a>38</a>
                                     <b>43</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>61</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>65</a>
                                     <b>73</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>73</a>
                                     <b>84</b>
-                                    <v>3268</v>
+                                    <v>3266</v>
                                 </b>
                                 <b>
                                     <a>84</a>
                                     <b>96</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>96</a>
                                     <b>101</b>
-                                    <v>3268</v>
+                                    <v>3266</v>
                                 </b>
                                 <b>
                                     <a>101</a>
                                     <b>105</b>
-                                    <v>3268</v>
+                                    <v>3266</v>
                                 </b>
                                 <b>
                                     <a>107</a>
                                     <b>112</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>112</a>
                                     <b>126</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>137</a>
                                     <b>170</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>195</a>
                                     <b>265</b>
-                                    <v>1400</v>
+                                    <v>1399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5813,67 +5876,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>19</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>30</a>
                                     <b>72</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>83</a>
                                     <b>122</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>122</a>
                                     <b>205</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>214</a>
                                     <b>261</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>265</a>
                                     <b>322</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>322</a>
                                     <b>379</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>404</a>
                                     <b>430</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>453</a>
                                     <b>474</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>478</a>
                                     <b>505</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>511</a>
                                     <b>583</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>585</a>
                                     <b>836</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>1104</a>
                                     <b>2196</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>2387</a>
@@ -5894,67 +5957,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>19</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>30</a>
                                     <b>72</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>83</a>
                                     <b>122</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>122</a>
                                     <b>205</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>214</a>
                                     <b>261</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>265</a>
                                     <b>322</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>322</a>
                                     <b>380</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>404</a>
                                     <b>430</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>453</a>
                                     <b>474</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>477</a>
                                     <b>504</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>514</a>
                                     <b>582</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>585</a>
                                     <b>835</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>1109</a>
                                     <b>2203</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>2382</a>
@@ -5975,67 +6038,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>7</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>11</b>
-                                    <v>3268</v>
+                                    <v>3266</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>16</b>
-                                    <v>3268</v>
+                                    <v>3266</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>22</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>22</a>
                                     <b>24</b>
-                                    <v>3268</v>
+                                    <v>3266</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>28</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>34</b>
-                                    <v>3268</v>
+                                    <v>3266</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>41</b>
-                                    <v>3268</v>
+                                    <v>3266</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>46</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>47</a>
                                     <b>49</b>
-                                    <v>1867</v>
+                                    <v>1866</v>
                                 </b>
                                 <b>
                                     <a>49</a>
                                     <b>54</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>54</a>
                                     <b>74</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>75</a>
                                     <b>86</b>
-                                    <v>1867</v>
+                                    <v>1866</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6051,52 +6114,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>593383</v>
+                                    <v>593022</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>306262</v>
+                                    <v>306076</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>198417</v>
+                                    <v>198296</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>159667</v>
+                                    <v>159570</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>182543</v>
+                                    <v>182432</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>16</b>
-                                    <v>162001</v>
+                                    <v>161903</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>171338</v>
+                                    <v>171234</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>46</b>
-                                    <v>158733</v>
+                                    <v>158636</v>
                                 </b>
                                 <b>
                                     <a>46</a>
                                     <b>161</b>
-                                    <v>158266</v>
+                                    <v>158170</v>
                                 </b>
                                 <b>
                                     <a>162</a>
                                     <b>265</b>
-                                    <v>8870</v>
+                                    <v>8865</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6112,47 +6175,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>886574</v>
+                                    <v>886034</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>260043</v>
+                                    <v>259884</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>125119</v>
+                                    <v>125043</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>140992</v>
+                                    <v>140906</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>184877</v>
+                                    <v>184765</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>168537</v>
+                                    <v>168435</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>26</b>
-                                    <v>163402</v>
+                                    <v>163302</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>120</b>
-                                    <v>158266</v>
+                                    <v>158170</v>
                                 </b>
                                 <b>
                                     <a>121</a>
                                     <b>265</b>
-                                    <v>11671</v>
+                                    <v>11664</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6168,22 +6231,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1529445</v>
+                                    <v>1528513</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>341744</v>
+                                    <v>341536</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>170872</v>
+                                    <v>170768</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>10</b>
-                                    <v>57424</v>
+                                    <v>57389</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6199,47 +6262,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>623262</v>
+                                    <v>622883</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>303461</v>
+                                    <v>303276</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>201685</v>
+                                    <v>201562</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>183944</v>
+                                    <v>183832</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>169938</v>
+                                    <v>169834</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>166670</v>
+                                    <v>166568</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>19</b>
-                                    <v>175073</v>
+                                    <v>174967</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>29</b>
-                                    <v>161067</v>
+                                    <v>160969</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>52</b>
-                                    <v>114381</v>
+                                    <v>114311</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6255,52 +6318,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>599919</v>
+                                    <v>599554</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>306262</v>
+                                    <v>306076</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>197016</v>
+                                    <v>196896</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>169004</v>
+                                    <v>168901</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>156399</v>
+                                    <v>156304</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>14</b>
-                                    <v>169004</v>
+                                    <v>168901</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>21</b>
-                                    <v>177875</v>
+                                    <v>177766</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>32</b>
-                                    <v>162001</v>
+                                    <v>161903</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>60</b>
-                                    <v>158266</v>
+                                    <v>158170</v>
                                 </b>
                                 <b>
                                     <a>60</a>
                                     <b>65</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6316,67 +6379,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5135</v>
+                                    <v>5132</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>186</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>193</a>
                                     <b>288</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>294</a>
                                     <b>495</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>503</a>
                                     <b>555</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>561</a>
                                     <b>633</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>640</a>
                                     <b>758</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>758</a>
                                     <b>869</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>875</a>
                                     <b>1074</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>1074</a>
                                     <b>1281</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>1289</a>
                                     <b>1590</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>1685</a>
                                     <b>2418</b>
-                                    <v>1867</v>
+                                    <v>1866</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6392,62 +6455,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5602</v>
+                                    <v>5598</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>70</a>
                                     <b>100</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>100</a>
                                     <b>111</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>112</a>
                                     <b>122</b>
-                                    <v>4201</v>
+                                    <v>4199</v>
                                 </b>
                                 <b>
                                     <a>122</a>
                                     <b>140</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>143</a>
                                     <b>153</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>153</a>
                                     <b>161</b>
-                                    <v>4201</v>
+                                    <v>4199</v>
                                 </b>
                                 <b>
                                     <a>161</a>
                                     <b>173</b>
-                                    <v>4201</v>
+                                    <v>4199</v>
                                 </b>
                                 <b>
                                     <a>173</a>
                                     <b>178</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>188</a>
                                     <b>265</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6463,62 +6526,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5602</v>
+                                    <v>5598</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>105</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>155</a>
                                     <b>241</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>253</a>
                                     <b>336</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>340</a>
                                     <b>426</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>434</a>
                                     <b>488</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>489</a>
                                     <b>572</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>573</a>
                                     <b>623</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>626</a>
                                     <b>696</b>
-                                    <v>4201</v>
+                                    <v>4199</v>
                                 </b>
                                 <b>
                                     <a>701</a>
                                     <b>813</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>818</a>
                                     <b>1095</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>1172</a>
@@ -6539,67 +6602,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6069</v>
+                                    <v>6065</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>4201</v>
+                                    <v>4199</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>15</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>23</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>29</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>35</b>
-                                    <v>4201</v>
+                                    <v>4199</v>
                                 </b>
                                 <b>
                                     <a>35</a>
                                     <b>39</b>
-                                    <v>3268</v>
+                                    <v>3266</v>
                                 </b>
                                 <b>
                                     <a>39</a>
                                     <b>42</b>
-                                    <v>3268</v>
+                                    <v>3266</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>44</b>
-                                    <v>3268</v>
+                                    <v>3266</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>46</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>46</a>
                                     <b>49</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>49</a>
                                     <b>53</b>
-                                    <v>1400</v>
+                                    <v>1399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6615,67 +6678,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5602</v>
+                                    <v>5598</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>156</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>159</a>
                                     <b>240</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>251</a>
                                     <b>335</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>342</a>
                                     <b>430</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>432</a>
                                     <b>490</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>490</a>
                                     <b>573</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>574</a>
                                     <b>622</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>626</a>
                                     <b>698</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>700</a>
                                     <b>798</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>811</a>
                                     <b>987</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>1096</a>
                                     <b>1180</b>
-                                    <v>1400</v>
+                                    <v>1399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10599,23 +10662,23 @@
         </relation>
         <relation>
             <name>numlines</name>
-            <cardinality>1383783</cardinality>
+            <cardinality>1382941</cardinality>
             <columnsizes>
                 <e>
                     <k>element_id</k>
-                    <v>1376780</v>
+                    <v>1375942</v>
                 </e>
                 <e>
                     <k>num_lines</k>
-                    <v>101776</v>
+                    <v>101714</v>
                 </e>
                 <e>
                     <k>num_code</k>
-                    <v>84969</v>
+                    <v>84917</v>
                 </e>
                 <e>
                     <k>num_comment</k>
-                    <v>59758</v>
+                    <v>59722</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10629,12 +10692,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1369777</v>
+                                    <v>1368943</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7002</v>
+                                    <v>6998</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10650,12 +10713,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1370711</v>
+                                    <v>1369876</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6069</v>
+                                    <v>6065</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10671,7 +10734,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1376780</v>
+                                    <v>1375942</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10687,27 +10750,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>68162</v>
+                                    <v>68120</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12138</v>
+                                    <v>12131</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>7469</v>
+                                    <v>7465</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>21</b>
-                                    <v>7936</v>
+                                    <v>7931</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>921</b>
-                                    <v>6069</v>
+                                    <v>6065</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10723,27 +10786,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>70496</v>
+                                    <v>70453</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12138</v>
+                                    <v>12131</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8403</v>
+                                    <v>8398</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>1400</v>
+                                    <v>1399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10759,22 +10822,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>69562</v>
+                                    <v>69520</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14939</v>
+                                    <v>14930</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>10737</v>
+                                    <v>10731</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>6536</v>
+                                    <v>6532</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10790,27 +10853,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52755</v>
+                                    <v>52723</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14472</v>
+                                    <v>14463</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>6536</v>
+                                    <v>6532</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>42</b>
-                                    <v>6536</v>
+                                    <v>6532</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>922</b>
-                                    <v>4668</v>
+                                    <v>4665</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10826,27 +10889,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52755</v>
+                                    <v>52723</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16807</v>
+                                    <v>16796</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>6069</v>
+                                    <v>6065</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>6536</v>
+                                    <v>6532</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>12</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10862,27 +10925,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53222</v>
+                                    <v>53190</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>15873</v>
+                                    <v>15863</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>7469</v>
+                                    <v>7465</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>5135</v>
+                                    <v>5132</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>3268</v>
+                                    <v>3266</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10898,32 +10961,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34547</v>
+                                    <v>34526</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4201</v>
+                                    <v>4199</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>4668</v>
+                                    <v>4665</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>11</b>
-                                    <v>5135</v>
+                                    <v>5132</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>2596</b>
-                                    <v>1867</v>
+                                    <v>1866</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10939,32 +11002,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34547</v>
+                                    <v>34526</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4201</v>
+                                    <v>4199</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>4668</v>
+                                    <v>4665</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>4668</v>
+                                    <v>4665</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>38</b>
-                                    <v>2334</v>
+                                    <v>2332</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10980,32 +11043,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34547</v>
+                                    <v>34526</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4201</v>
+                                    <v>4199</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>4668</v>
+                                    <v>4665</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>4668</v>
+                                    <v>4665</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>37</b>
-                                    <v>2334</v>
+                                    <v>2332</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11647,15 +11710,15 @@
         </relation>
         <relation>
             <name>files</name>
-            <cardinality>123251</cardinality>
+            <cardinality>123176</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>123251</v>
+                    <v>123176</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>123251</v>
+                    <v>123176</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11669,7 +11732,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>123251</v>
+                                    <v>123176</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11685,7 +11748,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>123251</v>
+                                    <v>123176</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11695,15 +11758,15 @@
         </relation>
         <relation>
             <name>folders</name>
-            <cardinality>16340</cardinality>
+            <cardinality>16330</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>16340</v>
+                    <v>16330</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>16340</v>
+                    <v>16330</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11717,7 +11780,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16340</v>
+                                    <v>16330</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11733,7 +11796,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16340</v>
+                                    <v>16330</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11743,15 +11806,15 @@
         </relation>
         <relation>
             <name>containerparent</name>
-            <cardinality>138658</cardinality>
+            <cardinality>138574</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>16340</v>
+                    <v>16330</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>138658</v>
+                    <v>138574</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11765,32 +11828,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7469</v>
+                                    <v>7465</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3268</v>
+                                    <v>3266</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1400</v>
+                                    <v>1399</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>1400</v>
+                                    <v>1399</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>28</b>
-                                    <v>1400</v>
+                                    <v>1399</v>
                                 </b>
                                 <b>
                                     <a>40</a>
                                     <b>67</b>
-                                    <v>1400</v>
+                                    <v>1399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11806,7 +11869,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>138658</v>
+                                    <v>138574</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12392,15 +12455,15 @@
         </relation>
         <relation>
             <name>inmacroexpansion</name>
-            <cardinality>109779080</cardinality>
+            <cardinality>109779103</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>18027694</v>
+                    <v>18027697</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>2700160</v>
+                    <v>2700159</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12414,12 +12477,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>3</b>
-                                    <v>1582361</v>
+                                    <v>1582360</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1077793</v>
+                                    <v>1077794</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -12429,17 +12492,17 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>4819903</v>
+                                    <v>4819904</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>6385932</v>
+                                    <v>6385934</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>2605242</v>
+                                    <v>2605243</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -12460,12 +12523,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>378424</v>
+                                    <v>378422</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>544104</v>
+                                    <v>544105</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -12500,7 +12563,7 @@
                                 <b>
                                     <a>11</a>
                                     <b>337</b>
-                                    <v>224847</v>
+                                    <v>224845</v>
                                 </b>
                                 <b>
                                     <a>339</a>
@@ -12520,15 +12583,15 @@
         </relation>
         <relation>
             <name>affectedbymacroexpansion</name>
-            <cardinality>35689251</cardinality>
+            <cardinality>35689257</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5156949</v>
+                    <v>5156948</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>2784762</v>
+                    <v>2784761</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12542,7 +12605,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2816079</v>
+                                    <v>2816078</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12588,7 +12651,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>4</b>
-                                    <v>229116</v>
+                                    <v>229115</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -12603,12 +12666,12 @@
                                 <b>
                                     <a>9</a>
                                     <b>12</b>
-                                    <v>251119</v>
+                                    <v>251120</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>333984</v>
+                                    <v>333985</v>
                                 </b>
                                 <b>
                                     <a>13</a>
@@ -12628,7 +12691,7 @@
                                 <b>
                                     <a>16</a>
                                     <b>17</b>
-                                    <v>276608</v>
+                                    <v>276609</v>
                                 </b>
                                 <b>
                                     <a>17</a>
@@ -13607,19 +13670,19 @@
         </relation>
         <relation>
             <name>functions</name>
-            <cardinality>4179363</cardinality>
+            <cardinality>4176817</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4179363</v>
+                    <v>4176817</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1895466</v>
+                    <v>1894311</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>3268</v>
+                    <v>3266</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13633,7 +13696,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4179363</v>
+                                    <v>4176817</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13649,7 +13712,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4179363</v>
+                                    <v>4176817</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13665,22 +13728,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1498165</v>
+                                    <v>1497253</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>153131</v>
+                                    <v>153038</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>142860</v>
+                                    <v>142773</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>952</b>
-                                    <v>101309</v>
+                                    <v>101247</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13696,7 +13759,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1894999</v>
+                                    <v>1893845</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13798,15 +13861,15 @@
         </relation>
         <relation>
             <name>function_entry_point</name>
-            <cardinality>1151752</cardinality>
+            <cardinality>1151517</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1141948</v>
+                    <v>1141719</v>
                 </e>
                 <e>
                     <k>entry_point</k>
-                    <v>1151752</v>
+                    <v>1151517</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13820,12 +13883,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1132144</v>
+                                    <v>1131921</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9804</v>
+                                    <v>9798</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13841,7 +13904,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1151752</v>
+                                    <v>1151517</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13851,15 +13914,15 @@
         </relation>
         <relation>
             <name>function_return_type</name>
-            <cardinality>4184498</cardinality>
+            <cardinality>4181950</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4179363</v>
+                    <v>4176817</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>817945</v>
+                    <v>817446</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13873,12 +13936,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4174227</v>
+                                    <v>4171685</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5135</v>
+                                    <v>5132</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13894,22 +13957,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>506080</v>
+                                    <v>505771</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>211489</v>
+                                    <v>211360</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>66294</v>
+                                    <v>66254</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>2231</b>
-                                    <v>34081</v>
+                                    <v>34060</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14200,33 +14263,33 @@
         </relation>
         <relation>
             <name>function_deleted</name>
-            <cardinality>96173</cardinality>
+            <cardinality>96115</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>96173</v>
+                    <v>96115</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_defaulted</name>
-            <cardinality>73764</cardinality>
+            <cardinality>73719</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>73764</v>
+                    <v>73719</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_prototyped</name>
-            <cardinality>4087391</cardinality>
+            <cardinality>4084901</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4087391</v>
+                    <v>4084901</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -14379,27 +14442,27 @@
         </relation>
         <relation>
             <name>fun_decls</name>
-            <cardinality>4548652</cardinality>
+            <cardinality>4546348</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4543516</v>
+                    <v>4541216</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>4035569</v>
+                    <v>4033111</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>816544</v>
+                    <v>816047</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1797891</v>
+                    <v>1796796</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>3370755</v>
+                    <v>3368702</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14413,7 +14476,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4543516</v>
+                                    <v>4541216</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14429,12 +14492,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4538381</v>
+                                    <v>4536084</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5135</v>
+                                    <v>5132</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14450,7 +14513,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4543516</v>
+                                    <v>4541216</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14466,7 +14529,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4543516</v>
+                                    <v>4541216</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14482,17 +14545,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3606521</v>
+                                    <v>3603858</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>356216</v>
+                                    <v>356466</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>72830</v>
+                                    <v>72786</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14508,12 +14571,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3995885</v>
+                                    <v>3993452</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>39683</v>
+                                    <v>39659</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14529,7 +14592,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4035569</v>
+                                    <v>4033111</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14545,17 +14608,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3663012</v>
+                                    <v>3660781</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>311864</v>
+                                    <v>311674</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>60692</v>
+                                    <v>60655</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14571,22 +14634,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>431381</v>
+                                    <v>431119</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>274048</v>
+                                    <v>273882</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>63493</v>
+                                    <v>63454</v>
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>2476</b>
-                                    <v>47620</v>
+                                    <b>2477</b>
+                                    <v>47591</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14602,22 +14665,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>515417</v>
+                                    <v>515103</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>203085</v>
+                                    <v>202961</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>63026</v>
+                                    <v>62988</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>2192</b>
-                                    <v>35014</v>
+                                    <v>34993</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14633,17 +14696,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>690024</v>
+                                    <v>689604</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>67228</v>
+                                    <v>67187</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>773</b>
-                                    <v>59291</v>
+                                    <v>59255</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14659,22 +14722,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>595251</v>
+                                    <v>594888</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>121384</v>
+                                    <v>121310</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>63493</v>
+                                    <v>63454</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>1959</b>
-                                    <v>36415</v>
+                                    <v>36393</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14690,27 +14753,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1228318</v>
+                                    <v>1227570</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>267045</v>
+                                    <v>266883</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>77966</v>
+                                    <v>77918</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>146128</v>
+                                    <v>146039</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>986</b>
-                                    <v>78433</v>
+                                    <v>78385</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14726,22 +14789,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1407593</v>
+                                    <v>1406736</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>152197</v>
+                                    <v>152104</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>136791</v>
+                                    <v>136707</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>936</b>
-                                    <v>101309</v>
+                                    <v>101247</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14757,17 +14820,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1579399</v>
+                                    <v>1578437</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>134923</v>
+                                    <v>134841</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>562</b>
-                                    <v>83568</v>
+                                    <v>83517</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14783,27 +14846,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1236254</v>
+                                    <v>1235502</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>293190</v>
+                                    <v>293011</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>78899</v>
+                                    <v>78851</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>137257</v>
+                                    <v>137174</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>542</b>
-                                    <v>52288</v>
+                                    <v>52256</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14819,17 +14882,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2966451</v>
+                                    <v>2964644</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>277783</v>
+                                    <v>277614</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>55</b>
-                                    <v>126520</v>
+                                    <v>126442</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14845,17 +14908,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3033679</v>
+                                    <v>3031832</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>244169</v>
+                                    <v>244020</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>55</b>
-                                    <v>92905</v>
+                                    <v>92849</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14871,12 +14934,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3207353</v>
+                                    <v>3205399</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>18</b>
-                                    <v>163402</v>
+                                    <v>163302</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14892,12 +14955,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3232563</v>
+                                    <v>3230595</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>13</b>
-                                    <v>138191</v>
+                                    <v>138107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14907,22 +14970,22 @@
         </relation>
         <relation>
             <name>fun_def</name>
-            <cardinality>1888930</cardinality>
+            <cardinality>1888246</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1888930</v>
+                    <v>1888246</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>fun_specialized</name>
-            <cardinality>26144</cardinality>
+            <cardinality>26128</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>26144</v>
+                    <v>26128</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -14940,15 +15003,15 @@
         </relation>
         <relation>
             <name>fun_decl_specifiers</name>
-            <cardinality>2906692</cardinality>
+            <cardinality>2904922</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1689579</v>
+                    <v>1688550</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>2801</v>
+                    <v>2799</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14962,17 +15025,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>491140</v>
+                                    <v>490841</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1179764</v>
+                                    <v>1179045</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>18674</v>
+                                    <v>18663</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15144,11 +15207,11 @@
         </relation>
         <relation>
             <name>fun_decl_empty_throws</name>
-            <cardinality>1472021</cardinality>
+            <cardinality>1471124</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>1472021</v>
+                    <v>1471124</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -15208,11 +15271,11 @@
         </relation>
         <relation>
             <name>fun_decl_empty_noexcept</name>
-            <cardinality>863230</cardinality>
+            <cardinality>863171</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>863230</v>
+                    <v>863171</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -15317,19 +15380,19 @@
         </relation>
         <relation>
             <name>param_decl_bind</name>
-            <cardinality>6995017</cardinality>
+            <cardinality>6991224</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6995017</v>
+                    <v>6991224</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>7936</v>
+                    <v>7931</v>
                 </e>
                 <e>
                     <k>fun_decl</k>
-                    <v>3835284</v>
+                    <v>3833415</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15343,7 +15406,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6995017</v>
+                                    <v>6991224</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15359,7 +15422,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6995017</v>
+                                    <v>6991224</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15438,8 +15501,8 @@
                                     <v>466</v>
                                 </b>
                                 <b>
-                                    <a>8215</a>
-                                    <b>8216</b>
+                                    <a>8216</a>
+                                    <b>8217</b>
                                     <v>466</v>
                                 </b>
                             </bs>
@@ -15519,8 +15582,8 @@
                                     <v>466</v>
                                 </b>
                                 <b>
-                                    <a>8215</a>
-                                    <b>8216</b>
+                                    <a>8216</a>
+                                    <b>8217</b>
                                     <v>466</v>
                                 </b>
                             </bs>
@@ -15537,27 +15600,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1973899</v>
+                                    <v>1973163</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1061647</v>
+                                    <v>1061001</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>502812</v>
+                                    <v>502505</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>290856</v>
+                                    <v>290678</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>18</b>
-                                    <v>6069</v>
+                                    <v>6065</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15573,27 +15636,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1973899</v>
+                                    <v>1973163</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1061647</v>
+                                    <v>1061001</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>502812</v>
+                                    <v>502505</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>290856</v>
+                                    <v>290678</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>18</b>
-                                    <v>6069</v>
+                                    <v>6065</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15603,27 +15666,27 @@
         </relation>
         <relation>
             <name>var_decls</name>
-            <cardinality>8110354</cardinality>
+            <cardinality>8105882</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>8039391</v>
+                    <v>8034962</v>
                 </e>
                 <e>
                     <k>variable</k>
-                    <v>7027231</v>
+                    <v>7022951</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>2043462</v>
+                    <v>2042217</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>667614</v>
+                    <v>667208</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5311974</v>
+                    <v>5308739</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15637,7 +15700,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8039391</v>
+                                    <v>8034962</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15653,12 +15716,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7971229</v>
+                                    <v>7966841</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>68162</v>
+                                    <v>68120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15674,7 +15737,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8039391</v>
+                                    <v>8034962</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15690,12 +15753,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8036590</v>
+                                    <v>8032162</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15711,17 +15774,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6175205</v>
+                                    <v>6170977</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>698427</v>
+                                    <v>698469</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>153598</v>
+                                    <v>153504</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15737,12 +15800,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6855892</v>
+                                    <v>6851717</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>171338</v>
+                                    <v>171234</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15758,12 +15821,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6911916</v>
+                                    <v>6907706</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>115315</v>
+                                    <v>115245</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15779,17 +15842,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6481934</v>
+                                    <v>6477987</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>542962</v>
+                                    <v>542631</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2334</v>
+                                    <v>2332</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15805,27 +15868,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1165758</v>
+                                    <v>1165048</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>477134</v>
+                                    <v>476377</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>94773</v>
+                                    <v>95182</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>184877</v>
+                                    <v>184765</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>762</b>
-                                    <v>120917</v>
+                                    <v>120844</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15841,22 +15904,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1299281</v>
+                                    <v>1298490</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>452390</v>
+                                    <v>452115</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>155932</v>
+                                    <v>155837</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>724</b>
-                                    <v>135857</v>
+                                    <v>135774</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15872,17 +15935,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1539249</v>
+                                    <v>1538311</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>383295</v>
+                                    <v>383061</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>128</b>
-                                    <v>120917</v>
+                                    <v>120844</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15898,22 +15961,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1365576</v>
+                                    <v>1364744</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>404303</v>
+                                    <v>404057</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>173206</v>
+                                    <v>173100</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>592</b>
-                                    <v>100375</v>
+                                    <v>100314</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15929,37 +15992,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>341277</v>
+                                    <v>341069</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>86836</v>
+                                    <v>86783</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>48553</v>
+                                    <v>48524</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>51821</v>
+                                    <v>51790</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>12</b>
-                                    <v>52288</v>
+                                    <v>52256</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>33</b>
-                                    <v>50421</v>
+                                    <v>50390</v>
                                 </b>
                                 <b>
                                     <a>34</a>
-                                    <b>2384</b>
-                                    <v>36415</v>
+                                    <b>2385</b>
+                                    <v>36393</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15975,37 +16038,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>368822</v>
+                                    <v>368597</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>77966</v>
+                                    <v>77918</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>45285</v>
+                                    <v>45258</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>49487</v>
+                                    <v>49457</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>14</b>
-                                    <v>53222</v>
+                                    <v>53190</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>56</b>
-                                    <v>50888</v>
+                                    <v>50857</v>
                                 </b>
                                 <b>
                                     <a>56</a>
                                     <b>2301</b>
-                                    <v>21942</v>
+                                    <v>21929</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16021,27 +16084,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>457059</v>
+                                    <v>456781</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>93839</v>
+                                    <v>93782</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>46686</v>
+                                    <v>46657</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>19</b>
-                                    <v>50888</v>
+                                    <v>50857</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>1182</b>
-                                    <v>19141</v>
+                                    <v>19129</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16057,32 +16120,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>379093</v>
+                                    <v>378862</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>90571</v>
+                                    <v>90516</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>59758</v>
+                                    <v>59722</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>9</b>
-                                    <v>51354</v>
+                                    <v>51323</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>21</b>
-                                    <v>50421</v>
+                                    <v>50390</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>1010</b>
-                                    <v>36415</v>
+                                    <v>36393</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16098,17 +16161,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4496363</v>
+                                    <v>4493625</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>531757</v>
+                                    <v>531433</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>896</b>
-                                    <v>283853</v>
+                                    <b>897</b>
+                                    <v>283680</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16124,17 +16187,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4885727</v>
+                                    <v>4882752</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>17</b>
-                                    <v>415508</v>
+                                    <v>415255</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>892</b>
-                                    <v>10737</v>
+                                    <v>10731</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16150,12 +16213,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4961826</v>
+                                    <v>4958804</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>759</b>
-                                    <v>350147</v>
+                                    <v>349934</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16171,12 +16234,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5302637</v>
+                                    <v>5299407</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>9337</v>
+                                    <v>9331</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16186,26 +16249,26 @@
         </relation>
         <relation>
             <name>var_def</name>
-            <cardinality>3994952</cardinality>
+            <cardinality>3992985</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3994952</v>
+                    <v>3992985</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>var_decl_specifiers</name>
-            <cardinality>378626</cardinality>
+            <cardinality>378395</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>378626</v>
+                    <v>378395</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1867</v>
+                    <v>1866</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16219,7 +16282,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>378626</v>
+                                    <v>378395</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16271,19 +16334,19 @@
         </relation>
         <relation>
             <name>type_decls</name>
-            <cardinality>3283451</cardinality>
+            <cardinality>3281452</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3283451</v>
+                    <v>3281452</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>3233030</v>
+                    <v>3231061</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>3166269</v>
+                    <v>3164340</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16297,7 +16360,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3283451</v>
+                                    <v>3281452</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16313,7 +16376,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3283451</v>
+                                    <v>3281452</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16329,12 +16392,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3191479</v>
+                                    <v>3189536</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>41550</v>
+                                    <v>41525</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16350,12 +16413,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3191479</v>
+                                    <v>3189536</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>41550</v>
+                                    <v>41525</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16371,12 +16434,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3113980</v>
+                                    <v>3112083</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>20</b>
-                                    <v>52288</v>
+                                    <v>52256</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16392,12 +16455,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3113980</v>
+                                    <v>3112083</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>20</b>
-                                    <v>52288</v>
+                                    <v>52256</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16407,22 +16470,22 @@
         </relation>
         <relation>
             <name>type_def</name>
-            <cardinality>2641981</cardinality>
+            <cardinality>2640372</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2641981</v>
+                    <v>2640372</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>type_decl_top</name>
-            <cardinality>743713</cardinality>
+            <cardinality>743260</cardinality>
             <columnsizes>
                 <e>
                     <k>type_decl</k>
-                    <v>743713</v>
+                    <v>743260</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -16795,19 +16858,19 @@
         </relation>
         <relation>
             <name>usings</name>
-            <cardinality>369755</cardinality>
+            <cardinality>369530</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>369755</v>
+                    <v>369530</v>
                 </e>
                 <e>
                     <k>element_id</k>
-                    <v>315599</v>
+                    <v>315407</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>247904</v>
+                    <v>247753</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -16825,7 +16888,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>369755</v>
+                                    <v>369530</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16841,7 +16904,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>369755</v>
+                                    <v>369530</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16857,7 +16920,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>369755</v>
+                                    <v>369530</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16873,17 +16936,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>263311</v>
+                                    <v>263150</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>50888</v>
+                                    <v>50857</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1400</v>
+                                    <v>1399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16899,17 +16962,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>263311</v>
+                                    <v>263150</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>50888</v>
+                                    <v>50857</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1400</v>
+                                    <v>1399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16925,7 +16988,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>315599</v>
+                                    <v>315407</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16941,22 +17004,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>202618</v>
+                                    <v>202495</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>10737</v>
+                                    <v>10731</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>31279</v>
+                                    <v>31260</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>3268</v>
+                                    <v>3266</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16972,22 +17035,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>202618</v>
+                                    <v>202495</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>10737</v>
+                                    <v>10731</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>31279</v>
+                                    <v>31260</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>3268</v>
+                                    <v>3266</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17003,7 +17066,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>247904</v>
+                                    <v>247753</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17787,23 +17850,23 @@
         </relation>
         <relation>
             <name>params</name>
-            <cardinality>6354480</cardinality>
+            <cardinality>6350610</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6190611</v>
+                    <v>6186841</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>3491673</v>
+                    <v>3489546</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>7936</v>
+                    <v>7931</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1846445</v>
+                    <v>1845321</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17817,7 +17880,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6190611</v>
+                                    <v>6186841</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17833,7 +17896,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6190611</v>
+                                    <v>6186841</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17849,12 +17912,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6066892</v>
+                                    <v>6063198</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>123718</v>
+                                    <v>123643</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17870,22 +17933,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1867454</v>
+                                    <v>1866317</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>952868</v>
+                                    <v>952288</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>429981</v>
+                                    <v>429719</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>18</b>
-                                    <v>241368</v>
+                                    <v>241221</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17901,22 +17964,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1867454</v>
+                                    <v>1866317</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>952868</v>
+                                    <v>952288</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>429981</v>
+                                    <v>429719</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>18</b>
-                                    <v>241368</v>
+                                    <v>241221</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17932,22 +17995,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2165780</v>
+                                    <v>2164461</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>826815</v>
+                                    <v>826311</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>346412</v>
+                                    <v>346201</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>152664</v>
+                                    <v>152571</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18145,7 +18208,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>1400</v>
+                                    <v>1399</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -18201,22 +18264,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1183966</v>
+                                    <v>1183245</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>406171</v>
+                                    <v>405923</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>154064</v>
+                                    <v>153971</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>518</b>
-                                    <v>102243</v>
+                                    <v>102180</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18232,22 +18295,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1404792</v>
+                                    <v>1403937</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>212422</v>
+                                    <v>212293</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>147528</v>
+                                    <v>147439</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>502</b>
-                                    <v>81701</v>
+                                    <v>81651</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18263,17 +18326,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1420199</v>
+                                    <v>1419334</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>347346</v>
+                                    <v>347135</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>13</b>
-                                    <v>78899</v>
+                                    <v>78851</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18283,11 +18346,11 @@
         </relation>
         <relation>
             <name>overrides</name>
-            <cardinality>125725</cardinality>
+            <cardinality>125735</cardinality>
             <columnsizes>
                 <e>
                     <k>new</k>
-                    <v>122752</v>
+                    <v>122762</v>
                 </e>
                 <e>
                     <k>old</k>
@@ -18305,7 +18368,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>119788</v>
+                                    <v>119797</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18713,11 +18776,11 @@
         </relation>
         <relation>
             <name>localvariables</name>
-            <cardinality>576945</cardinality>
+            <cardinality>576952</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>576945</v>
+                    <v>576952</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -18725,7 +18788,7 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>90547</v>
+                    <v>90549</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18739,7 +18802,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>576945</v>
+                                    <v>576952</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18755,7 +18818,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>576945</v>
+                                    <v>576952</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18812,7 +18875,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26912</v>
+                                    <v>26913</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18848,12 +18911,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>57031</v>
+                                    <v>57032</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14284</v>
+                                    <v>14285</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18884,7 +18947,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>76491</v>
+                                    <v>76492</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18894,7 +18957,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>1486</b>
-                                    <v>6644</v>
+                                    <v>6645</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19922,31 +19985,31 @@
         </relation>
         <relation>
             <name>builtintypes</name>
-            <cardinality>26144</cardinality>
+            <cardinality>26128</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>26144</v>
+                    <v>26128</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>26144</v>
+                    <v>26128</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>26144</v>
+                    <v>26128</v>
                 </e>
                 <e>
                     <k>size</k>
-                    <v>3268</v>
+                    <v>3266</v>
                 </e>
                 <e>
                     <k>sign</k>
-                    <v>1400</v>
+                    <v>1399</v>
                 </e>
                 <e>
                     <k>alignment</k>
-                    <v>2334</v>
+                    <v>2332</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19960,7 +20023,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26128</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19976,7 +20039,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26128</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19992,7 +20055,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26128</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20008,7 +20071,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26128</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20024,7 +20087,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26128</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20040,7 +20103,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26128</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20056,7 +20119,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26128</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20072,7 +20135,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26128</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20088,7 +20151,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26128</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20104,7 +20167,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26128</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20120,7 +20183,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26128</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20136,7 +20199,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26128</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20152,7 +20215,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26128</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20168,7 +20231,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26128</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20184,7 +20247,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26128</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20343,7 +20406,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2334</v>
+                                    <v>2332</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20359,12 +20422,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1867</v>
+                                    <v>1866</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1400</v>
+                                    <v>1399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20479,7 +20542,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1400</v>
+                                    <v>1399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20603,7 +20666,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2334</v>
+                                    <v>2332</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20619,7 +20682,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2334</v>
+                                    <v>2332</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20629,23 +20692,23 @@
         </relation>
         <relation>
             <name>derivedtypes</name>
-            <cardinality>3669548</cardinality>
+            <cardinality>3667313</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3669548</v>
+                    <v>3667313</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1552788</v>
+                    <v>1551842</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>2801</v>
+                    <v>2799</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>2362796</v>
+                    <v>2361357</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20659,7 +20722,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3669548</v>
+                                    <v>3667313</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20675,7 +20738,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3669548</v>
+                                    <v>3667313</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20691,7 +20754,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3669548</v>
+                                    <v>3667313</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20707,17 +20770,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1324025</v>
+                                    <v>1323218</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>120450</v>
+                                    <v>120377</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>1153</b>
-                                    <v>108312</v>
+                                    <v>108246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20733,7 +20796,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1551854</v>
+                                    <v>1550909</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20754,17 +20817,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1324025</v>
+                                    <v>1323218</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>120450</v>
+                                    <v>120377</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>1135</b>
-                                    <v>108312</v>
+                                    <v>108246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20903,22 +20966,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1515439</v>
+                                    <v>1514516</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>546230</v>
+                                    <v>545897</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>218492</v>
+                                    <v>218359</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>72</b>
-                                    <v>82634</v>
+                                    <v>82584</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20934,22 +20997,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1526644</v>
+                                    <v>1525714</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>538760</v>
+                                    <v>538432</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>215690</v>
+                                    <v>215559</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>72</b>
-                                    <v>81701</v>
+                                    <v>81651</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20965,22 +21028,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1519641</v>
+                                    <v>1518715</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>549965</v>
+                                    <v>549630</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>217558</v>
+                                    <v>217425</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>75631</v>
+                                    <v>75585</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20990,11 +21053,11 @@
         </relation>
         <relation>
             <name>pointerishsize</name>
-            <cardinality>2707342</cardinality>
+            <cardinality>2705693</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2707342</v>
+                    <v>2705693</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -21016,7 +21079,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2707342</v>
+                                    <v>2705693</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21032,7 +21095,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2707342</v>
+                                    <v>2705693</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21106,23 +21169,23 @@
         </relation>
         <relation>
             <name>arraysizes</name>
-            <cardinality>88237</cardinality>
+            <cardinality>88183</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>88237</v>
+                    <v>88183</v>
                 </e>
                 <e>
                     <k>num_elements</k>
-                    <v>31746</v>
+                    <v>31727</v>
                 </e>
                 <e>
                     <k>bytesize</k>
-                    <v>33147</v>
+                    <v>33127</v>
                 </e>
                 <e>
                     <k>alignment</k>
-                    <v>1867</v>
+                    <v>1866</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21136,7 +21199,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>88237</v>
+                                    <v>88183</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21152,7 +21215,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>88237</v>
+                                    <v>88183</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21168,7 +21231,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>88237</v>
+                                    <v>88183</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21184,22 +21247,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1867</v>
+                                    <v>1866</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>23810</v>
+                                    <v>23795</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>13</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>13</a>
@@ -21220,17 +21283,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26611</v>
+                                    <v>26595</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2334</v>
+                                    <v>2332</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21246,17 +21309,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26611</v>
+                                    <v>26595</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>2334</v>
+                                    <v>2332</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21272,27 +21335,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1867</v>
+                                    <v>1866</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>23810</v>
+                                    <v>23795</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>3268</v>
+                                    <v>3266</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>2334</v>
+                                    <v>2332</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>16</b>
-                                    <v>1867</v>
+                                    <v>1866</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21308,17 +21371,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27544</v>
+                                    <v>27528</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1867</v>
+                                    <v>1866</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21334,12 +21397,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27544</v>
+                                    <v>27528</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4668</v>
+                                    <v>4665</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -21791,19 +21854,19 @@
         </relation>
         <relation>
             <name>usertypes</name>
-            <cardinality>5234008</cardinality>
+            <cardinality>5230820</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5234008</v>
+                    <v>5230820</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1352503</v>
+                    <v>1351680</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>5135</v>
+                    <v>5132</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21817,7 +21880,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5234008</v>
+                                    <v>5230820</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21833,7 +21896,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5234008</v>
+                                    <v>5230820</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21849,27 +21912,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>983681</v>
+                                    <v>983082</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>153598</v>
+                                    <v>153504</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>104577</v>
+                                    <v>104513</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>61</b>
-                                    <v>101776</v>
+                                    <v>101714</v>
                                 </b>
                                 <b>
                                     <a>65</a>
                                     <b>874</b>
-                                    <v>8870</v>
+                                    <v>8865</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21885,17 +21948,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1211977</v>
+                                    <v>1211239</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>125586</v>
+                                    <v>125509</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>14939</v>
+                                    <v>14930</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22037,19 +22100,19 @@
         </relation>
         <relation>
             <name>usertypesize</name>
-            <cardinality>1706386</cardinality>
+            <cardinality>1705347</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1706386</v>
+                    <v>1705347</v>
                 </e>
                 <e>
                     <k>size</k>
-                    <v>13539</v>
+                    <v>13530</v>
                 </e>
                 <e>
                     <k>alignment</k>
-                    <v>2334</v>
+                    <v>2332</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22063,7 +22126,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1706386</v>
+                                    <v>1705347</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22079,7 +22142,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1706386</v>
+                                    <v>1705347</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22095,12 +22158,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3268</v>
+                                    <v>3266</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4201</v>
+                                    <v>4199</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -22151,12 +22214,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10270</v>
+                                    <v>10264</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -22307,15 +22370,15 @@
         </relation>
         <relation>
             <name>mangled_name</name>
-            <cardinality>9019338</cardinality>
+            <cardinality>9013845</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9019338</v>
+                    <v>9013845</v>
                 </e>
                 <e>
                     <k>mangled_name</k>
-                    <v>6061757</v>
+                    <v>6058065</v>
                 </e>
                 <e>
                     <k>is_complete</k>
@@ -22333,7 +22396,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9019338</v>
+                                    <v>9013845</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22349,7 +22412,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9019338</v>
+                                    <v>9013845</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22365,12 +22428,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5789108</v>
+                                    <v>5785583</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>874</b>
-                                    <v>272648</v>
+                                    <v>272482</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22386,7 +22449,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6061757</v>
+                                    <v>6058065</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22439,48 +22502,48 @@
         </relation>
         <relation>
             <name>is_standard_layout_class</name>
-            <cardinality>1253995</cardinality>
+            <cardinality>1253232</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1253995</v>
+                    <v>1253232</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_complete</name>
-            <cardinality>1645694</cardinality>
+            <cardinality>1644692</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1645694</v>
+                    <v>1644692</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_class_template</name>
-            <cardinality>398234</cardinality>
+            <cardinality>397992</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>398234</v>
+                    <v>397992</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>class_instantiation</name>
-            <cardinality>1089659</cardinality>
+            <cardinality>1088996</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>1089659</v>
+                    <v>1088996</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>168537</v>
+                    <v>168435</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22494,7 +22557,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1089659</v>
+                                    <v>1088996</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22510,47 +22573,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>59758</v>
+                                    <v>59722</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>29412</v>
+                                    <v>29394</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>15873</v>
+                                    <v>15863</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>13072</v>
+                                    <v>13064</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>9804</v>
+                                    <v>9798</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>12605</v>
+                                    <v>12597</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>16</b>
-                                    <v>13072</v>
+                                    <v>13064</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>70</b>
-                                    <v>13539</v>
+                                    <v>13530</v>
                                 </b>
                                 <b>
                                     <a>70</a>
                                     <b>84</b>
-                                    <v>1400</v>
+                                    <v>1399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22801,19 +22864,19 @@
         </relation>
         <relation>
             <name>class_template_argument_value</name>
-            <cardinality>495342</cardinality>
+            <cardinality>495040</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>304861</v>
+                    <v>304676</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>1867</v>
+                    <v>1866</v>
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>495342</v>
+                    <v>495040</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22827,17 +22890,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>249772</v>
+                                    <v>249619</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>53222</v>
+                                    <v>53190</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1867</v>
+                                    <v>1866</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22853,22 +22916,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>189546</v>
+                                    <v>189431</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>81234</v>
+                                    <v>81184</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>12138</v>
+                                    <v>12131</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>21942</v>
+                                    <v>21929</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22946,7 +23009,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>495342</v>
+                                    <v>495040</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22962,7 +23025,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>495342</v>
+                                    <v>495040</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22972,15 +23035,15 @@
         </relation>
         <relation>
             <name>is_proxy_class_for</name>
-            <cardinality>62092</cardinality>
+            <cardinality>62055</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>62092</v>
+                    <v>62055</v>
                 </e>
                 <e>
                     <k>templ_param_id</k>
-                    <v>62092</v>
+                    <v>62055</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22994,7 +23057,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>62092</v>
+                                    <v>62055</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23010,7 +23073,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>62092</v>
+                                    <v>62055</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23316,11 +23379,11 @@
         </relation>
         <relation>
             <name>is_function_template</name>
-            <cardinality>1402925</cardinality>
+            <cardinality>1402070</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1402925</v>
+                    <v>1402070</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -24451,19 +24514,19 @@
         </relation>
         <relation>
             <name>routinetypeargs</name>
-            <cardinality>983214</cardinality>
+            <cardinality>982616</cardinality>
             <columnsizes>
                 <e>
                     <k>routine</k>
-                    <v>423445</v>
+                    <v>423187</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>7936</v>
+                    <v>7931</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>226895</v>
+                    <v>226757</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24477,27 +24540,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>152664</v>
+                                    <v>152571</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>133989</v>
+                                    <v>133908</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>63493</v>
+                                    <v>63454</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>45752</v>
+                                    <v>45724</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>18</b>
-                                    <v>27544</v>
+                                    <v>27528</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24513,27 +24576,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>182543</v>
+                                    <v>182432</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>133522</v>
+                                    <v>133441</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>58824</v>
+                                    <v>58788</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>33614</v>
+                                    <v>33593</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>14939</v>
+                                    <v>14930</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24574,7 +24637,7 @@
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>1400</v>
+                                    <v>1399</v>
                                 </b>
                                 <b>
                                     <a>13</a>
@@ -24635,7 +24698,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1400</v>
+                                    <v>1399</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -24691,27 +24754,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>146595</v>
+                                    <v>146505</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>30812</v>
+                                    <v>30794</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>16807</v>
+                                    <v>16796</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>12</b>
-                                    <v>18207</v>
+                                    <v>18196</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>110</b>
-                                    <v>14472</v>
+                                    <v>14463</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24727,22 +24790,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172739</v>
+                                    <v>172634</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>30812</v>
+                                    <v>30794</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>18674</v>
+                                    <v>18663</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>14</b>
-                                    <v>4668</v>
+                                    <v>4665</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24752,19 +24815,19 @@
         </relation>
         <relation>
             <name>ptrtomembers</name>
-            <cardinality>37815</cardinality>
+            <cardinality>37792</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>37815</v>
+                    <v>37792</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>37815</v>
+                    <v>37792</v>
                 </e>
                 <e>
                     <k>class_id</k>
-                    <v>15406</v>
+                    <v>15397</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24778,7 +24841,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37815</v>
+                                    <v>37792</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24794,7 +24857,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37815</v>
+                                    <v>37792</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24810,7 +24873,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37815</v>
+                                    <v>37792</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24826,7 +24889,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37815</v>
+                                    <v>37792</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24842,12 +24905,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13539</v>
+                                    <v>13530</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>1400</v>
+                                    <v>1399</v>
                                 </b>
                                 <b>
                                     <a>28</a>
@@ -24868,12 +24931,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13539</v>
+                                    <v>13530</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>1400</v>
+                                    <v>1399</v>
                                 </b>
                                 <b>
                                     <a>28</a>
@@ -24888,15 +24951,15 @@
         </relation>
         <relation>
             <name>specifiers</name>
-            <cardinality>24743</cardinality>
+            <cardinality>24728</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>24743</v>
+                    <v>24728</v>
                 </e>
                 <e>
                     <k>str</k>
-                    <v>24743</v>
+                    <v>24728</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24910,7 +24973,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24743</v>
+                                    <v>24728</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24926,7 +24989,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24743</v>
+                                    <v>24728</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24936,15 +24999,15 @@
         </relation>
         <relation>
             <name>typespecifiers</name>
-            <cardinality>1132144</cardinality>
+            <cardinality>1131454</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>1113936</v>
+                    <v>1113258</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>3734</v>
+                    <v>3732</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24958,12 +25021,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1095728</v>
+                                    <v>1095061</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>18207</v>
+                                    <v>18196</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25019,15 +25082,15 @@
         </relation>
         <relation>
             <name>funspecifiers</name>
-            <cardinality>10305080</cardinality>
+            <cardinality>10298338</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>4068249</v>
+                    <v>4065772</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>8403</v>
+                    <v>8398</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25041,27 +25104,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1357639</v>
+                                    <v>1356812</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>640536</v>
+                                    <v>640613</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>985549</v>
+                                    <v>984482</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>780129</v>
+                                    <v>779654</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>304395</v>
+                                    <v>304209</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25160,8 +25223,8 @@
                                     <v>466</v>
                                 </b>
                                 <b>
-                                    <a>6435</a>
-                                    <b>6436</b>
+                                    <a>6434</a>
+                                    <b>6435</b>
                                     <v>466</v>
                                 </b>
                             </bs>
@@ -25172,15 +25235,15 @@
         </relation>
         <relation>
             <name>varspecifiers</name>
-            <cardinality>2246080</cardinality>
+            <cardinality>2244713</cardinality>
             <columnsizes>
                 <e>
                     <k>var_id</k>
-                    <v>1225050</v>
+                    <v>1224304</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>3734</v>
+                    <v>3732</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25194,22 +25257,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>730174</v>
+                                    <v>729730</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>202618</v>
+                                    <v>202495</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>58357</v>
+                                    <v>58322</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>233898</v>
+                                    <v>233756</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25318,19 +25381,19 @@
         </relation>
         <relation>
             <name>attributes</name>
-            <cardinality>561636</cardinality>
+            <cardinality>561294</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>561636</v>
+                    <v>561294</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>1400</v>
+                    <v>1399</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>11204</v>
+                    <v>11197</v>
                 </e>
                 <e>
                     <k>name_space</k>
@@ -25338,7 +25401,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>481336</v>
+                    <v>481043</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25352,7 +25415,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>561636</v>
+                                    <v>561294</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25368,7 +25431,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>561636</v>
+                                    <v>561294</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25384,7 +25447,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>561636</v>
+                                    <v>561294</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25400,7 +25463,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>561636</v>
+                                    <v>561294</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25591,7 +25654,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10270</v>
+                                    <v>10264</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25612,7 +25675,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11204</v>
+                                    <v>11197</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25783,17 +25846,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>431848</v>
+                                    <v>431585</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>20075</v>
+                                    <v>20062</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>29412</v>
+                                    <v>29394</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25809,7 +25872,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>481336</v>
+                                    <v>481043</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25825,17 +25888,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>433249</v>
+                                    <v>432985</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>19608</v>
+                                    <v>19596</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>28478</v>
+                                    <v>28461</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25851,7 +25914,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>481336</v>
+                                    <v>481043</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25861,27 +25924,27 @@
         </relation>
         <relation>
             <name>attribute_args</name>
-            <cardinality>344078</cardinality>
+            <cardinality>343868</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>344078</v>
+                    <v>343868</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>1400</v>
+                    <v>1399</v>
                 </e>
                 <e>
                     <k>attribute</k>
-                    <v>262844</v>
+                    <v>262684</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>1400</v>
+                    <v>1399</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>327738</v>
+                    <v>327538</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25895,7 +25958,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>344078</v>
+                                    <v>343868</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25911,7 +25974,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>344078</v>
+                                    <v>343868</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25927,7 +25990,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>344078</v>
+                                    <v>343868</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25943,7 +26006,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>344078</v>
+                                    <v>343868</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26058,17 +26121,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>197483</v>
+                                    <v>197363</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>49487</v>
+                                    <v>49457</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>15873</v>
+                                    <v>15863</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26084,12 +26147,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>252573</v>
+                                    <v>252419</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10270</v>
+                                    <v>10264</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26105,17 +26168,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>197483</v>
+                                    <v>197363</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>49487</v>
+                                    <v>49457</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>15873</v>
+                                    <v>15863</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26131,17 +26194,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>197483</v>
+                                    <v>197363</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>49487</v>
+                                    <v>49457</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>15873</v>
+                                    <v>15863</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26256,12 +26319,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>313732</v>
+                                    <v>313541</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>14005</v>
+                                    <v>13997</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26277,12 +26340,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>315132</v>
+                                    <v>314941</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12605</v>
+                                    <v>12597</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26298,12 +26361,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>313732</v>
+                                    <v>313541</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>14005</v>
+                                    <v>13997</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26319,7 +26382,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>327738</v>
+                                    <v>327538</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26329,15 +26392,15 @@
         </relation>
         <relation>
             <name>attribute_arg_value</name>
-            <cardinality>25210</cardinality>
+            <cardinality>25195</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>25210</v>
+                    <v>25195</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>15873</v>
+                    <v>15863</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26351,7 +26414,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25210</v>
+                                    <v>25195</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26367,12 +26430,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14472</v>
+                                    <v>14463</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>16</b>
-                                    <v>1400</v>
+                                    <v>1399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26430,15 +26493,15 @@
         </relation>
         <relation>
             <name>attribute_arg_constant</name>
-            <cardinality>318400</cardinality>
+            <cardinality>318207</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>318400</v>
+                    <v>318207</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>318400</v>
+                    <v>318207</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26452,7 +26515,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>318400</v>
+                                    <v>318207</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26468,7 +26531,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>318400</v>
+                                    <v>318207</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26647,15 +26710,15 @@
         </relation>
         <relation>
             <name>funcattributes</name>
-            <cardinality>630265</cardinality>
+            <cardinality>629882</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>443520</v>
+                    <v>443250</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>524754</v>
+                    <v>524435</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26669,17 +26732,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>338476</v>
+                                    <v>338269</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>64427</v>
+                                    <v>64387</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>39683</v>
+                                    <v>39659</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -26700,12 +26763,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>506080</v>
+                                    <v>505771</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>17</b>
-                                    <v>18674</v>
+                                    <v>18663</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26841,15 +26904,15 @@
         </relation>
         <relation>
             <name>unspecifiedtype</name>
-            <cardinality>9488069</cardinality>
+            <cardinality>9482291</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>9488069</v>
+                    <v>9482291</v>
                 </e>
                 <e>
                     <k>unspecified_type_id</k>
-                    <v>6490338</v>
+                    <v>6486385</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26863,7 +26926,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9488069</v>
+                                    <v>9482291</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26879,17 +26942,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4558923</v>
+                                    <v>4556146</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1715723</v>
+                                    <v>1714678</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>145</b>
-                                    <v>215690</v>
+                                    <v>215559</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26899,19 +26962,19 @@
         </relation>
         <relation>
             <name>member</name>
-            <cardinality>3881037</cardinality>
+            <cardinality>3878673</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>545763</v>
+                    <v>545431</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>92905</v>
+                    <v>92849</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>3809607</v>
+                    <v>3807287</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26925,47 +26988,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>129788</v>
+                                    <v>129709</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>64894</v>
+                                    <v>64854</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>73297</v>
+                                    <v>73252</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>75165</v>
+                                    <v>75119</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>40617</v>
+                                    <v>40592</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>46686</v>
+                                    <v>46657</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>45752</v>
+                                    <v>45724</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>30</b>
-                                    <v>41550</v>
+                                    <v>41525</v>
                                 </b>
                                 <b>
                                     <a>30</a>
                                     <b>200</b>
-                                    <v>28011</v>
+                                    <v>27994</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26981,52 +27044,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>129788</v>
+                                    <v>129709</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>64894</v>
+                                    <v>64854</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>73297</v>
+                                    <v>73252</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>76098</v>
+                                    <v>76052</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>39683</v>
+                                    <v>39659</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>24276</v>
+                                    <v>24262</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>42017</v>
+                                    <v>41992</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>17</b>
-                                    <v>43885</v>
+                                    <v>43858</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>41</b>
-                                    <v>41550</v>
+                                    <v>41525</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>200</b>
-                                    <v>10270</v>
+                                    <v>10264</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27042,62 +27105,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26128</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7002</v>
+                                    <v>6998</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>7936</v>
+                                    <v>7931</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>5602</v>
+                                    <v>5598</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>5602</v>
+                                    <v>5598</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>7469</v>
+                                    <v>7465</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>16</b>
-                                    <v>7002</v>
+                                    <v>6998</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>52</b>
-                                    <v>7002</v>
+                                    <v>6998</v>
                                 </b>
                                 <b>
                                     <a>52</a>
                                     <b>107</b>
-                                    <v>7002</v>
+                                    <v>6998</v>
                                 </b>
                                 <b>
                                     <a>108</a>
                                     <b>577</b>
-                                    <v>7002</v>
+                                    <v>6998</v>
                                 </b>
                                 <b>
                                     <a>737</a>
                                     <b>1162</b>
-                                    <v>1400</v>
+                                    <v>1399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27113,62 +27176,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26144</v>
+                                    <v>26128</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7002</v>
+                                    <v>6998</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>3734</v>
+                                    <v>3732</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>7936</v>
+                                    <v>7931</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>5602</v>
+                                    <v>5598</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>5602</v>
+                                    <v>5598</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>7469</v>
+                                    <v>7465</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>16</b>
-                                    <v>7002</v>
+                                    <v>6998</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>52</b>
-                                    <v>7002</v>
+                                    <v>6998</v>
                                 </b>
                                 <b>
                                     <a>52</a>
                                     <b>107</b>
-                                    <v>7002</v>
+                                    <v>6998</v>
                                 </b>
                                 <b>
                                     <a>108</a>
                                     <b>577</b>
-                                    <v>7002</v>
+                                    <v>6998</v>
                                 </b>
                                 <b>
                                     <a>738</a>
                                     <b>1163</b>
-                                    <v>1400</v>
+                                    <v>1399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27184,7 +27247,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3809607</v>
+                                    <v>3807287</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27200,12 +27263,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3738177</v>
+                                    <v>3735900</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>71430</v>
+                                    <v>71386</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28735,15 +28798,15 @@
         </relation>
         <relation>
             <name>commentbinding</name>
-            <cardinality>3091104</cardinality>
+            <cardinality>3089221</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2445431</v>
+                    <v>2443942</v>
                 </e>
                 <e>
                     <k>element</k>
-                    <v>3014538</v>
+                    <v>3012702</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28757,12 +28820,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2368399</v>
+                                    <v>2366956</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>97</b>
-                                    <v>77032</v>
+                                    <v>76985</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28778,12 +28841,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2937972</v>
+                                    <v>2936183</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>76565</v>
+                                    <v>76519</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28793,15 +28856,15 @@
         </relation>
         <relation>
             <name>exprconv</name>
-            <cardinality>7032991</cardinality>
+            <cardinality>7032993</cardinality>
             <columnsizes>
                 <e>
                     <k>converted</k>
-                    <v>7032991</v>
+                    <v>7032993</v>
                 </e>
                 <e>
                     <k>conversion</k>
-                    <v>7032991</v>
+                    <v>7032993</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28815,7 +28878,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7032991</v>
+                                    <v>7032993</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28831,7 +28894,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7032991</v>
+                                    <v>7032993</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29188,15 +29251,15 @@
         </relation>
         <relation>
             <name>namespaces</name>
-            <cardinality>12138</cardinality>
+            <cardinality>12131</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12138</v>
+                    <v>12131</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>9804</v>
+                    <v>9798</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29210,7 +29273,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12138</v>
+                                    <v>12131</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29226,7 +29289,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8403</v>
+                                    <v>8398</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29246,26 +29309,26 @@
         </relation>
         <relation>
             <name>namespace_inline</name>
-            <cardinality>1400</cardinality>
+            <cardinality>1399</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1400</v>
+                    <v>1399</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>namespacembrs</name>
-            <cardinality>2388007</cardinality>
+            <cardinality>2386553</cardinality>
             <columnsizes>
                 <e>
                     <k>parentid</k>
-                    <v>10270</v>
+                    <v>10264</v>
                 </e>
                 <e>
                     <k>memberid</k>
-                    <v>2388007</v>
+                    <v>2386553</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29279,7 +29342,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1867</v>
+                                    <v>1866</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29340,7 +29403,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2388007</v>
+                                    <v>2386553</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29836,7 +29899,7 @@
                 </e>
                 <e>
                     <k>qualifyingelement</k>
-                    <v>97518</v>
+                    <v>97537</v>
                 </e>
                 <e>
                     <k>location</k>
@@ -29950,7 +30013,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>58401</v>
+                                    <v>58420</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29986,7 +30049,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>58401</v>
+                                    <v>58420</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30022,7 +30085,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>63815</v>
+                                    <v>63834</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30135,12 +30198,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>137073</v>
+                                    <v>137054</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>55684</v>
+                                    <v>55703</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -32081,7 +32144,7 @@
         </relation>
         <relation>
             <name>expr_types</name>
-            <cardinality>18451442</cardinality>
+            <cardinality>18451397</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -32107,12 +32170,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18188121</v>
+                                    <v>18188166</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>131660</v>
+                                    <v>131615</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32149,17 +32212,17 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>249334</v>
+                                    <v>249345</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>102840</v>
+                                    <v>102817</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>81865</v>
+                                    <v>81877</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -32174,12 +32237,12 @@
                                 <b>
                                     <a>14</a>
                                     <b>41</b>
-                                    <v>91664</v>
+                                    <v>91653</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>125325</b>
-                                    <v>44579</v>
+                                    <v>44590</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33706,11 +33769,11 @@
         </relation>
         <relation>
             <name>lambdas</name>
-            <cardinality>21475</cardinality>
+            <cardinality>21462</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>21475</v>
+                    <v>21462</v>
                 </e>
                 <e>
                     <k>default_capture</k>
@@ -33732,7 +33795,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21475</v>
+                                    <v>21462</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33748,7 +33811,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21475</v>
+                                    <v>21462</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33822,15 +33885,15 @@
         </relation>
         <relation>
             <name>lambda_capture</name>
-            <cardinality>28011</cardinality>
+            <cardinality>27994</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>28011</v>
+                    <v>27994</v>
                 </e>
                 <e>
                     <k>lambda</k>
-                    <v>20541</v>
+                    <v>20529</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -33838,7 +33901,7 @@
                 </e>
                 <e>
                     <k>field</k>
-                    <v>28011</v>
+                    <v>27994</v>
                 </e>
                 <e>
                     <k>captured_by_reference</k>
@@ -33850,7 +33913,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2801</v>
+                    <v>2799</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33864,7 +33927,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>27994</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33880,7 +33943,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>27994</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33896,7 +33959,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>27994</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33912,7 +33975,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>27994</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33928,7 +33991,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>27994</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33944,7 +34007,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>27994</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33960,12 +34023,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13072</v>
+                                    <v>13064</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7469</v>
+                                    <v>7465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33981,12 +34044,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13072</v>
+                                    <v>13064</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7469</v>
+                                    <v>7465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34002,12 +34065,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13072</v>
+                                    <v>13064</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7469</v>
+                                    <v>7465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34023,7 +34086,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20541</v>
+                                    <v>20529</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34039,7 +34102,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20541</v>
+                                    <v>20529</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34055,12 +34118,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13072</v>
+                                    <v>13064</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7469</v>
+                                    <v>7465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34192,7 +34255,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>27994</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34208,7 +34271,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>27994</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34224,7 +34287,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>27994</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34240,7 +34303,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>27994</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34256,7 +34319,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>27994</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34272,7 +34335,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28011</v>
+                                    <v>27994</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34480,7 +34543,7 @@
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>1867</v>
+                                    <v>1866</v>
                                 </b>
                                 <b>
                                     <a>14</a>
@@ -34501,7 +34564,7 @@
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>1867</v>
+                                    <v>1866</v>
                                 </b>
                                 <b>
                                     <a>14</a>
@@ -34522,7 +34585,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34538,7 +34601,7 @@
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>1867</v>
+                                    <v>1866</v>
                                 </b>
                                 <b>
                                     <a>14</a>
@@ -34559,7 +34622,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34575,7 +34638,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2801</v>
+                                    <v>2799</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36318,11 +36381,11 @@
         </relation>
         <relation>
             <name>stmt_decl_bind</name>
-            <cardinality>580842</cardinality>
+            <cardinality>580849</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>541060</v>
+                    <v>541066</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -36330,7 +36393,7 @@
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>580738</v>
+                    <v>580745</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36344,7 +36407,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>520371</v>
+                                    <v>520377</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36365,7 +36428,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>520371</v>
+                                    <v>520377</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36568,7 +36631,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>580700</v>
+                                    <v>580707</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36589,7 +36652,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>580738</v>
+                                    <v>580745</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36599,11 +36662,11 @@
         </relation>
         <relation>
             <name>stmt_decl_entry_bind</name>
-            <cardinality>580842</cardinality>
+            <cardinality>580849</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>541060</v>
+                    <v>541066</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -36611,7 +36674,7 @@
                 </e>
                 <e>
                     <k>decl_entry</k>
-                    <v>580784</v>
+                    <v>580791</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36625,7 +36688,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>520371</v>
+                                    <v>520377</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36646,7 +36709,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>520371</v>
+                                    <v>520377</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36849,7 +36912,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>580763</v>
+                                    <v>580770</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -36870,7 +36933,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>580784</v>
+                                    <v>580791</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36880,15 +36943,15 @@
         </relation>
         <relation>
             <name>blockscope</name>
-            <cardinality>1410861</cardinality>
+            <cardinality>1410469</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>1410861</v>
+                    <v>1410469</v>
                 </e>
                 <e>
                     <k>enclosing</k>
-                    <v>1295546</v>
+                    <v>1295224</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36902,7 +36965,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1410861</v>
+                                    <v>1410469</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36918,12 +36981,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1230185</v>
+                                    <v>1229903</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>13</b>
-                                    <v>65360</v>
+                                    <v>65321</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37119,19 +37182,19 @@
         </relation>
         <relation>
             <name>preprocdirects</name>
-            <cardinality>4190567</cardinality>
+            <cardinality>4188015</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4190567</v>
+                    <v>4188015</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>5135</v>
+                    <v>5132</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>4149950</v>
+                    <v>4147423</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37145,7 +37208,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4190567</v>
+                                    <v>4188015</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37161,7 +37224,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4190567</v>
+                                    <v>4188015</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37309,7 +37372,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4149483</v>
+                                    <v>4146956</v>
                                 </b>
                                 <b>
                                     <a>88</a>
@@ -37330,7 +37393,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4149950</v>
+                                    <v>4147423</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37340,15 +37403,15 @@
         </relation>
         <relation>
             <name>preprocpair</name>
-            <cardinality>1431403</cardinality>
+            <cardinality>1430532</cardinality>
             <columnsizes>
                 <e>
                     <k>begin</k>
-                    <v>1197038</v>
+                    <v>1196309</v>
                 </e>
                 <e>
                     <k>elseelifend</k>
-                    <v>1431403</v>
+                    <v>1430532</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37362,17 +37425,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>978546</v>
+                                    <v>977950</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>208221</v>
+                                    <v>208094</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>10270</v>
+                                    <v>10264</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37388,7 +37451,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1431403</v>
+                                    <v>1430532</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37398,22 +37461,22 @@
         </relation>
         <relation>
             <name>preproctrue</name>
-            <cardinality>767056</cardinality>
+            <cardinality>766589</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>767056</v>
+                    <v>766589</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>preprocfalse</name>
-            <cardinality>331473</cardinality>
+            <cardinality>331271</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>331473</v>
+                    <v>331271</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -37566,15 +37629,15 @@
         </relation>
         <relation>
             <name>includes</name>
-            <cardinality>313265</cardinality>
+            <cardinality>313074</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>313265</v>
+                    <v>313074</v>
                 </e>
                 <e>
                     <k>included</k>
-                    <v>117182</v>
+                    <v>117111</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37588,7 +37651,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>313265</v>
+                                    <v>313074</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37604,32 +37667,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>61159</v>
+                                    <v>61121</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>21942</v>
+                                    <v>21929</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>12605</v>
+                                    <v>12597</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>10270</v>
+                                    <v>10264</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>14</b>
-                                    <v>8870</v>
+                                    <v>8865</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>47</b>
-                                    <v>2334</v>
+                                    <v>2332</v>
                                 </b>
                             </bs>
                         </hist>
diff --git a/cpp/ql/lib/upgrades/e51fad7a2436caefab0c6bd52f05e28e7cce4d92/old.dbscheme b/cpp/ql/lib/upgrades/e51fad7a2436caefab0c6bd52f05e28e7cce4d92/old.dbscheme
new file mode 100644
index 00000000000..e51fad7a243
--- /dev/null
+++ b/cpp/ql/lib/upgrades/e51fad7a2436caefab0c6bd52f05e28e7cce4d92/old.dbscheme
@@ -0,0 +1,2323 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+    int id : @externalDataElement,
+    string path : string ref,
+    int column: int ref,
+    string value : string ref
+);
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/**
+ * Information about packages that provide code used during compilation.
+ * The `id` is just a unique identifier.
+ * The `namespace` is typically the name of the package manager that
+ * provided the package (e.g. "dpkg" or "yum").
+ * The `package_name` is the name of the package, and `version` is its
+ * version (as a string).
+ */
+external_packages(
+    unique int id: @external_package,
+    string namespace : string ref,
+    string package_name : string ref,
+    string version : string ref
+);
+
+/**
+ * Holds if File `fileid` was provided by package `package`.
+ */
+header_to_external_package(
+    int fileid : @file ref,
+    int package : @external_package ref
+);
+
+/*
+ * Version history
+ */
+
+svnentries(
+    unique int id : @svnentry,
+    string revision : string ref,
+    string author : string ref,
+    date revisionDate : date ref,
+    int changeSize : int ref
+)
+
+svnaffectedfiles(
+    int id : @svnentry ref,
+    int file : @file ref,
+    string action : string ref
+)
+
+svnentrymsg(
+    unique int id : @svnentry ref,
+    string message : string ref
+)
+
+svnchurn(
+    int commit : @svnentry ref,
+    int file : @file ref,
+    int addedLines : int ref,
+    int deletedLines : int ref
+)
+
+/*
+ * C++ dbscheme
+ */
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+@location = @location_stmt | @location_expr | @location_default ;
+
+/**
+ * The location of an element that is not an expression or a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+    /** The location of an element that is not an expression or a statement. */
+    unique int id: @location_default,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_stmt(
+    /** The location of a statement. */
+    unique int id: @location_stmt,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of an expression.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_expr(
+    /** The location of an expression. */
+    unique int id: @location_expr,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+numlines(
+    int element_id: @sourceline ref,
+    int num_lines: int ref,
+    int num_code: int ref,
+    int num_comment: int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location_default ref
+);
+
+files(
+    unique int id: @file,
+    string name: string ref
+);
+
+folders(
+    unique int id: @folder,
+    string name: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+    int parent: @container ref,
+    unique int child: @container ref
+);
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+/*
+case @function.kind of
+  1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+| 6 = @builtin_function     // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+*/
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * would change the semantics of this decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @usertype.kind of
+   1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+|  5 = @typedef                       // classic C: typedef typedef type name
+|  6 = @template
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+| 14 = @using_alias                  // a using name = type style typedef
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    unique int templ_param_id: @usertype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      /* TODO | @fixedpointtype */
+      | @routinetype
+      | @ptrtomember
+      | @decltype;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_expr ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_expr ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@runtime_sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof;
+
+sizeof_bind(
+    unique int expr: @runtime_sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_stmt ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/* XML Files */
+
+xmlEncoding(unique int id: @file ref, string encoding: string ref);
+
+xmlDTDs(
+    unique int id: @xmldtd,
+    string root: string ref,
+    string publicId: string ref,
+    string systemId: string ref,
+    int fileid: @file ref
+);
+
+xmlElements(
+    unique int id: @xmlelement,
+    string name: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlAttrs(
+    unique int id: @xmlattribute,
+    int elementid: @xmlelement ref,
+    string name: string ref,
+    string value: string ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlNs(
+    int id: @xmlnamespace,
+    string prefixName: string ref,
+    string URI: string ref,
+    int fileid: @file ref
+);
+
+xmlHasNs(
+    int elementId: @xmlnamespaceable ref,
+    int nsId: @xmlnamespace ref,
+    int fileid: @file ref
+);
+
+xmlComments(
+    unique int id: @xmlcomment,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int fileid: @file ref
+);
+
+xmlChars(
+    unique int id: @xmlcharacters,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int isCDATA: int ref,
+    int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+    int xmlElement: @xmllocatable ref,
+    int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters
+              | @xmlelement
+              | @xmlcomment
+              | @xmlattribute
+              | @xmldtd
+              | @file
+              | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/e51fad7a2436caefab0c6bd52f05e28e7cce4d92/semmlecode.cpp.dbscheme b/cpp/ql/lib/upgrades/e51fad7a2436caefab0c6bd52f05e28e7cce4d92/semmlecode.cpp.dbscheme
new file mode 100644
index 00000000000..f0156f5f88a
--- /dev/null
+++ b/cpp/ql/lib/upgrades/e51fad7a2436caefab0c6bd52f05e28e7cce4d92/semmlecode.cpp.dbscheme
@@ -0,0 +1,2339 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+    int id : @externalDataElement,
+    string path : string ref,
+    int column: int ref,
+    string value : string ref
+);
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/**
+ * Information about packages that provide code used during compilation.
+ * The `id` is just a unique identifier.
+ * The `namespace` is typically the name of the package manager that
+ * provided the package (e.g. "dpkg" or "yum").
+ * The `package_name` is the name of the package, and `version` is its
+ * version (as a string).
+ */
+external_packages(
+    unique int id: @external_package,
+    string namespace : string ref,
+    string package_name : string ref,
+    string version : string ref
+);
+
+/**
+ * Holds if File `fileid` was provided by package `package`.
+ */
+header_to_external_package(
+    int fileid : @file ref,
+    int package : @external_package ref
+);
+
+/*
+ * Version history
+ */
+
+svnentries(
+    unique int id : @svnentry,
+    string revision : string ref,
+    string author : string ref,
+    date revisionDate : date ref,
+    int changeSize : int ref
+)
+
+svnaffectedfiles(
+    int id : @svnentry ref,
+    int file : @file ref,
+    string action : string ref
+)
+
+svnentrymsg(
+    unique int id : @svnentry ref,
+    string message : string ref
+)
+
+svnchurn(
+    int commit : @svnentry ref,
+    int file : @file ref,
+    int addedLines : int ref,
+    int deletedLines : int ref
+)
+
+/*
+ * C++ dbscheme
+ */
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+@location = @location_stmt | @location_expr | @location_default ;
+
+/**
+ * The location of an element that is not an expression or a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+    /** The location of an element that is not an expression or a statement. */
+    unique int id: @location_default,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of a statement.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_stmt(
+    /** The location of a statement. */
+    unique int id: @location_stmt,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/**
+ * The location of an expression.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_expr(
+    /** The location of an expression. */
+    unique int id: @location_expr,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+numlines(
+    int element_id: @sourceline ref,
+    int num_lines: int ref,
+    int num_code: int ref,
+    int num_comment: int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location_default ref
+);
+
+files(
+    unique int id: @file,
+    string name: string ref
+);
+
+folders(
+    unique int id: @folder,
+    string name: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+    int parent: @container ref,
+    unique int child: @container ref
+);
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+/*
+case @function.kind of
+  1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+| 6 = @builtin_function     // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+*/
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * would change the semantics of this decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @usertype.kind of
+   1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+|  5 = @typedef                       // classic C: typedef typedef type name
+|  6 = @template
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+| 14 = @using_alias                  // a using name = type style typedef
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    unique int templ_param_id: @usertype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      /* TODO | @fixedpointtype */
+      | @routinetype
+      | @ptrtomember
+      | @decltype;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_expr ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_expr ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@runtime_sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof;
+
+sizeof_bind(
+    unique int expr: @runtime_sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_stmt ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/* XML Files */
+
+xmlEncoding(unique int id: @file ref, string encoding: string ref);
+
+xmlDTDs(
+    unique int id: @xmldtd,
+    string root: string ref,
+    string publicId: string ref,
+    string systemId: string ref,
+    int fileid: @file ref
+);
+
+xmlElements(
+    unique int id: @xmlelement,
+    string name: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlAttrs(
+    unique int id: @xmlattribute,
+    int elementid: @xmlelement ref,
+    string name: string ref,
+    string value: string ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlNs(
+    int id: @xmlnamespace,
+    string prefixName: string ref,
+    string URI: string ref,
+    int fileid: @file ref
+);
+
+xmlHasNs(
+    int elementId: @xmlnamespaceable ref,
+    int nsId: @xmlnamespace ref,
+    int fileid: @file ref
+);
+
+xmlComments(
+    unique int id: @xmlcomment,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int fileid: @file ref
+);
+
+xmlChars(
+    unique int id: @xmlcharacters,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int isCDATA: int ref,
+    int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+    int xmlElement: @xmllocatable ref,
+    int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters
+              | @xmlelement
+              | @xmlcomment
+              | @xmlattribute
+              | @xmldtd
+              | @file
+              | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/e51fad7a2436caefab0c6bd52f05e28e7cce4d92/upgrade.properties b/cpp/ql/lib/upgrades/e51fad7a2436caefab0c6bd52f05e28e7cce4d92/upgrade.properties
new file mode 100644
index 00000000000..08e1dc42eb2
--- /dev/null
+++ b/cpp/ql/lib/upgrades/e51fad7a2436caefab0c6bd52f05e28e7cce4d92/upgrade.properties
@@ -0,0 +1,2 @@
+description: Implement compilation_build_mode/2
+compatibility: backwards
diff --git a/cpp/ql/src/experimental/Best Practices/GuardedFree.cpp b/cpp/ql/src/Best Practices/GuardedFree.cpp
similarity index 100%
rename from cpp/ql/src/experimental/Best Practices/GuardedFree.cpp
rename to cpp/ql/src/Best Practices/GuardedFree.cpp
diff --git a/cpp/ql/src/experimental/Best Practices/GuardedFree.qhelp b/cpp/ql/src/Best Practices/GuardedFree.qhelp
similarity index 55%
rename from cpp/ql/src/experimental/Best Practices/GuardedFree.qhelp
rename to cpp/ql/src/Best Practices/GuardedFree.qhelp
index 77fdd467000..c2dc5cb36d7 100644
--- a/cpp/ql/src/experimental/Best Practices/GuardedFree.qhelp	
+++ b/cpp/ql/src/Best Practices/GuardedFree.qhelp	
@@ -1,18 +1,28 @@
-<!DOCTYPE qhelp SYSTEM "qhelp.dtd">
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
 <qhelp>
+
 <overview>
-<p>The <code>free</code> function, which deallocates heap memory, may accept a NULL pointer and take no action. Therefore, it is unnecessary to check its argument for the value of NULL before a function call to <code>free</code>. As such, these guards may hinder performance and readability.</p>
+<p>The <code>free</code> function, which deallocates heap memory, may accept a NULL pointer and take no action. Therefore, it is unnecessary to check the argument for the value of NULL before a function call to <code>free</code>. As such, these guards may hinder performance and readability.</p>
 </overview>
+
 <recommendation>
-<p>A function call to <code>free</code> should not depend upon the value of its argument. Delete the <code>if</code> condition preceeding a function call to <code>free</code> when its only purpose is to check the value of the pointer to be freed.</p>
+<p>A function call to <code>free</code> should not depend upon the value of its argument. Delete the condition preceding a function call to <code>free</code> when its only purpose is to check the value of the pointer to be freed.</p>
 </recommendation>
+
 <example>
 <sample src = "GuardedFree.cpp" />
+
+<p>In this example, the condition checking the value of <code>foo</code> can be deleted.</p>
+
 </example>
+
 <references>
 <li>
     The Open Group Base Specifications Issue 7, 2018 Edition:
-    <a href="https://pubs.opengroup.org/onlinepubs/9699919799/functions/free.html">free - free allocated memory</a>
+    <a href="https://pubs.opengroup.org/onlinepubs/9699919799/functions/free.html">free - free allocated memory</a>.
 </li>
 </references>
-</qhelp>
\ No newline at end of file
+
+</qhelp>
diff --git a/cpp/ql/src/Best Practices/GuardedFree.ql b/cpp/ql/src/Best Practices/GuardedFree.ql
new file mode 100644
index 00000000000..ea81a715828
--- /dev/null
+++ b/cpp/ql/src/Best Practices/GuardedFree.ql	
@@ -0,0 +1,47 @@
+/**
+ * @name Guarded Free
+ * @description NULL-condition guards before function calls to the memory-deallocation
+ *              function free(3) are unnecessary, because passing NULL to free(3) is a no-op.
+ * @kind problem
+ * @problem.severity recommendation
+ * @precision very-high
+ * @id cpp/guarded-free
+ * @tags maintainability
+ *       readability
+ */
+
+import cpp
+import semmle.code.cpp.controlflow.Guards
+
+class FreeCall extends FunctionCall {
+  FreeCall() { this.getTarget().hasGlobalName("free") }
+}
+
+predicate blockContainsPreprocessorBranches(BasicBlock bb) {
+  exists(PreprocessorBranch ppb, Location bbLoc, Location ppbLoc |
+    bbLoc = bb.(Stmt).getLocation() and ppbLoc = ppb.getLocation()
+  |
+    bbLoc.getFile() = ppb.getFile() and
+    bbLoc.getStartLine() < ppbLoc.getStartLine() and
+    ppbLoc.getEndLine() < bbLoc.getEndLine()
+  )
+}
+
+from GuardCondition gc, FreeCall fc, Variable v, BasicBlock bb
+where
+  gc.ensuresEq(v.getAnAccess(), 0, bb, false) and
+  fc.getArgument(0) = v.getAnAccess() and
+  bb = fc.getBasicBlock() and
+  (
+    // No block statement: if (x) free(x);
+    bb = fc.getEnclosingStmt()
+    or
+    // Block statement with a single nested statement: if (x) { free(x); }
+    strictcount(bb.(BlockStmt).getAStmt()) = 1
+  ) and
+  strictcount(BasicBlock bb2 | gc.ensuresEq(_, 0, bb2, _) | bb2) = 1 and
+  not fc.isInMacroExpansion() and
+  not blockContainsPreprocessorBranches(bb) and
+  not (gc instanceof BinaryOperation and not gc instanceof ComparisonOperation) and
+  not exists(CommaExpr c | c.getAChild*() = fc)
+select gc, "unnecessary NULL check before call to $@", fc, "free"
diff --git a/cpp/ql/src/Critical/UseAfterFree.qhelp b/cpp/ql/src/Critical/UseAfterFree.qhelp
index 6a532ed4d35..60dd1a6690e 100644
--- a/cpp/ql/src/Critical/UseAfterFree.qhelp
+++ b/cpp/ql/src/Critical/UseAfterFree.qhelp
@@ -8,7 +8,7 @@
 <p>
 This rule finds accesses through a pointer of a memory location that has already been freed (i.e. through a dangling pointer). 
 Such memory blocks have already been released to the dynamic memory manager, and modifying them can lead to anything 
-from a segfault to memory corruption that would cause subsequent calls to the dynamic memory manger to behave 
+from a segfault to memory corruption that would cause subsequent calls to the dynamic memory manager to behave 
 erratically, to a possible security vulnerability.
 </p>
 
diff --git a/cpp/ql/src/Likely Bugs/Underspecified Functions/TooFewArguments.qll b/cpp/ql/src/Likely Bugs/Underspecified Functions/TooFewArguments.qll
index 6f3f4d43e9a..218a54b36c5 100644
--- a/cpp/ql/src/Likely Bugs/Underspecified Functions/TooFewArguments.qll	
+++ b/cpp/ql/src/Likely Bugs/Underspecified Functions/TooFewArguments.qll	
@@ -51,5 +51,7 @@ predicate tooFewArguments(FunctionCall fc, Function f) {
     hasDefiniteNumberOfParameters(fde)
   |
     fde.getNumberOfParameters() > fc.getNumberOfArguments()
-  )
+  ) and
+  // Don't report on implicit function declarations, as these are likely extraction errors.
+  not f.getADeclarationEntry().isImplicit()
 }
diff --git a/cpp/ql/src/Security/CWE/CWE-078/ExecTainted.ql b/cpp/ql/src/Security/CWE/CWE-078/ExecTainted.ql
index 0686c4a707c..f6dd3b6f212 100644
--- a/cpp/ql/src/Security/CWE/CWE-078/ExecTainted.ql
+++ b/cpp/ql/src/Security/CWE/CWE-078/ExecTainted.ql
@@ -19,7 +19,6 @@ import semmle.code.cpp.security.Security
 import semmle.code.cpp.valuenumbering.GlobalValueNumbering
 import semmle.code.cpp.ir.IR
 import semmle.code.cpp.ir.dataflow.TaintTracking
-import semmle.code.cpp.ir.dataflow.TaintTracking2
 import semmle.code.cpp.security.FlowSources
 import semmle.code.cpp.models.implementations.Strcat
 import ExecTaint::PathGraph
diff --git a/cpp/ql/src/Security/CWE/CWE-570/IncorrectAllocationErrorHandling.ql b/cpp/ql/src/Security/CWE/CWE-570/IncorrectAllocationErrorHandling.ql
index 92daf31b057..d4d908f8474 100644
--- a/cpp/ql/src/Security/CWE/CWE-570/IncorrectAllocationErrorHandling.ql
+++ b/cpp/ql/src/Security/CWE/CWE-570/IncorrectAllocationErrorHandling.ql
@@ -45,7 +45,7 @@ predicate deleteMayThrow(DeleteOrDeleteArrayExpr deleteExpr) {
  * like it might throw an exception, and the function does not have a `noexcept` or `throw()` specifier.
  */
 predicate functionMayThrow(Function f) {
-  not f instanceof NonThrowingFunction and
+  not f instanceof NonCppThrowingFunction and
   (not exists(f.getBlock()) or stmtMayThrow(f.getBlock()))
 }
 
diff --git a/cpp/ql/src/change-notes/2014-11-26-guarded-free.md b/cpp/ql/src/change-notes/2014-11-26-guarded-free.md
new file mode 100644
index 00000000000..4280025a04f
--- /dev/null
+++ b/cpp/ql/src/change-notes/2014-11-26-guarded-free.md
@@ -0,0 +1,4 @@
+---
+category: newQuery
+---
+* Added a new high-precision quality query, `cpp/guarded-free`, which detects useless NULL pointer checks before calls to `free`. A variation of this query was originally contributed as an [experimental query by @mario-campos](https://github.com/github/codeql/pull/16331).
diff --git a/cpp/ql/src/change-notes/2024-11-22-too-few-arguments.md b/cpp/ql/src/change-notes/2024-11-22-too-few-arguments.md
new file mode 100644
index 00000000000..116df08838a
--- /dev/null
+++ b/cpp/ql/src/change-notes/2024-11-22-too-few-arguments.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The "Call to function with fewer arguments than declared parameters" query (`cpp/too-few-arguments`) query no longer produces results if the function has been implicitly declared.
diff --git a/cpp/ql/src/experimental/Best Practices/GuardedFree.ql b/cpp/ql/src/experimental/Best Practices/GuardedFree.ql
deleted file mode 100644
index 2d504d9bc05..00000000000
--- a/cpp/ql/src/experimental/Best Practices/GuardedFree.ql	
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * @name Guarded Free
- * @description NULL-condition guards before function calls to the memory-deallocation
- *              function free(3) are unnecessary, because passing NULL to free(3) is a no-op.
- * @kind problem
- * @problem.severity recommendation
- * @precision very-high
- * @id cpp/guarded-free
- * @tags maintainability
- *       readability
- *       experimental
- */
-
-import cpp
-import semmle.code.cpp.controlflow.Guards
-
-class FreeCall extends FunctionCall {
-  FreeCall() { this.getTarget().hasGlobalName("free") }
-}
-
-from GuardCondition gc, FreeCall fc, Variable v, BasicBlock bb
-where
-  gc.ensuresEq(v.getAnAccess(), 0, bb, false) and
-  fc.getArgument(0) = v.getAnAccess() and
-  bb = fc.getEnclosingStmt()
-select gc, "unnecessary NULL check before call to $@", fc, "free"
diff --git a/cpp/ql/test/experimental/query-tests/Best Practices/GuardedFree/GuardedFree.expected b/cpp/ql/test/experimental/query-tests/Best Practices/GuardedFree/GuardedFree.expected
deleted file mode 100644
index 209bae407b8..00000000000
--- a/cpp/ql/test/experimental/query-tests/Best Practices/GuardedFree/GuardedFree.expected	
+++ /dev/null
@@ -1,10 +0,0 @@
-| test.cpp:5:7:5:7 | x | unnecessary NULL check before call to $@ | test.cpp:6:5:6:8 | call to free | free |
-| test.cpp:23:7:23:7 | x | unnecessary NULL check before call to $@ | test.cpp:26:5:26:8 | call to free | free |
-| test.cpp:31:7:31:8 | ! ... | unnecessary NULL check before call to $@ | test.cpp:35:3:35:6 | call to free | free |
-| test.cpp:31:7:31:24 | ... \|\| ... | unnecessary NULL check before call to $@ | test.cpp:35:3:35:6 | call to free | free |
-| test.cpp:31:8:31:8 | x | unnecessary NULL check before call to $@ | test.cpp:35:3:35:6 | call to free | free |
-| test.cpp:94:12:94:12 | x | unnecessary NULL check before call to $@ | test.cpp:94:3:94:13 | call to free | free |
-| test.cpp:98:7:98:8 | ! ... | unnecessary NULL check before call to $@ | test.cpp:101:3:101:6 | call to free | free |
-| test.cpp:98:8:98:8 | x | unnecessary NULL check before call to $@ | test.cpp:101:3:101:6 | call to free | free |
-| test.cpp:106:7:106:18 | ... != ... | unnecessary NULL check before call to $@ | test.cpp:107:5:107:8 | call to free | free |
-| test.cpp:113:7:113:18 | ... != ... | unnecessary NULL check before call to $@ | test.cpp:114:17:114:20 | call to free | free |
diff --git a/cpp/ql/test/experimental/query-tests/Best Practices/GuardedFree/GuardedFree.qlref b/cpp/ql/test/experimental/query-tests/Best Practices/GuardedFree/GuardedFree.qlref
deleted file mode 100644
index e28bdae3991..00000000000
--- a/cpp/ql/test/experimental/query-tests/Best Practices/GuardedFree/GuardedFree.qlref	
+++ /dev/null
@@ -1 +0,0 @@
-experimental/Best Practices/GuardedFree.ql
diff --git a/cpp/ql/test/library-tests/dataflow/asExpr/test-indirect.expected b/cpp/ql/test/library-tests/dataflow/asExpr/test-indirect.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/cpp/ql/test/library-tests/dataflow/asExpr/test-indirect.expected
+++ b/cpp/ql/test/library-tests/dataflow/asExpr/test-indirect.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/cpp/ql/test/library-tests/dataflow/asExpr/test.expected b/cpp/ql/test/library-tests/dataflow/asExpr/test.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/cpp/ql/test/library-tests/dataflow/asExpr/test.expected
+++ b/cpp/ql/test/library-tests/dataflow/asExpr/test.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/guard-condition-regression-test.expected b/cpp/ql/test/library-tests/dataflow/dataflow-tests/guard-condition-regression-test.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/guard-condition-regression-test.expected
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/guard-condition-regression-test.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/has-parameter-flow-out.expected b/cpp/ql/test/library-tests/dataflow/dataflow-tests/has-parameter-flow-out.expected
index 22f278d41ae..5711cec229d 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/has-parameter-flow-out.expected
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/has-parameter-flow-out.expected
@@ -1,3 +1 @@
 WARNING: module 'DataFlow' has been deprecated and may be removed in future (has-parameter-flow-out.ql:5,18-61)
-testFailures
-failures
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-number-of-outnodes.expected b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-number-of-outnodes.expected
index a32c8f7af91..316ac213731 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-number-of-outnodes.expected
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-number-of-outnodes.expected
@@ -1,3 +1 @@
 WARNING: module 'DataFlow' has been deprecated and may be removed in future (test-number-of-outnodes.ql:5,18-61)
-failures
-testFailures
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.expected b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.expected
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test_self_argument_flow.expected b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test_self_argument_flow.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test_self_argument_flow.expected
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test_self_argument_flow.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test_self_parameter_flow.expected b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test_self_parameter_flow.expected
index 48de9172b36..e69de29bb2d 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test_self_parameter_flow.expected
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test_self_parameter_flow.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/type-bugs.expected b/cpp/ql/test/library-tests/dataflow/dataflow-tests/type-bugs.expected
index 02f5544fe14..87ebdc9e83a 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/type-bugs.expected
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/type-bugs.expected
@@ -52,4 +52,3 @@ incorrectBaseType
 | test.cpp:854:10:854:36 | * ... | Expected 'Node.getType()' to be const int, but it was int |
 | test.cpp:867:10:867:30 | * ... | Expected 'Node.getType()' to be const int, but it was int |
 | test.cpp:1098:52:1098:53 | *& ... | Expected 'Node.getType()' to be char, but it was char * |
-failures
diff --git a/cpp/ql/test/library-tests/dataflow/external-models/flow.expected b/cpp/ql/test/library-tests/dataflow/external-models/flow.expected
index a3d09178f2c..8a954e9235a 100644
--- a/cpp/ql/test/library-tests/dataflow/external-models/flow.expected
+++ b/cpp/ql/test/library-tests/dataflow/external-models/flow.expected
@@ -1,5 +1,4 @@
 testFailures
-failures
 edges
 | asio_streams.cpp:56:18:56:23 | [summary param] *0 in buffer | asio_streams.cpp:56:18:56:23 | [summary] to write: ReturnValue in buffer | provenance | MaD:10 |
 | asio_streams.cpp:87:34:87:44 | read_until output argument | asio_streams.cpp:91:7:91:17 | recv_buffer | provenance | Src:MaD:2  |
diff --git a/cpp/ql/test/library-tests/dataflow/fields/flow.expected b/cpp/ql/test/library-tests/dataflow/fields/flow.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/cpp/ql/test/library-tests/dataflow/fields/flow.expected
+++ b/cpp/ql/test/library-tests/dataflow/fields/flow.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/cpp/ql/test/library-tests/dataflow/models-as-data/interpretElement.expected b/cpp/ql/test/library-tests/dataflow/models-as-data/interpretElement.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/cpp/ql/test/library-tests/dataflow/models-as-data/interpretElement.expected
+++ b/cpp/ql/test/library-tests/dataflow/models-as-data/interpretElement.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/cpp/ql/test/library-tests/dataflow/models-as-data/taint.expected b/cpp/ql/test/library-tests/dataflow/models-as-data/taint.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/cpp/ql/test/library-tests/dataflow/models-as-data/taint.expected
+++ b/cpp/ql/test/library-tests/dataflow/models-as-data/taint.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/cpp/ql/test/library-tests/dataflow/parameters-without-defs/test.expected b/cpp/ql/test/library-tests/dataflow/parameters-without-defs/test.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/cpp/ql/test/library-tests/dataflow/parameters-without-defs/test.expected
+++ b/cpp/ql/test/library-tests/dataflow/parameters-without-defs/test.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/cpp/ql/test/library-tests/dataflow/smart-pointers-taint/taint.expected b/cpp/ql/test/library-tests/dataflow/smart-pointers-taint/taint.expected
index dfa7c56f90b..a3e8b75f996 100644
--- a/cpp/ql/test/library-tests/dataflow/smart-pointers-taint/taint.expected
+++ b/cpp/ql/test/library-tests/dataflow/smart-pointers-taint/taint.expected
@@ -2,5 +2,3 @@ WARNING: module 'DataFlow' has been deprecated and may be removed in future (tai
 WARNING: module 'DataFlow' has been deprecated and may be removed in future (taint.ql:7,24-32)
 WARNING: module 'DataFlow' has been deprecated and may be removed in future (taint.ql:11,22-30)
 WARNING: module 'TaintTracking' has been deprecated and may be removed in future (taint.ql:19,20-33)
-failures
-testFailures
diff --git a/cpp/ql/test/library-tests/dataflow/source-sink-tests/local-flow.expected b/cpp/ql/test/library-tests/dataflow/source-sink-tests/local-flow.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/cpp/ql/test/library-tests/dataflow/source-sink-tests/local-flow.expected
+++ b/cpp/ql/test/library-tests/dataflow/source-sink-tests/local-flow.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/cpp/ql/test/library-tests/dataflow/source-sink-tests/remote-flow.expected b/cpp/ql/test/library-tests/dataflow/source-sink-tests/remote-flow.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/cpp/ql/test/library-tests/dataflow/source-sink-tests/remote-flow.expected
+++ b/cpp/ql/test/library-tests/dataflow/source-sink-tests/remote-flow.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/format.cpp b/cpp/ql/test/library-tests/dataflow/taint-tests/format.cpp
index d123ed5cc15..b69a0b3d58f 100644
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/format.cpp
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/format.cpp
@@ -164,4 +164,10 @@ void test_format() {
 
   auto s2 = std::format(string::source());
   sink(s2); // $ ir MISSING: ast
+}
+
+void test(std::format_string s) {
+  int x = source();
+  int y = std::same_signature_as_format_but_different_name(s, x);
+  sink(y); // clean
 }
\ No newline at end of file
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected b/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected
index 7de6914e8aa..b5ddf84747a 100644
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected
@@ -451,6 +451,9 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | format.cpp:162:24:162:27 | {} | format.cpp:162:24:162:27 | call to basic_format_string | TAINT |
 | format.cpp:165:13:165:23 | call to format | format.cpp:166:8:166:9 | s2 |  |
 | format.cpp:165:25:165:38 | call to source | format.cpp:165:25:165:40 | call to basic_format_string | TAINT |
+| format.cpp:169:30:169:30 | s | format.cpp:171:60:171:60 | s |  |
+| format.cpp:170:11:170:16 | call to source | format.cpp:171:63:171:63 | x |  |
+| format.cpp:171:11:171:58 | call to same_signature_as_format_but_different_name | format.cpp:172:8:172:8 | y |  |
 | map.cpp:21:28:21:28 | call to pair | map.cpp:23:2:23:2 | a |  |
 | map.cpp:21:28:21:28 | call to pair | map.cpp:24:7:24:7 | a |  |
 | map.cpp:21:28:21:28 | call to pair | map.cpp:25:7:25:7 | a |  |
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/stl.h b/cpp/ql/test/library-tests/dataflow/taint-tests/stl.h
index 9647f41cb7c..01e5f3b929b 100644
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/stl.h
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/stl.h
@@ -676,4 +676,9 @@ namespace std {
 	using format_string = basic_format_string<char>; // simplified from `char, std::type_identity_t<Args>...`
 
 	template<class... Args> string format( format_string fmt, Args&&... args );
+
+	// This function has the same signature as `format`, but a different name. It should NOT be able to use
+	// the model for `format`.
+	template <typename... Args>
+	int same_signature_as_format_but_different_name(format_string, Args &&...args);
 }
\ No newline at end of file
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/taint.expected b/cpp/ql/test/library-tests/dataflow/taint-tests/taint.expected
index 299f1413878..444be256516 100644
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/taint.expected
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/taint.expected
@@ -3,5 +3,3 @@ WARNING: module 'DataFlow' has been deprecated and may be removed in future (tai
 WARNING: module 'DataFlow' has been deprecated and may be removed in future (taint.ql:61,22-30)
 WARNING: module 'DataFlow' has been deprecated and may be removed in future (taint.ql:68,25-33)
 WARNING: module 'TaintTracking' has been deprecated and may be removed in future (taint.ql:73,20-33)
-testFailures
-failures
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/test_mad-signatures.expected b/cpp/ql/test/library-tests/dataflow/taint-tests/test_mad-signatures.expected
index 0d27fdaf0fd..26031f42c0a 100644
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/test_mad-signatures.expected
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/test_mad-signatures.expected
@@ -265,6 +265,8 @@ signatureMatches
 | stl.h:678:33:678:38 | format | (format_string,Args &&) |  | format<Args> | 0 |
 | stl.h:678:33:678:38 | format | (format_string,Args &&) |  | format<Args> | 1 |
 | stl.h:678:33:678:38 | format | (format_string,Args &&) |  | format<Args> | 1 |
+| stl.h:683:6:683:48 | same_signature_as_format_but_different_name | (format_string,Args &&) |  | format<Args> | 0 |
+| stl.h:683:6:683:48 | same_signature_as_format_but_different_name | (format_string,Args &&) |  | format<Args> | 1 |
 getSignatureParameterName
 | (InputIt,InputIt) | deque | assign<InputIt> | 0 | func:0 |
 | (InputIt,InputIt) | deque | assign<InputIt> | 1 | func:0 |
@@ -729,6 +731,8 @@ getParameterTypeName
 | stl.h:678:33:678:38 | format | 0 | format_string |
 | stl.h:678:33:678:38 | format | 1 | func:0 && |
 | stl.h:678:33:678:38 | format | 1 | func:0 && |
+| stl.h:683:6:683:48 | same_signature_as_format_but_different_name | 0 | format_string |
+| stl.h:683:6:683:48 | same_signature_as_format_but_different_name | 1 | func:0 && |
 | stringstream.cpp:18:6:18:9 | sink | 0 | const basic_ostream> & |
 | stringstream.cpp:21:6:21:9 | sink | 0 | const basic_istream> & |
 | stringstream.cpp:24:6:24:9 | sink | 0 | const basic_iostream> & |
diff --git a/cpp/ql/test/library-tests/ir/modulus-analysis/ModulusAnalysis.expected b/cpp/ql/test/library-tests/ir/modulus-analysis/ModulusAnalysis.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/cpp/ql/test/library-tests/ir/modulus-analysis/ModulusAnalysis.expected
+++ b/cpp/ql/test/library-tests/ir/modulus-analysis/ModulusAnalysis.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/cpp/ql/test/library-tests/ir/range-analysis/Overflow.expected b/cpp/ql/test/library-tests/ir/range-analysis/Overflow.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/cpp/ql/test/library-tests/ir/range-analysis/Overflow.expected
+++ b/cpp/ql/test/library-tests/ir/range-analysis/Overflow.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/cpp/ql/test/library-tests/ir/range-analysis/RangeAnalysis.expected b/cpp/ql/test/library-tests/ir/range-analysis/RangeAnalysis.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/cpp/ql/test/library-tests/ir/range-analysis/RangeAnalysis.expected
+++ b/cpp/ql/test/library-tests/ir/range-analysis/RangeAnalysis.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/cpp/ql/test/library-tests/ir/sign-analysis/SignAnalysis.expected b/cpp/ql/test/library-tests/ir/sign-analysis/SignAnalysis.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/cpp/ql/test/library-tests/ir/sign-analysis/SignAnalysis.expected
+++ b/cpp/ql/test/library-tests/ir/sign-analysis/SignAnalysis.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/cpp/ql/test/library-tests/ir/types/irtypes.expected b/cpp/ql/test/library-tests/ir/types/irtypes.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/cpp/ql/test/library-tests/ir/types/irtypes.expected
+++ b/cpp/ql/test/library-tests/ir/types/irtypes.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/cpp/ql/test/query-tests/Best Practices/GuardedFree/GuardedFree.expected b/cpp/ql/test/query-tests/Best Practices/GuardedFree/GuardedFree.expected
new file mode 100644
index 00000000000..a9a189218c6
--- /dev/null
+++ b/cpp/ql/test/query-tests/Best Practices/GuardedFree/GuardedFree.expected	
@@ -0,0 +1,5 @@
+| test.cpp:5:7:5:7 | x | unnecessary NULL check before call to $@ | test.cpp:6:5:6:8 | call to free | free |
+| test.cpp:10:7:10:7 | x | unnecessary NULL check before call to $@ | test.cpp:11:5:11:8 | call to free | free |
+| test.cpp:42:7:42:7 | x | unnecessary NULL check before call to $@ | test.cpp:43:5:43:8 | call to free | free |
+| test.cpp:49:7:49:7 | x | unnecessary NULL check before call to $@ | test.cpp:50:5:50:8 | call to free | free |
+| test.cpp:106:7:106:18 | ... != ... | unnecessary NULL check before call to $@ | test.cpp:107:5:107:8 | call to free | free |
diff --git a/cpp/ql/test/query-tests/Best Practices/GuardedFree/GuardedFree.qlref b/cpp/ql/test/query-tests/Best Practices/GuardedFree/GuardedFree.qlref
new file mode 100644
index 00000000000..d64671f08c3
--- /dev/null
+++ b/cpp/ql/test/query-tests/Best Practices/GuardedFree/GuardedFree.qlref	
@@ -0,0 +1 @@
+Best Practices/GuardedFree.ql
diff --git a/cpp/ql/test/experimental/query-tests/Best Practices/GuardedFree/test.cpp b/cpp/ql/test/query-tests/Best Practices/GuardedFree/test.cpp
similarity index 79%
rename from cpp/ql/test/experimental/query-tests/Best Practices/GuardedFree/test.cpp
rename to cpp/ql/test/query-tests/Best Practices/GuardedFree/test.cpp
index 12b1fb2364e..d52bcef72d1 100644
--- a/cpp/ql/test/experimental/query-tests/Best Practices/GuardedFree/test.cpp	
+++ b/cpp/ql/test/query-tests/Best Practices/GuardedFree/test.cpp	
@@ -20,7 +20,7 @@ void test2(int *x) {
 }
 
 void test3(int *x, bool b) {
-  if (x) { // GOOD [FALSE POSITIVE]: x is being accessed in the body of the if
+  if (x) { // GOOD: x is being accessed in the body of the if
     if (b)
       *x = 42;
     free(x);
@@ -28,7 +28,7 @@ void test3(int *x, bool b) {
 }
 
 bool test4(char *x, char *y) {
-  if (!x || strcmp(x, y)) { // GOOD [FALSE POSITIVE]: x is being accessed in the guard and return value depends on x
+  if (!x || strcmp(x, y)) { // GOOD: x is being accessed in the guard and return value depends on x
     free(x);
     return true;
   }
@@ -91,11 +91,11 @@ void test10(char *x) {
   if (x) free(x);
 
 void test11(char *x) {
-  TRY_FREE(x) // BAD
+  TRY_FREE(x) // BAD [NOT DETECTED]
 }
 
 bool test12(char *x) {
-  if (!x) // GOOD [FALSE POSITIVE]: return value depends on x
+  if (!x) // GOOD: return value depends on x
     return false;
 
   free(x);
@@ -110,6 +110,6 @@ void test13(char *x) {
 void inspect(char *x);
 
 void test14(char *x) {
-  if (x != nullptr) // GOOD [FALSE POSITIVE]: x might be accessed in the first operand of the comma operator
+  if (x != nullptr) // GOOD: x might be accessed in the first operand of the comma operator
     inspect(x), free(x);
 }
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Underspecified Functions/ImplicitFunctionDeclaration.expected b/cpp/ql/test/query-tests/Likely Bugs/Underspecified Functions/ImplicitFunctionDeclaration.expected
index 8547894e769..d3e0ecbd591 100644
--- a/cpp/ql/test/query-tests/Likely Bugs/Underspecified Functions/ImplicitFunctionDeclaration.expected	
+++ b/cpp/ql/test/query-tests/Likely Bugs/Underspecified Functions/ImplicitFunctionDeclaration.expected	
@@ -1,9 +1,9 @@
 | test.c:28:3:28:12 | call to undeclared | Function call implicitly declares 'undeclared'. |
 | test.c:31:3:31:19 | call to not_yet_declared1 | Function call implicitly declares 'not_yet_declared1'. |
 | test.c:32:3:32:19 | call to not_yet_declared2 | Function call implicitly declares 'not_yet_declared2'. |
-| test.c:43:3:43:27 | call to not_declared_defined_with | Function call implicitly declares 'not_declared_defined_with'. |
-| test.c:54:3:54:21 | call to defined_with_double | Function call implicitly declares 'defined_with_double'. |
-| test.c:66:3:66:22 | call to defined_with_ptr_ptr | Function call implicitly declares 'defined_with_ptr_ptr'. |
-| test.c:68:3:68:22 | call to defined_with_ptr_arr | Function call implicitly declares 'defined_with_ptr_arr'. |
-| test.c:132:3:132:22 | call to implicit_declaration | Function call implicitly declares 'implicit_declaration'. |
-| test.c:133:3:133:30 | call to implicit_declaration_k_and_r | Function call implicitly declares 'implicit_declaration_k_and_r'. |
+| test.c:44:3:44:27 | call to not_declared_defined_with | Function call implicitly declares 'not_declared_defined_with'. |
+| test.c:55:3:55:21 | call to defined_with_double | Function call implicitly declares 'defined_with_double'. |
+| test.c:67:3:67:22 | call to defined_with_ptr_ptr | Function call implicitly declares 'defined_with_ptr_ptr'. |
+| test.c:69:3:69:22 | call to defined_with_ptr_arr | Function call implicitly declares 'defined_with_ptr_arr'. |
+| test.c:133:3:133:22 | call to implicit_declaration | Function call implicitly declares 'implicit_declaration'. |
+| test.c:134:3:134:30 | call to implicit_declaration_k_and_r | Function call implicitly declares 'implicit_declaration_k_and_r'. |
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Underspecified Functions/MistypedFunctionArguments.expected b/cpp/ql/test/query-tests/Likely Bugs/Underspecified Functions/MistypedFunctionArguments.expected
index b6015dad456..d067430aba9 100644
--- a/cpp/ql/test/query-tests/Likely Bugs/Underspecified Functions/MistypedFunctionArguments.expected	
+++ b/cpp/ql/test/query-tests/Likely Bugs/Underspecified Functions/MistypedFunctionArguments.expected	
@@ -1,18 +1,18 @@
-| test.c:33:3:33:19 | call to not_yet_declared2 | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:32:3:32:3 | not_yet_declared2 | not_yet_declared2 | test.c:33:21:33:22 | ca | ca | file://:0:0:0:0 | int[4] | int[4] | test.c:76:24:76:26 | (unnamed parameter 0) | int (unnamed parameter 0) |
-| test.c:33:3:33:19 | call to not_yet_declared2 | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:76:6:76:22 | not_yet_declared2 | not_yet_declared2 | test.c:33:21:33:22 | ca | ca | file://:0:0:0:0 | int[4] | int[4] | test.c:76:24:76:26 | (unnamed parameter 0) | int (unnamed parameter 0) |
-| test.c:40:3:40:29 | call to declared_empty_defined_with | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:77:6:77:32 | declared_empty_defined_with | declared_empty_defined_with | test.c:40:31:40:32 | & ... | & ... | file://:0:0:0:0 | int * | int * | test.c:77:38:77:38 | x | int x |
-| test.c:44:3:44:27 | call to not_declared_defined_with | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:80:6:80:30 | not_declared_defined_with | not_declared_defined_with | test.c:44:29:44:31 | 4 | 4 | file://:0:0:0:0 | long long | long long | test.c:80:36:80:36 | x | int x |
-| test.c:44:3:44:27 | call to not_declared_defined_with | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:80:6:80:30 | not_declared_defined_with | not_declared_defined_with | test.c:44:37:44:42 | 2500000000.0 | 2500000000.0 | file://:0:0:0:0 | float | float | test.c:80:50:80:50 | z | int z |
-| test.c:47:3:47:24 | call to declared_with_pointers | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:5:6:5:27 | declared_with_pointers | declared_with_pointers | test.c:47:26:47:31 | 3500000000000000.0 | 3500000000000000.0 | file://:0:0:0:0 | double | double | test.c:92:34:92:34 | x | int * x |
-| test.c:47:3:47:24 | call to declared_with_pointers | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:5:6:5:27 | declared_with_pointers | declared_with_pointers | test.c:47:34:47:34 | 0 | 0 | file://:0:0:0:0 | int | int | test.c:92:43:92:43 | y | void * y |
-| test.c:47:3:47:24 | call to declared_with_pointers | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:92:6:92:27 | declared_with_pointers | declared_with_pointers | test.c:47:26:47:31 | 3500000000000000.0 | 3500000000000000.0 | file://:0:0:0:0 | double | double | test.c:92:34:92:34 | x | int * x |
-| test.c:47:3:47:24 | call to declared_with_pointers | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:92:6:92:27 | declared_with_pointers | declared_with_pointers | test.c:47:34:47:34 | 0 | 0 | file://:0:0:0:0 | int | int | test.c:92:43:92:43 | y | void * y |
-| test.c:49:3:49:21 | call to declared_with_array | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:6:6:6:24 | declared_with_array | declared_with_array | test.c:49:23:49:24 | & ... | & ... | file://:0:0:0:0 | int * | int * | test.c:93:31:93:31 | a | char[6] a |
-| test.c:49:3:49:21 | call to declared_with_array | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:93:6:93:24 | declared_with_array | declared_with_array | test.c:49:23:49:24 | & ... | & ... | file://:0:0:0:0 | int * | int * | test.c:93:31:93:31 | a | char[6] a |
-| test.c:51:3:51:20 | call to defined_with_float | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:95:7:95:24 | defined_with_float | defined_with_float | test.c:51:22:51:24 | 2.0 | 2.0 | file://:0:0:0:0 | float | float | test.c:95:32:95:32 | f | float f |
-| test.c:52:3:52:20 | call to defined_with_float | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:95:7:95:24 | defined_with_float | defined_with_float | test.c:52:22:52:24 | 2.0 | 2.0 | file://:0:0:0:0 | double | double | test.c:95:32:95:32 | f | float f |
-| test.c:55:3:55:21 | call to defined_with_double | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:99:8:99:26 | defined_with_double | defined_with_double | test.c:55:23:55:25 | 99 | 99 | file://:0:0:0:0 | int | int | test.c:99:35:99:35 | d | double d |
-| test.c:57:3:57:24 | call to defined_with_long_long | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:103:11:103:32 | defined_with_long_long | defined_with_long_long | test.c:57:26:57:28 | 99 | 99 | file://:0:0:0:0 | int | int | test.c:103:44:103:45 | ll | long long ll |
-| test.c:58:3:58:24 | call to defined_with_long_long | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:103:11:103:32 | defined_with_long_long | defined_with_long_long | test.c:58:26:58:26 | 3 | 3 | file://:0:0:0:0 | int | int | test.c:103:44:103:45 | ll | long long ll |
-| test.c:60:3:60:21 | call to defined_with_double | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:99:8:99:26 | defined_with_double | defined_with_double | test.c:60:23:60:25 | 2 | 2 | file://:0:0:0:0 | long long | long long | test.c:99:35:99:35 | d | double d |
-| test.c:61:3:61:24 | call to defined_with_long_long | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:103:11:103:32 | defined_with_long_long | defined_with_long_long | test.c:61:26:61:31 | 3500000000000000.0 | 3500000000000000.0 | file://:0:0:0:0 | double | double | test.c:103:44:103:45 | ll | long long ll |
+| test.c:33:3:33:19 | call to not_yet_declared2 | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:32:3:32:3 | not_yet_declared2 | not_yet_declared2 | test.c:33:21:33:22 | ca | ca | file://:0:0:0:0 | int[4] | int[4] | test.c:77:24:77:26 | (unnamed parameter 0) | int (unnamed parameter 0) |
+| test.c:33:3:33:19 | call to not_yet_declared2 | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:77:6:77:22 | not_yet_declared2 | not_yet_declared2 | test.c:33:21:33:22 | ca | ca | file://:0:0:0:0 | int[4] | int[4] | test.c:77:24:77:26 | (unnamed parameter 0) | int (unnamed parameter 0) |
+| test.c:41:3:41:29 | call to declared_empty_defined_with | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:78:6:78:32 | declared_empty_defined_with | declared_empty_defined_with | test.c:41:31:41:32 | & ... | & ... | file://:0:0:0:0 | int * | int * | test.c:78:38:78:38 | x | int x |
+| test.c:45:3:45:27 | call to not_declared_defined_with | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:81:6:81:30 | not_declared_defined_with | not_declared_defined_with | test.c:45:29:45:31 | 4 | 4 | file://:0:0:0:0 | long long | long long | test.c:81:36:81:36 | x | int x |
+| test.c:45:3:45:27 | call to not_declared_defined_with | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:81:6:81:30 | not_declared_defined_with | not_declared_defined_with | test.c:45:37:45:42 | 2500000000.0 | 2500000000.0 | file://:0:0:0:0 | float | float | test.c:81:50:81:50 | z | int z |
+| test.c:48:3:48:24 | call to declared_with_pointers | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:5:6:5:27 | declared_with_pointers | declared_with_pointers | test.c:48:26:48:31 | 3500000000000000.0 | 3500000000000000.0 | file://:0:0:0:0 | double | double | test.c:93:34:93:34 | x | int * x |
+| test.c:48:3:48:24 | call to declared_with_pointers | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:5:6:5:27 | declared_with_pointers | declared_with_pointers | test.c:48:34:48:34 | 0 | 0 | file://:0:0:0:0 | int | int | test.c:93:43:93:43 | y | void * y |
+| test.c:48:3:48:24 | call to declared_with_pointers | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:93:6:93:27 | declared_with_pointers | declared_with_pointers | test.c:48:26:48:31 | 3500000000000000.0 | 3500000000000000.0 | file://:0:0:0:0 | double | double | test.c:93:34:93:34 | x | int * x |
+| test.c:48:3:48:24 | call to declared_with_pointers | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:93:6:93:27 | declared_with_pointers | declared_with_pointers | test.c:48:34:48:34 | 0 | 0 | file://:0:0:0:0 | int | int | test.c:93:43:93:43 | y | void * y |
+| test.c:50:3:50:21 | call to declared_with_array | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:6:6:6:24 | declared_with_array | declared_with_array | test.c:50:23:50:24 | & ... | & ... | file://:0:0:0:0 | int * | int * | test.c:94:31:94:31 | a | char[6] a |
+| test.c:50:3:50:21 | call to declared_with_array | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:94:6:94:24 | declared_with_array | declared_with_array | test.c:50:23:50:24 | & ... | & ... | file://:0:0:0:0 | int * | int * | test.c:94:31:94:31 | a | char[6] a |
+| test.c:52:3:52:20 | call to defined_with_float | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:96:7:96:24 | defined_with_float | defined_with_float | test.c:52:22:52:24 | 2.0 | 2.0 | file://:0:0:0:0 | float | float | test.c:96:32:96:32 | f | float f |
+| test.c:53:3:53:20 | call to defined_with_float | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:96:7:96:24 | defined_with_float | defined_with_float | test.c:53:22:53:24 | 2.0 | 2.0 | file://:0:0:0:0 | double | double | test.c:96:32:96:32 | f | float f |
+| test.c:56:3:56:21 | call to defined_with_double | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:100:8:100:26 | defined_with_double | defined_with_double | test.c:56:23:56:25 | 99 | 99 | file://:0:0:0:0 | int | int | test.c:100:35:100:35 | d | double d |
+| test.c:58:3:58:24 | call to defined_with_long_long | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:104:11:104:32 | defined_with_long_long | defined_with_long_long | test.c:58:26:58:28 | 99 | 99 | file://:0:0:0:0 | int | int | test.c:104:44:104:45 | ll | long long ll |
+| test.c:59:3:59:24 | call to defined_with_long_long | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:104:11:104:32 | defined_with_long_long | defined_with_long_long | test.c:59:26:59:26 | 3 | 3 | file://:0:0:0:0 | int | int | test.c:104:44:104:45 | ll | long long ll |
+| test.c:61:3:61:21 | call to defined_with_double | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:100:8:100:26 | defined_with_double | defined_with_double | test.c:61:23:61:25 | 2 | 2 | file://:0:0:0:0 | long long | long long | test.c:100:35:100:35 | d | double d |
+| test.c:62:3:62:24 | call to defined_with_long_long | Calling $@: argument $@ of type $@ is incompatible with parameter $@. | test.c:104:11:104:32 | defined_with_long_long | defined_with_long_long | test.c:62:26:62:31 | 3500000000000000.0 | 3500000000000000.0 | file://:0:0:0:0 | double | double | test.c:104:44:104:45 | ll | long long ll |
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Underspecified Functions/TooFewArguments.expected b/cpp/ql/test/query-tests/Likely Bugs/Underspecified Functions/TooFewArguments.expected
index 42c4f7f9455..90468d3a9bf 100644
--- a/cpp/ql/test/query-tests/Likely Bugs/Underspecified Functions/TooFewArguments.expected	
+++ b/cpp/ql/test/query-tests/Likely Bugs/Underspecified Functions/TooFewArguments.expected	
@@ -1,4 +1,2 @@
-| test.c:34:3:34:19 | call to not_yet_declared2 | This call has fewer arguments than required by $@. | test.c:32:3:32:3 | not_yet_declared2 | not_yet_declared2 |
-| test.c:34:3:34:19 | call to not_yet_declared2 | This call has fewer arguments than required by $@. | test.c:76:6:76:22 | not_yet_declared2 | not_yet_declared2 |
-| test.c:36:3:36:29 | call to declared_empty_defined_with | This call has fewer arguments than required by $@. | test.c:77:6:77:32 | declared_empty_defined_with | declared_empty_defined_with |
-| test.c:87:10:87:20 | call to dereference | This call has fewer arguments than required by $@. | test.c:90:5:90:15 | dereference | dereference |
+| test.c:37:3:37:29 | call to declared_empty_defined_with | This call has fewer arguments than required by $@. | test.c:78:6:78:32 | declared_empty_defined_with | declared_empty_defined_with |
+| test.c:88:10:88:20 | call to dereference | This call has fewer arguments than required by $@. | test.c:91:5:91:15 | dereference | dereference |
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Underspecified Functions/TooManyArguments.expected b/cpp/ql/test/query-tests/Likely Bugs/Underspecified Functions/TooManyArguments.expected
index bc64434578b..6eff27c3adb 100644
--- a/cpp/ql/test/query-tests/Likely Bugs/Underspecified Functions/TooManyArguments.expected	
+++ b/cpp/ql/test/query-tests/Likely Bugs/Underspecified Functions/TooManyArguments.expected	
@@ -1,2 +1,2 @@
-| test.c:41:3:41:29 | call to declared_empty_defined_with | This call has more arguments than required by $@. | test.c:77:6:77:32 | declared_empty_defined_with | declared_empty_defined_with |
-| test.c:72:3:72:28 | call to declared_and_defined_empty | This call has more arguments than required by $@. | test.c:114:6:114:31 | declared_and_defined_empty | declared_and_defined_empty |
+| test.c:42:3:42:29 | call to declared_empty_defined_with | This call has more arguments than required by $@. | test.c:78:6:78:32 | declared_empty_defined_with | declared_empty_defined_with |
+| test.c:73:3:73:28 | call to declared_and_defined_empty | This call has more arguments than required by $@. | test.c:115:6:115:31 | declared_and_defined_empty | declared_and_defined_empty |
diff --git a/cpp/ql/test/query-tests/Likely Bugs/Underspecified Functions/test.c b/cpp/ql/test/query-tests/Likely Bugs/Underspecified Functions/test.c
index 86e940a8e28..d77c16683ed 100644
--- a/cpp/ql/test/query-tests/Likely Bugs/Underspecified Functions/test.c	
+++ b/cpp/ql/test/query-tests/Likely Bugs/Underspecified Functions/test.c	
@@ -30,8 +30,9 @@ void test(int *argv[]) {
   
   not_yet_declared1(1); // BAD (GOOD for everything except for cpp/implicit-function-declaration)
   not_yet_declared2(1); // BAD (GOOD for everything except for cpp/implicit-function-declaration)
-  not_yet_declared2(ca); // BAD
-  not_yet_declared2(); // BAD
+  not_yet_declared2(ca); // BAD (GOOD for everything except for cpp/mistyped-function-arguments
+                         //      and cpp/too-few-arguments. Not detected in the case of cpp/too-few-arguments.)
+  not_yet_declared2(); // BAD [NOT DETECTED] (GOOD for everything except for cpp/too-few-arguments)
 
   declared_empty_defined_with(); // BAD
   declared_empty_defined_with(1); // GOOD
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-193/AllocationToInvalidPointer.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-193/AllocationToInvalidPointer.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-193/AllocationToInvalidPointer.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-193/AllocationToInvalidPointer.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-193/InvalidPointerToDereference.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-193/InvalidPointerToDereference.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/cpp/ql/test/query-tests/Security/CWE/CWE-193/InvalidPointerToDereference.expected
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-193/InvalidPointerToDereference.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/csharp/.vscode/launch.json b/csharp/.vscode/launch.json
index 46858861047..f5b4aa79cc1 100644
--- a/csharp/.vscode/launch.json
+++ b/csharp/.vscode/launch.json
@@ -6,7 +6,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "dotnet: build",
-            "program": "${workspaceFolder}/extractor/Semmle.Extraction.CSharp.Standalone/bin/Debug/net8.0/Semmle.Extraction.CSharp.Standalone.dll",
+            "program": "${workspaceFolder}/extractor/Semmle.Extraction.CSharp.Standalone/bin/Debug/net9.0/Semmle.Extraction.CSharp.Standalone.dll",
             "args": [],
             // Set the path to the folder that should be extracted:
             "cwd": "${workspaceFolder}/ql/test/library-tests/standalone/standalonemode",
@@ -35,7 +35,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "dotnet: build",
-            "program": "${workspaceFolder}/autobuilder/Semmle.Autobuild.CSharp/bin/Debug/net8.0/Semmle.Autobuild.CSharp.dll",
+            "program": "${workspaceFolder}/autobuilder/Semmle.Autobuild.CSharp/bin/Debug/net9.0/Semmle.Autobuild.CSharp.dll",
             // Set the path to the folder that should be extracted:
             "cwd": "${workspaceFolder}/ql/integration-tests/all-platforms/autobuild",
             "stopAtEntry": true,
@@ -53,7 +53,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "dotnet: build",
-            "program": "${workspaceFolder}/extractor/Semmle.Extraction.CSharp.Driver/bin/Debug/net8.0/Semmle.Extraction.CSharp.Driver.dll",
+            "program": "${workspaceFolder}/extractor/Semmle.Extraction.CSharp.Driver/bin/Debug/net9.0/Semmle.Extraction.CSharp.Driver.dll",
             "stopAtEntry": true,
             "args": [
                 "--binlog",
@@ -61,5 +61,21 @@
             ],
             "env": {}
         },
+        {
+            "name": "C#: Tracing Debug",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "dotnet: build",
+            "program": "${workspaceFolder}/extractor/Semmle.Extraction.CSharp.Driver/bin/Debug/net9.0/Semmle.Extraction.CSharp.Driver.dll",
+            // Set the path to the folder that should be extracted:
+            "cwd": "${workspaceFolder}/ql/test/library-tests/dataflow/local",
+            "args": [
+                "LocalDataFlow.cs"
+            ],
+            "env": {},
+            "stopAtEntry": true,
+            "justMyCode": false,
+            "suppressJITOptimizations": true
+        },
     ]
 }
diff --git a/csharp/autobuilder/Semmle.Autobuild.CSharp/AutoBuildRule.cs b/csharp/autobuilder/Semmle.Autobuild.CSharp/AutoBuildRule.cs
index e58c8ddccd9..b3efe64b7e9 100644
--- a/csharp/autobuilder/Semmle.Autobuild.CSharp/AutoBuildRule.cs
+++ b/csharp/autobuilder/Semmle.Autobuild.CSharp/AutoBuildRule.cs
@@ -49,11 +49,9 @@ namespace Semmle.Autobuild.CSharp
                 tryCleanExtractorArgsLogs &
                 BuildScript.DeleteFile(Extractor.GetCSharpLogPath());
 
-            /// <summary>
-            /// Execute script `s` and check that the C# extractor has been executed.
-            /// If either fails, attempt to cleanup any artifacts produced by the extractor,
-            /// and exit with code 1, in order to proceed to the next attempt.
-            /// </summary>
+            // Execute script `s` and check that the C# extractor has been executed.
+            // If either fails, attempt to cleanup any artifacts produced by the extractor,
+            // and exit with code 1, in order to proceed to the next attempt.
             BuildScript IntermediateAttempt(BuildScript s) =>
                 (s & this.autobuilder.CheckExtractorRun(false)) |
                 (attemptExtractorCleanup & BuildScript.Failure);
diff --git a/csharp/autobuilder/Semmle.Autobuild.Shared/Autobuilder.cs b/csharp/autobuilder/Semmle.Autobuild.Shared/Autobuilder.cs
index 371352cf5e2..919e3821750 100644
--- a/csharp/autobuilder/Semmle.Autobuild.Shared/Autobuilder.cs
+++ b/csharp/autobuilder/Semmle.Autobuild.Shared/Autobuilder.cs
@@ -195,7 +195,7 @@ namespace Semmle.Autobuild.Shared
         }
 
         /// <summary>
-        /// Retrieves the value of an environment variable named <paramref name="name"> or throws
+        /// Retrieves the value of an environment variable named <paramref name="name"/> or throws
         /// an exception if no such environment variable has been set.
         /// </summary>
         /// <param name="name">The name of the environment variable.</param>
@@ -228,7 +228,7 @@ namespace Semmle.Autobuild.Shared
         private readonly IDiagnosticsWriter diagnostics;
 
         /// <summary>
-        /// Makes <see cref="path" /> relative to the root source directory.
+        /// Makes <paramref name="path"/> relative to the root source directory.
         /// </summary>
         /// <param name="path">The path which to make relative.</param>
         /// <returns>The relative path.</returns>
diff --git a/csharp/autobuilder/Semmle.Autobuild.Shared/MarkdownUtil.cs b/csharp/autobuilder/Semmle.Autobuild.Shared/MarkdownUtil.cs
index 13a3533eb31..f5721910a96 100644
--- a/csharp/autobuilder/Semmle.Autobuild.Shared/MarkdownUtil.cs
+++ b/csharp/autobuilder/Semmle.Autobuild.Shared/MarkdownUtil.cs
@@ -22,7 +22,7 @@ namespace Semmle.Autobuild.Shared
         public static string ToMarkdownLink(this string link, string title) => $"[{title}]({link})";
 
         /// <summary>
-        /// Renders <see cref="projects" /> as a markdown list of the project paths.
+        /// Renders <paramref name="projects"/> as a markdown list of the project paths.
         /// </summary>
         /// <param name="projects">
         /// The list of projects whose paths should be rendered as a markdown list.
@@ -35,7 +35,7 @@ namespace Semmle.Autobuild.Shared
         }
 
         /// <summary>
-        /// Renders <see cref="items" /> as a markdown list.
+        /// Renders <paramref name="items" /> as a markdown list.
         /// </summary>
         /// <typeparam name="T">The item type.</typeparam>
         /// <param name="items">The list that should be formatted as a markdown list.</param>
diff --git a/csharp/documentation/library-coverage/coverage.csv b/csharp/documentation/library-coverage/coverage.csv
index 10b1c58ef31..39646702a8c 100644
--- a/csharp/documentation/library-coverage/coverage.csv
+++ b/csharp/documentation/library-coverage/coverage.csv
@@ -8,39 +8,43 @@ ILLink.Shared,,,31,,,,,,,,,,,,,,,,,,,11,20
 ILLink.Tasks,,,5,,,,,,,,,,,,,,,,,,,4,1
 Internal.IL,,,54,,,,,,,,,,,,,,,,,,,28,26
 Internal.Pgo,,,9,,,,,,,,,,,,,,,,,,,2,7
-Internal.TypeSystem,,,328,,,,,,,,,,,,,,,,,,,201,127
+Internal.TypeSystem,,,329,,,,,,,,,,,,,,,,,,,201,128
 JsonToItemsTaskFactory,,,11,,,,,,,,,,,,,,,,,,,1,10
 Microsoft.Android.Build,,1,14,,,,,,,,,,,,,1,,,,,,12,2
 Microsoft.Apple.Build,,,7,,,,,,,,,,,,,,,,,,,7,
 Microsoft.ApplicationBlocks.Data,28,,,,,,,,,,,,28,,,,,,,,,,
+Microsoft.AspNetCore.Components,,2,1,,,,,,,,,,,,,,,,2,,,1,
+Microsoft.AspNetCore.WebUtilities,,,2,,,,,,,,,,,,,,,,,,,2,
 Microsoft.CSharp,,,2,,,,,,,,,,,,,,,,,,,2,
-Microsoft.Diagnostics.Tools.Pgo,,,23,,,,,,,,,,,,,,,,,,,2,21
+Microsoft.Diagnostics.Tools.Pgo,,,25,,,,,,,,,,,,,,,,,,,2,23
 Microsoft.DotNet.Build.Tasks,,,10,,,,,,,,,,,,,,,,,,,8,2
+Microsoft.DotNet.PlatformAbstractions,,,1,,,,,,,,,,,,,,,,,,,1,
 Microsoft.EntityFrameworkCore,6,,12,,,,,,,,,,6,,,,,,,,,,12
 Microsoft.Extensions.Caching.Distributed,,,3,,,,,,,,,,,,,,,,,,,,3
-Microsoft.Extensions.Caching.Memory,,,31,,,,,,,,,,,,,,,,,,,5,26
-Microsoft.Extensions.Configuration,,3,91,,,,,,,,,,,,,3,,,,,,25,66
-Microsoft.Extensions.DependencyInjection,,,130,,,,,,,,,,,,,,,,,,,17,113
+Microsoft.Extensions.Caching.Memory,,,37,,,,,,,,,,,,,,,,,,,5,32
+Microsoft.Extensions.Configuration,,3,101,,,,,,,,,,,,,3,,,,,,29,72
+Microsoft.Extensions.DependencyInjection,,,202,,,,,,,,,,,,,,,,,,,15,187
 Microsoft.Extensions.DependencyModel,,1,16,,,,,,,,,,,,,1,,,,,,14,2
 Microsoft.Extensions.Diagnostics.Metrics,,,14,,,,,,,,,,,,,,,,,,,1,13
 Microsoft.Extensions.FileProviders,,,17,,,,,,,,,,,,,,,,,,,7,10
-Microsoft.Extensions.FileSystemGlobbing,,,22,,,,,,,,,,,,,,,,,,,11,11
-Microsoft.Extensions.Hosting,,,39,,,,,,,,,,,,,,,,,,,29,10
+Microsoft.Extensions.FileSystemGlobbing,,,21,,,,,,,,,,,,,,,,,,,10,11
+Microsoft.Extensions.Hosting,,,58,,,,,,,,,,,,,,,,,,,29,29
 Microsoft.Extensions.Http,,,9,,,,,,,,,,,,,,,,,,,7,2
-Microsoft.Extensions.Logging,,,64,,,,,,,,,,,,,,,,,,,25,39
-Microsoft.Extensions.Options,,,14,,,,,,,,,,,,,,,,,,,14,
-Microsoft.Extensions.Primitives,,,72,,,,,,,,,,,,,,,,,,,67,5
-Microsoft.Interop,,,137,,,,,,,,,,,,,,,,,,,70,67
+Microsoft.Extensions.Logging,,,91,,,,,,,,,,,,,,,,,,,25,66
+Microsoft.Extensions.Options,,,68,,,,,,,,,,,,,,,,,,,44,24
+Microsoft.Extensions.Primitives,,,73,,,,,,,,,,,,,,,,,,,67,6
+Microsoft.Interop,,,159,,,,,,,,,,,,,,,,,,,75,84
+Microsoft.JSInterop,2,,,,,,,,,,2,,,,,,,,,,,,
 Microsoft.NET.Build.Tasks,,,5,,,,,,,,,,,,,,,,,,,3,2
 Microsoft.NET.Sdk.WebAssembly,,,2,,,,,,,,,,,,,,,,,,,1,1
 Microsoft.NET.WebAssembly.Webcil,,,6,,,,,,,,,,,,,,,,,,,6,
 Microsoft.VisualBasic,,,13,,,,,,,,,,,,,,,,,,,1,12
 Microsoft.WebAssembly.Build.Tasks,,,9,,,,,,,,,,,,,,,,,,,8,1
 Microsoft.Win32,,4,2,,,,,,,,,,,,,,,,,,4,,2
-Mono.Linker,,,287,,,,,,,,,,,,,,,,,,,145,142
+Mono.Linker,,,293,,,,,,,,,,,,,,,,,,,145,148
 MySql.Data.MySqlClient,48,,,,,,,,,,,,48,,,,,,,,,,
 Newtonsoft.Json,,,91,,,,,,,,,,,,,,,,,,,73,18
 ServiceStack,194,,7,27,,,,,75,,,,92,,,,,,,,,7,
 SourceGenerators,,,5,,,,,,,,,,,,,,,,,,,,5
-System,54,47,10313,,6,5,5,,,4,1,,33,2,,6,15,17,4,3,,5351,4962
+System,54,47,10819,,6,5,5,,,4,1,,33,2,,6,15,17,4,3,,5512,5307
 Windows.Security.Cryptography.Core,1,,,,,,,1,,,,,,,,,,,,,,,
diff --git a/csharp/documentation/library-coverage/coverage.rst b/csharp/documentation/library-coverage/coverage.rst
index 5eaaad17457..7023de4a356 100644
--- a/csharp/documentation/library-coverage/coverage.rst
+++ b/csharp/documentation/library-coverage/coverage.rst
@@ -8,7 +8,7 @@ C# framework & library support
 
    Framework / library,Package,Flow sources,Taint & value steps,Sinks (total),`CWE-079` :sub:`Cross-site scripting`
    `ServiceStack <https://servicestack.net/>`_,"``ServiceStack.*``, ``ServiceStack``",,7,194,
-   System,"``System.*``, ``System``",47,10313,54,5
-   Others,"``Amazon.Lambda.APIGatewayEvents``, ``Amazon.Lambda.Core``, ``Dapper``, ``ILCompiler``, ``ILLink.RoslynAnalyzer``, ``ILLink.Shared``, ``ILLink.Tasks``, ``Internal.IL``, ``Internal.Pgo``, ``Internal.TypeSystem``, ``JsonToItemsTaskFactory``, ``Microsoft.Android.Build``, ``Microsoft.Apple.Build``, ``Microsoft.ApplicationBlocks.Data``, ``Microsoft.CSharp``, ``Microsoft.Diagnostics.Tools.Pgo``, ``Microsoft.DotNet.Build.Tasks``, ``Microsoft.EntityFrameworkCore``, ``Microsoft.Extensions.Caching.Distributed``, ``Microsoft.Extensions.Caching.Memory``, ``Microsoft.Extensions.Configuration``, ``Microsoft.Extensions.DependencyInjection``, ``Microsoft.Extensions.DependencyModel``, ``Microsoft.Extensions.Diagnostics.Metrics``, ``Microsoft.Extensions.FileProviders``, ``Microsoft.Extensions.FileSystemGlobbing``, ``Microsoft.Extensions.Hosting``, ``Microsoft.Extensions.Http``, ``Microsoft.Extensions.Logging``, ``Microsoft.Extensions.Options``, ``Microsoft.Extensions.Primitives``, ``Microsoft.Interop``, ``Microsoft.NET.Build.Tasks``, ``Microsoft.NET.Sdk.WebAssembly``, ``Microsoft.NET.WebAssembly.Webcil``, ``Microsoft.VisualBasic``, ``Microsoft.WebAssembly.Build.Tasks``, ``Microsoft.Win32``, ``Mono.Linker``, ``MySql.Data.MySqlClient``, ``Newtonsoft.Json``, ``SourceGenerators``, ``Windows.Security.Cryptography.Core``",57,1848,148,
-   Totals,,104,12168,396,5
+   System,"``System.*``, ``System``",47,10819,54,5
+   Others,"``Amazon.Lambda.APIGatewayEvents``, ``Amazon.Lambda.Core``, ``Dapper``, ``ILCompiler``, ``ILLink.RoslynAnalyzer``, ``ILLink.Shared``, ``ILLink.Tasks``, ``Internal.IL``, ``Internal.Pgo``, ``Internal.TypeSystem``, ``JsonToItemsTaskFactory``, ``Microsoft.Android.Build``, ``Microsoft.Apple.Build``, ``Microsoft.ApplicationBlocks.Data``, ``Microsoft.AspNetCore.Components``, ``Microsoft.AspNetCore.WebUtilities``, ``Microsoft.CSharp``, ``Microsoft.Diagnostics.Tools.Pgo``, ``Microsoft.DotNet.Build.Tasks``, ``Microsoft.DotNet.PlatformAbstractions``, ``Microsoft.EntityFrameworkCore``, ``Microsoft.Extensions.Caching.Distributed``, ``Microsoft.Extensions.Caching.Memory``, ``Microsoft.Extensions.Configuration``, ``Microsoft.Extensions.DependencyInjection``, ``Microsoft.Extensions.DependencyModel``, ``Microsoft.Extensions.Diagnostics.Metrics``, ``Microsoft.Extensions.FileProviders``, ``Microsoft.Extensions.FileSystemGlobbing``, ``Microsoft.Extensions.Hosting``, ``Microsoft.Extensions.Http``, ``Microsoft.Extensions.Logging``, ``Microsoft.Extensions.Options``, ``Microsoft.Extensions.Primitives``, ``Microsoft.Interop``, ``Microsoft.JSInterop``, ``Microsoft.NET.Build.Tasks``, ``Microsoft.NET.Sdk.WebAssembly``, ``Microsoft.NET.WebAssembly.Webcil``, ``Microsoft.VisualBasic``, ``Microsoft.WebAssembly.Build.Tasks``, ``Microsoft.Win32``, ``Mono.Linker``, ``MySql.Data.MySqlClient``, ``Newtonsoft.Json``, ``SourceGenerators``, ``Windows.Security.Cryptography.Core``",59,2071,150,2
+   Totals,,106,12897,398,7
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/Assets.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/Assets.cs
index 4a6b401038e..13235ba1988 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/Assets.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/Assets.cs
@@ -127,21 +127,21 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
         ///
         /// Example:
         /// "project": {
-        //     "version": "1.0.0",
-        //     "frameworks": {
-        //         "net7.0": {
-        //             "frameworkReferences": {
-        //                 "Microsoft.AspNetCore.App": {
-        //                     "privateAssets": "none"
-        //                 },
-        //                 "Microsoft.NETCore.App": {
-        //                     "privateAssets": "all"
-        //                 }
-        //             }
-        //         }
-        //     }
-        // }
-        //
+        ///    "version": "1.0.0",
+        ///    "frameworks": {
+        ///        "net7.0": {
+        ///            "frameworkReferences": {
+        ///                "Microsoft.AspNetCore.App": {
+        ///                    "privateAssets": "none"
+        ///                },
+        ///                "Microsoft.NETCore.App": {
+        ///                    "privateAssets": "all"
+        ///                }
+        ///            }
+        ///        }
+        ///    }
+        /// }
+        ///
         /// Adds the following dependencies
         ///   Paths: {
         ///     "microsoft.aspnetcore.app.ref",
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNetVersion.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNetVersion.cs
index f62c279d240..b4273d02b77 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNetVersion.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNetVersion.cs
@@ -27,7 +27,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
          * This is the same as FullPath, except that we assume that the
          * reference assemblies are in a directory called "packs" and
          * the reference assemblies themselves are in a directory called
-         * "<Framework>.Ref/ref".
+         * "[Framework].Ref/ref".
          * Example:
          *  FullPath: /usr/share/dotnet/shared/Microsoft.NETCore.App/7.0.2
          *  FullPathReferenceAssemblies: /usr/share/dotnet/packs/Microsoft.NETCore.App.Ref/7.0.2/ref
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FileContent.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FileContent.cs
index f33329046cf..f5199de1c13 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FileContent.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FileContent.cs
@@ -38,8 +38,8 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
         /// True if any file in the source directory indicates that ASP.NET Core is used.
         /// The following heuristic is used to decide, if ASP.NET Core is used:
         /// If any file in the source directory contains something like (this will most like be a .csproj file)
-        ///     <Project Sdk="Microsoft.NET.Sdk.Web">
-        ///     <FrameworkReference Include="Microsoft.AspNetCore.App"/>
+        ///     &lt;Project Sdk="Microsoft.NET.Sdk.Web"&gt;
+        ///     &lt;FrameworkReference Include="Microsoft.AspNetCore.App"/&gt;
         /// </summary>
         public bool UseAspNetCoreDlls
         {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNetCliInvoker.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNetCliInvoker.cs
index bfc8b44ee56..89631ffa861 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNetCliInvoker.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNetCliInvoker.cs
@@ -10,20 +10,20 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
         string Exec { get; }
 
         /// <summary>
-        /// Execute `dotnet <args>` and return true if the command succeeded, otherwise false.
+        /// Execute `dotnet <paramref name="args"/>` and return true if the command succeeded, otherwise false.
         /// If `silent` is true the output of the command is logged as `debug` otherwise as `info`.
         /// </summary>
         bool RunCommand(string args, bool silent = true);
 
         /// <summary>
-        /// Execute `dotnet <args>` and return true if the command succeeded, otherwise false.
+        /// Execute `dotnet <paramref name="args"/>` and return true if the command succeeded, otherwise false.
         /// The output of the command is returned in `output`.
         /// If `silent` is true the output of the command is logged as `debug` otherwise as `info`.
         /// </summary>
         bool RunCommand(string args, out IList<string> output, bool silent = true);
 
         /// <summary>
-        /// Execute `dotnet <args>` in `<workingDirectory>` and return true if the command succeeded, otherwise false.
+        /// Execute `dotnet <paramref name="args"/>` in `<paramref name="workingDirectory"/>` and return true if the command succeeded, otherwise false.
         /// The output of the command is returned in `output`.
         /// If `silent` is true the output of the command is logged as `debug` otherwise as `info`.
         /// </summary>
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/CodeAnalysisExtensions/SymbolExtensions.cs b/csharp/extractor/Semmle.Extraction.CSharp/CodeAnalysisExtensions/SymbolExtensions.cs
index 2ffdd9dbcd6..bb61efe332c 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/CodeAnalysisExtensions/SymbolExtensions.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/CodeAnalysisExtensions/SymbolExtensions.cs
@@ -133,9 +133,6 @@ namespace Semmle.Extraction.CSharp
 
         /// <summary>
         /// Constructs a unique string for this type symbol.
-        ///
-        /// The supplied action <paramref name="subTermAction"/> is applied to the
-        /// syntactic sub terms of this type (if any).
         /// </summary>
         /// <param name="cx">The extraction context.</param>
         /// <param name="trapFile">The trap builder used to store the result.</param>
@@ -495,31 +492,31 @@ namespace Semmle.Extraction.CSharp
 
         /// <summary>
         /// Holds if this type is of the form <code>int?</code> or
-        /// <code>System.Nullable<int></code>.
+        /// <code>System.Nullable&lt;int&gt;</code>.
         /// </summary>
         public static bool IsBoundNullable(this ITypeSymbol type) =>
             type.SpecialType == SpecialType.None && type.OriginalDefinition.IsUnboundNullable();
 
         /// <summary>
-        /// Holds if this type is <code>System.Nullable<T></code>.
+        /// Holds if this type is <code>System.Nullable&lt;T&gt;</code>.
         /// </summary>
         public static bool IsUnboundNullable(this ITypeSymbol type) =>
             type.SpecialType == SpecialType.System_Nullable_T;
 
         /// <summary>
-        /// Holds if this type is <code>System.Span<T></code>.
+        /// Holds if this type is <code>System.Span&lt;T&gt;</code>.
         /// </summary>
         public static bool IsUnboundSpan(this ITypeSymbol type) =>
             type.ToString() == "System.Span<T>";
 
         /// <summary>
-        /// Holds if this type is of the form <code>System.Span<byte></code>.
+        /// Holds if this type is of the form <code>System.Span&lt;byte&gt;</code>.
         /// </summary>
         public static bool IsBoundSpan(this ITypeSymbol type) =>
             type.SpecialType == SpecialType.None && type.OriginalDefinition.IsUnboundSpan();
 
         /// <summary>
-        /// Holds if this type is <code>System.ReadOnlySpan<T></code>.
+        /// Holds if this type is <code>System.ReadOnlySpan&lt;T&gt;</code>.
         /// </summary>
         public static bool IsUnboundReadOnlySpan(this ITypeSymbol type) =>
             type.ToString() == "System.ReadOnlySpan<T>";
@@ -536,7 +533,7 @@ namespace Semmle.Extraction.CSharp
         }
 
         /// <summary>
-        /// Holds if this type is of the form <code>System.ReadOnlySpan<byte></code>.
+        /// Holds if this type is of the form <code>System.ReadOnlySpan&lt;byte&gt;</code>.
         /// </summary>
         public static bool IsBoundReadOnlySpan(this ITypeSymbol type) =>
             type.SpecialType == SpecialType.None && type.OriginalDefinition.IsUnboundReadOnlySpan();
@@ -645,5 +642,40 @@ namespace Semmle.Extraction.CSharp
         /// </summary>
         public static IEnumerable<AnnotatedTypeSymbol> GetAnnotatedTypeArguments(this INamedTypeSymbol symbol) =>
             symbol.TypeArguments.Zip(symbol.TypeArgumentNullableAnnotations, (t, a) => new AnnotatedTypeSymbol(t, a));
+
+        /// <summary>
+        /// Returns true if the symbol is public, protected or protected internal.
+        /// </summary>
+        public static bool IsPublicOrProtected(this ISymbol symbol) =>
+            symbol.DeclaredAccessibility == Accessibility.Public
+            || symbol.DeclaredAccessibility == Accessibility.Protected
+            || symbol.DeclaredAccessibility == Accessibility.ProtectedOrInternal;
+
+        /// <summary>
+        /// Returns true if the given symbol should be extracted.
+        /// </summary>
+        public static bool ShouldExtractSymbol(this ISymbol symbol)
+        {
+            // Extract all source symbols and public/protected metadata symbols.
+            if (symbol.Locations.Any(x => !x.IsInMetadata) || symbol.IsPublicOrProtected())
+            {
+                return true;
+            }
+            if (symbol is IMethodSymbol method)
+            {
+                return method.ExplicitInterfaceImplementations.Any(m => m.ContainingType.ShouldExtractSymbol());
+            }
+            if (symbol is IPropertySymbol property)
+            {
+                return property.ExplicitInterfaceImplementations.Any(m => m.ContainingType.ShouldExtractSymbol());
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Returns the symbols that should be extracted.
+        /// </summary>
+        public static IEnumerable<T> ExtractionCandidates<T>(this IEnumerable<T> symbols) where T : ISymbol =>
+            symbols.Where(symbol => symbol.ShouldExtractSymbol());
     }
 }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/CachedEntity.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/CachedEntity.cs
index ed0a21bc083..96bef973211 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/CachedEntity.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/CachedEntity.cs
@@ -7,7 +7,7 @@ namespace Semmle.Extraction.CSharp.Entities
     /// <summary>
     /// A cached entity.
     ///
-    /// The <see cref="Entity.Id"/> property is used as label in caching.
+    /// The <see cref="Entity.Label"/> property is used as label in caching.
     /// </summary>
     public abstract class CachedEntity : LabelledEntity
     {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/IEntity.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/IEntity.cs
index d8d3c538e42..f6f60ff9146 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/IEntity.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/IEntity.cs
@@ -9,12 +9,12 @@ namespace Semmle.Extraction.CSharp
     /// Entities are divided into two types: normal entities and cached
     /// entities.
     ///
-    /// Normal entities implement <see cref="FreshEntity"/> directly, and they
+    /// Normal entities implement <see cref="Entities.FreshEntity"/> directly, and they
     /// (may) emit contents to the trap file during object construction.
     ///
-    /// Cached entities implement <see cref="CachedEntity"/>, and they
-    /// emit contents to the trap file when <see cref="CachedEntity.Populate"/>
-    /// is called. Caching prevents <see cref="CachedEntity.Populate"/>
+    /// Cached entities implement <see cref="Entities.CachedEntity"/>, and they
+    /// emit contents to the trap file when <see cref="Entities.CachedEntity.Populate"/>
+    /// is called. Caching prevents <see cref="Entities.CachedEntity.Populate"/>
     /// from being called on entities that have already been emitted.
     /// </summary>
     public interface IEntity
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expression.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expression.cs
index f5021d38eeb..9241528eb75 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expression.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expression.cs
@@ -77,7 +77,7 @@ namespace Semmle.Extraction.CSharp.Entities
         /// <summary>
         /// Gets a string representation of a constant value.
         /// </summary>
-        /// <param name="obj">The value.</param>
+        /// <param name="value">The value.</param>
         /// <returns>The string representation.</returns>
         public static string ValueAsString(object? value)
         {
@@ -98,7 +98,6 @@ namespace Semmle.Extraction.CSharp.Entities
         /// <param name="node">The node to extract.</param>
         /// <param name="parent">The parent entity.</param>
         /// <param name="child">The child index.</param>
-        /// <param name="type">A type hint.</param>
         /// <returns>The new expression.</returns>
         public static Expression Create(Context cx, ExpressionSyntax node, IExpressionParentEntity parent, int child, Boolean isCompilerGenerated = false)
         {
@@ -120,7 +119,6 @@ namespace Semmle.Extraction.CSharp.Entities
         /// <param name="node">The node to extract.</param>
         /// <param name="parent">The parent entity.</param>
         /// <param name="child">The child index.</param>
-        /// <param name="type">A type hint.</param>
         public static void CreateDeferred(Context cx, ExpressionSyntax node, IExpressionParentEntity parent, int child)
         {
             if (ContainsPattern(node))
@@ -244,7 +242,6 @@ namespace Semmle.Extraction.CSharp.Entities
         /// to show the target of the call. Also note the dynamic method
         /// name if available.
         /// </summary>
-        /// <param name="cx">Context</param>
         /// <param name="node">The expression.</param>
         public void OperatorCall(TextWriter trapFile, ExpressionSyntax node)
         {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expression`1.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expression`1.cs
index 6386e43a9b4..4c2670369e0 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expression`1.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Expression`1.cs
@@ -20,7 +20,7 @@ namespace Semmle.Extraction.CSharp.Entities
         /// <code>expressions</code> and <code>expr_location</code> are populated by the constructor
         /// (should not fail), so even if expression-type specific population fails (e.g., in
         /// standalone extraction), the expression created via
-        /// <see cref="Expression.Create(Context, ExpressionSyntax, IEntity, int, ITypeSymbol)"/> will
+        /// <see cref="Expression.Create"/> will
         /// still be valid.
         /// </summary>
         protected abstract void PopulateExpression(TextWriter trapFile);
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Method.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Method.cs
index 6890ca49084..6ba5cca01cf 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Method.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Method.cs
@@ -101,7 +101,7 @@ namespace Semmle.Extraction.CSharp.Entities
                 }
             }
 
-            if (Symbol.OverriddenMethod is not null)
+            if (Symbol.OverriddenMethod is not null && Symbol.OverriddenMethod.ShouldExtractSymbol())
             {
                 trapFile.overrides(this, Method.Create(Context, Symbol.OverriddenMethod));
             }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/NamedType.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/NamedType.cs
index 189a07f6f47..b2106febaff 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/NamedType.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/NamedType.cs
@@ -21,10 +21,9 @@ namespace Semmle.Extraction.CSharp.Entities
             NamedTypeFactory.Instance.CreateEntityFromSymbol(cx, type);
 
         /// <summary>
-        /// Creates a named type entity from a tuple type. Unlike `Create`, this
+        /// Creates a named type entity from a tuple type. Unlike <see cref="Create"/>, this
         /// will create an entity for the underlying `System.ValueTuple` struct.
-        /// For example, `(int, string)` will result in an entity for
-        /// `System.ValueTuple<int, string>`.
+        /// For example, `(int, string)` will result in an entity for `System.ValueTuple&lt;int, string&gt;`.
         /// </summary>
         public static NamedType CreateNamedTypeFromTupleType(Context cx, INamedTypeSymbol type) =>
             UnderlyingTupleTypeFactory.Instance.CreateEntity(cx, (new SymbolEqualityWrapper(type), typeof(TupleType)), type);
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Nullability.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Nullability.cs
index 9791f386a19..add36226f16 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Nullability.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Nullability.cs
@@ -209,8 +209,8 @@ namespace Semmle.Extraction.CSharp.Entities
         /// This is so that we can avoid populating nullability in most cases.
         /// For example,
         /// <code>
-        /// IEnumerable&lt;string?&gt // false
-        /// IEnumerable&lt;string?&gt? // true
+        /// IEnumerable&lt;string?&gt; // false
+        /// IEnumerable&lt;string?&gt;? // true
         /// string? // true
         /// string[] // true
         /// string?[] // false
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Type.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Type.cs
index 56382923a48..efd09409afd 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Type.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/Type.cs
@@ -225,7 +225,7 @@ namespace Semmle.Extraction.CSharp.Entities
         }
 
         /// <summary>
-        /// Called to extract all members and nested types.
+        /// Called to extract members and nested types.
         /// This is called on each member of a namespace,
         /// in either source code or an assembly.
         /// </summary>
@@ -236,7 +236,7 @@ namespace Semmle.Extraction.CSharp.Entities
                 Context.BindComments(this, l);
             }
 
-            foreach (var member in Symbol.GetMembers())
+            foreach (var member in Symbol.GetMembers().ExtractionCandidates())
             {
                 switch (member.Kind)
                 {
@@ -262,16 +262,16 @@ namespace Semmle.Extraction.CSharp.Entities
 
                 var members = new List<ISymbol>();
 
-                foreach (var member in Symbol.GetMembers())
+                foreach (var member in Symbol.GetMembers().ExtractionCandidates())
                     members.Add(member);
-                foreach (var member in Symbol.GetTypeMembers())
+                foreach (var member in Symbol.GetTypeMembers().ExtractionCandidates())
                     members.Add(member);
 
                 // Mono extractor puts all BASE interface members as members of the current interface.
 
                 if (Symbol.TypeKind == TypeKind.Interface)
                 {
-                    foreach (var baseInterface in Symbol.Interfaces)
+                    foreach (var baseInterface in Symbol.Interfaces.ExtractionCandidates())
                     {
                         foreach (var member in baseInterface.GetMembers())
                             members.Add(member);
@@ -288,7 +288,7 @@ namespace Semmle.Extraction.CSharp.Entities
                 if (Symbol.BaseType is not null)
                     Create(Context, Symbol.BaseType).PopulateGenerics();
 
-                foreach (var i in Symbol.Interfaces)
+                foreach (var i in Symbol.Interfaces.ExtractionCandidates())
                 {
                     Create(Context, i).PopulateGenerics();
                 }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/UserOperator.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/UserOperator.cs
index f2fc4b85d7f..141bded87ac 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/UserOperator.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/UserOperator.cs
@@ -86,7 +86,7 @@ namespace Semmle.Extraction.CSharp.Entities
         /// Logs an error if the name is not found.
         /// </summary>
         /// <param name="cx">Extractor context.</param>
-        /// <param name="methodName">The method name.</param>
+        /// <param name="method">The method symbol.</param>
         /// <returns>The converted name.</returns>
         private static string OperatorSymbol(Context cx, IMethodSymbol method)
         {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Analyser.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Analyser.cs
index b839d2c976a..3ea99a0d772 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Analyser.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Analyser.cs
@@ -269,7 +269,7 @@ namespace Semmle.Extraction.CSharp
                 AnalyseNamespace(cx, memberNamespace);
             }
 
-            foreach (var memberType in ns.GetTypeMembers())
+            foreach (var memberType in ns.GetTypeMembers().ExtractionCandidates())
             {
                 Entities.Type.Create(cx, memberType).ExtractRecursive();
             }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Context.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Context.cs
index 8d819d715f9..67bb2808ae6 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Context.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Context.cs
@@ -152,7 +152,7 @@ namespace Semmle.Extraction.CSharp
         /// <summary>
         /// Enqueue the given action to be performed later.
         /// </summary>
-        /// <param name="toRun">The action to run.</param>
+        /// <param name="a">The action to run.</param>
         public void PopulateLater(Action a, bool preserveDuplicationKey = true)
         {
             var key = preserveDuplicationKey ? GetCurrentTagStackKey() : null;
@@ -598,7 +598,6 @@ namespace Semmle.Extraction.CSharp
         /// <summary>
         /// Register a program entity which can be bound to comments.
         /// </summary>
-        /// <param name="cx">Extractor context.</param>
         /// <param name="entity">Program entity.</param>
         /// <param name="l">Location of the entity.</param>
         public void BindComments(Entity entity, Microsoft.CodeAnalysis.Location? l)
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Extractor.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Extractor.cs
index 50f673a7158..3c01893dd89 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Extractor.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Extractor.cs
@@ -549,7 +549,6 @@ namespace Semmle.Extraction.CSharp
                         compilerArguments.CompilationOptions
                             .WithAssemblyIdentityComparer(DesktopAssemblyIdentityComparer.Default)
                             .WithStrongNameProvider(new DesktopStrongNameProvider(compilerArguments.KeyFileSearchPaths))
-                            .WithMetadataImportOptions(MetadataImportOptions.All)
                         );
                 },
                 (compilation, options) => analyser.EndInitialize(compilerArguments, options, compilation, cwd, args),
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/TrapWriter.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/TrapWriter.cs
index 4830c3209c2..42e933c8eaf 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/TrapWriter.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/TrapWriter.cs
@@ -171,7 +171,7 @@ namespace Semmle.Extraction.CSharp
         /// <summary>
         /// Close the trap file, and move it to the right place in the trap directory.
         /// If the file exists already, rename it to allow the new file (ending .trap.gz)
-        /// to sit alongside the old file (except if <paramref name="discardDuplicates"/> is true,
+        /// to sit alongside the old file (except if <see cref="discardDuplicates"/> is true,
         /// in which case only the existing file is kept).
         /// </summary>
         public void Dispose()
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Trap/EscapingTextWriter.cs b/csharp/extractor/Semmle.Extraction.CSharp/Trap/EscapingTextWriter.cs
index 63f5e81c358..28e1d0bf146 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Trap/EscapingTextWriter.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Trap/EscapingTextWriter.cs
@@ -8,7 +8,7 @@ namespace Semmle.Extraction.CSharp
 {
     /// <summary>
     /// A `TextWriter` object that wraps another `TextWriter` object, and which
-    /// HTML escapes the characters `&`, `{`, `}`, `"`, `@`, and `#`, before
+    /// HTML escapes the characters &amp;, {, }, &quot;, @, and #, before
     /// writing to the underlying object.
     /// </summary>
     public sealed class EscapingTextWriter : TextWriter
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Trap/TrapExtensions.cs b/csharp/extractor/Semmle.Extraction.CSharp/Trap/TrapExtensions.cs
index 787ba62e3e8..22e38bac51c 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Trap/TrapExtensions.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Trap/TrapExtensions.cs
@@ -226,7 +226,7 @@ namespace Semmle.Extraction.CSharp
         /// <summary>
         /// Builds a trap builder using a separator and an action for each item in the list.
         /// </summary>
-        /// <typeparam name="T">The type of the items.</typeparam>
+        /// <typeparam name="T2">The type of the items.</typeparam>
         /// <param name="trapFile">The trap builder to append to.</param>
         /// <param name="separator">The separator string (e.g. ",")</param>
         /// <param name="items">The list of items.</param>
@@ -251,7 +251,7 @@ namespace Semmle.Extraction.CSharp
         /// <summary>
         /// Builds a trap builder using a separator and an action for each item in the list.
         /// </summary>
-        /// <typeparam name="T">The type of the items.</typeparam>
+        /// <typeparam name="T2">The type of the items.</typeparam>
         /// <param name="trapFile">The trap builder to append to.</param>
         /// <param name="separator">The separator string (e.g. ",")</param>
         /// <param name="items">The list of items.</param>
diff --git a/csharp/extractor/Semmle.Util/CanonicalPathCache.cs b/csharp/extractor/Semmle.Util/CanonicalPathCache.cs
index a79854333ac..d3cbf41fa10 100644
--- a/csharp/extractor/Semmle.Util/CanonicalPathCache.cs
+++ b/csharp/extractor/Semmle.Util/CanonicalPathCache.cs
@@ -208,7 +208,7 @@ namespace Semmle.Util
         /// Create cache with a given capacity.
         /// </summary>
         /// <param name="pathStrategy">The algorithm for determining the canonical path.</param>
-        /// <param name="capacity">The size of the cache.</param>
+        /// <param name="maxCapacity">The size of the cache.</param>
         public CanonicalPathCache(int maxCapacity, PathStrategy pathStrategy)
         {
             if (maxCapacity <= 0)
@@ -230,7 +230,6 @@ namespace Semmle.Util
         /// </remarks>
         ///
         /// <param name="maxCapacity">Size of the cache.</param>
-        /// <param name="symlinks">Policy for following symlinks.</param>
         /// <returns>A new CanonicalPathCache.</returns>
         public static CanonicalPathCache Create(ILogger logger, int maxCapacity)
         {
diff --git a/csharp/extractor/Semmle.Util/CommandBuilder.cs b/csharp/extractor/Semmle.Util/CommandBuilder.cs
index 3d8f907f866..1b6cd3176c4 100644
--- a/csharp/extractor/Semmle.Util/CommandBuilder.cs
+++ b/csharp/extractor/Semmle.Util/CommandBuilder.cs
@@ -62,7 +62,6 @@ namespace Semmle.Util
         /// </summary>
         /// <param name="argument">The argument to append.</param>
         /// <param name="force">Whether to always quote the argument.</param>
-        /// <param name="cmd">Whether to escape for cmd.exe</param>
         ///
         /// <remarks>
         /// This implementation is copied from
diff --git a/csharp/paket.dependencies b/csharp/paket.dependencies
index f07d495f7db..d3e2988bba6 100644
--- a/csharp/paket.dependencies
+++ b/csharp/paket.dependencies
@@ -4,6 +4,7 @@ source https://api.nuget.org/v3/index.json
 # behave like nuget in choosing transitive dependency versions
 strategy: min
 
+nuget MessagePack >= 2.5.187
 nuget Basic.CompilerLog.Util
 nuget Mono.Posix.NETStandard
 nuget Newtonsoft.Json
diff --git a/csharp/paket.lock b/csharp/paket.lock
index d0cd1517b41..1bfc7465d12 100644
--- a/csharp/paket.lock
+++ b/csharp/paket.lock
@@ -11,11 +11,10 @@ NUGET
       Microsoft.Extensions.ObjectPool (>= 7.0.13)
       MSBuild.StructuredLogger (>= 2.2.235)
     Humanizer.Core (2.14.1)
-    MessagePack (2.5.129)
-      MessagePack.Annotations (>= 2.5.129)
+    MessagePack (2.5.192)
+      MessagePack.Annotations (>= 2.5.192)
       Microsoft.NET.StringTools (>= 17.6.3)
-      System.Runtime.CompilerServices.Unsafe (>= 6.0)
-    MessagePack.Annotations (2.5.129)
+    MessagePack.Annotations (2.5.192)
     Microsoft.Build (17.8.3)
       Microsoft.Build.Framework (>= 17.8.3)
       Microsoft.NET.StringTools (>= 17.8.3)
@@ -59,18 +58,18 @@ NUGET
       System.Composition (>= 8.0)
       System.IO.Pipelines (>= 8.0)
       System.Threading.Channels (>= 8.0)
-    Microsoft.CodeCoverage (17.11.1)
+    Microsoft.CodeCoverage (17.12)
     Microsoft.Extensions.ObjectPool (7.0.13)
     Microsoft.NET.StringTools (17.8.3)
-    Microsoft.NET.Test.Sdk (17.11.1)
-      Microsoft.CodeCoverage (>= 17.11.1)
-      Microsoft.TestPlatform.TestHost (>= 17.11.1)
+    Microsoft.NET.Test.Sdk (17.12)
+      Microsoft.CodeCoverage (>= 17.12)
+      Microsoft.TestPlatform.TestHost (>= 17.12)
     Microsoft.NETCore.Platforms (1.1.1)
     Microsoft.NETCore.Targets (1.1.3)
-    Microsoft.TestPlatform.ObjectModel (17.11.1)
+    Microsoft.TestPlatform.ObjectModel (17.12)
       System.Reflection.Metadata (>= 1.6)
-    Microsoft.TestPlatform.TestHost (17.11.1)
-      Microsoft.TestPlatform.ObjectModel (>= 17.11.1)
+    Microsoft.TestPlatform.TestHost (17.12)
+      Microsoft.TestPlatform.ObjectModel (>= 17.12)
       Newtonsoft.Json (>= 13.0.1)
     Microsoft.Win32.Primitives (4.3)
       Microsoft.NETCore.Platforms (>= 1.1)
diff --git a/csharp/paket.main.bzl b/csharp/paket.main.bzl
index c8e6dbf2c8d..2ec4e25c5f9 100644
--- a/csharp/paket.main.bzl
+++ b/csharp/paket.main.bzl
@@ -9,8 +9,8 @@ def main():
         packages = [
             {"name": "Basic.CompilerLog.Util", "id": "Basic.CompilerLog.Util", "version": "0.7.9", "sha512": "sha512-Z50VRWQIXO0E8GM3ZFdL+Mq+YdmPh+OEJ7bDXPIsp1TQJB07i09WdlEb4MucSz9wG4exeLC3HGt23O3NOFL30g==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "net462": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "net47": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "net471": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "net472": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "net48": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "net5.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "net6.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "net7.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "net8.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "net9.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "netcoreapp2.1": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "netcoreapp2.2": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "netcoreapp3.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "netcoreapp3.1": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"], "netstandard2.1": ["MSBuild.StructuredLogger", "MessagePack", "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.Extensions.ObjectPool"]}, "targeting_pack_overrides": [], "framework_list": []},
             {"name": "Humanizer.Core", "id": "Humanizer.Core", "version": "2.14.1", "sha512": "sha512-yzqGU/HKNLZ9Uvr6kvSc3wYV/S5O/IvklIUW5WF7MuivGLY8wS5IZnLPkt7D1KW8Et2Enl0I3Lzg2vGWM24Xsw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "MessagePack", "id": "MessagePack", "version": "2.5.129", "sha512": "sha512-wpw2dHkE5AcvMYKE4MrWuoeZ2jeaneDlqAgplxm6yKqPXeUVI2h5DPrKjsljnJSNRZOm3tunasw18Q9xj/3UoA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "net462": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "net47": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "net471": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "net472": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "net48": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Runtime.CompilerServices.Unsafe"], "net7.0": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Runtime.CompilerServices.Unsafe"], "net8.0": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Runtime.CompilerServices.Unsafe"], "net9.0": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "MessagePack.Annotations", "id": "MessagePack.Annotations", "version": "2.5.129", "sha512": "sha512-mr12dLr06Kp7Ra7+GUXHbuxt/gbi6RPGPw1mpSvZsubs7hJxzHDtYTb5KKuseu5cpzOUDfsGcaW+Bo0+lqCFAA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "MessagePack", "id": "MessagePack", "version": "2.5.192", "sha512": "sha512-SnrwSQIKWfxcQvzE1TCUPvJ7A/44KFBDcmCc+YUDIq8QalCf0bGAjiBoAFewhJ81QuS5FsCNCOcKn+IURYlbAQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "net462": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "net47": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "net471": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "net472": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "net48": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "net5.0": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "net6.0": ["MessagePack.Annotations", "Microsoft.NET.StringTools"], "net7.0": ["MessagePack.Annotations", "Microsoft.NET.StringTools"], "net8.0": ["MessagePack.Annotations", "Microsoft.NET.StringTools"], "net9.0": ["MessagePack.Annotations", "Microsoft.NET.StringTools"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["MessagePack.Annotations", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "MessagePack.Annotations", "id": "MessagePack.Annotations", "version": "2.5.192", "sha512": "sha512-pE/SD2N0+nDAU8BtTHqjyIhLM2L5Mb0NiO4hW0ybiv2I+BbK0JEaGtbKpeEmOvKT+5s2hds0gvk/GrAHhgcpdw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
             {"name": "Microsoft.Build", "id": "Microsoft.Build", "version": "17.8.3", "sha512": "sha512-jRz++ltVTU9xGAYSnI7fGwLIsg/AwINaxlXaJrcMszO+fyh1xJ8gKZkDz10foT/5y26jZC6G93wyp85NVHc+lA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Reflection.MetadataLoadContext", "System.Security.Principal.Windows", "System.Threading.Tasks.Dataflow", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "net48": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Reflection.MetadataLoadContext", "System.Security.Principal.Windows", "System.Threading.Tasks.Dataflow", "System.Reflection.Metadata", "System.Runtime.CompilerServices.Unsafe"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Reflection.MetadataLoadContext", "System.Security.Principal.Windows", "System.Threading.Tasks.Dataflow", "System.Reflection.Metadata"], "net9.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Reflection.MetadataLoadContext", "System.Security.Principal.Windows", "System.Threading.Tasks.Dataflow", "System.Reflection.Metadata"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
             {"name": "Microsoft.Build.Framework", "id": "Microsoft.Build.Framework", "version": "17.8.3", "sha512": "sha512-xDOoj8lpNohM0Sieo4sJ47m/3SAquclF8wFZeAYYuDRHc8hII4XWPhSafFmw5A4TMGOyV08Z1TrrqES9HxMB3Q==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "net462": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "net47": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "net471": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "net472": ["System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Runtime.CompilerServices.Unsafe"], "net5.0": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "net6.0": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "net7.0": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "netcoreapp2.1": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "netcoreapp2.2": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "netcoreapp3.0": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "netcoreapp3.1": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"], "netstandard2.1": ["System.Runtime.CompilerServices.Unsafe", "System.Security.Principal.Windows"]}, "targeting_pack_overrides": [], "framework_list": []},
             {"name": "Microsoft.Build.Utilities.Core", "id": "Microsoft.Build.Utilities.Core", "version": "17.5.0", "sha512": "sha512-La1NFQ7SVz1pVGEUnG15BQG26jJkRMCiitySBXLhuTYf9IG6eZ5j5UFjnM4EFKSVKbictRv+D/F0dQtsCiK9ag==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "net462": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "net47": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "net471": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "net472": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager"], "net48": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager"], "net5.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "net6.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "net7.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager"], "net8.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager"], "net9.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "netcoreapp2.1": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "netcoreapp2.2": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "netcoreapp3.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "netcoreapp3.1": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"], "netstandard2.1": ["Microsoft.Build.Framework", "Microsoft.NET.StringTools", "System.Collections.Immutable", "System.Configuration.ConfigurationManager", "System.Security.Permissions"]}, "targeting_pack_overrides": [], "framework_list": []},
@@ -22,14 +22,14 @@ def main():
             {"name": "Microsoft.CodeAnalysis.VisualBasic", "id": "Microsoft.CodeAnalysis.VisualBasic", "version": "4.9.2", "sha512": "sha512-Jx3d7jpZ2bdCb/FzVBPD2a4P8jFDhdoEugGoxLxVKtBDzHA5+RdQL0BWvzwrP1Tdw3YPshrUelNlZXmcNXqZyA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common"], "net462": ["Microsoft.CodeAnalysis.Common"], "net47": ["Microsoft.CodeAnalysis.Common"], "net471": ["Microsoft.CodeAnalysis.Common"], "net472": ["Microsoft.CodeAnalysis.Common"], "net48": ["Microsoft.CodeAnalysis.Common"], "net5.0": ["Microsoft.CodeAnalysis.Common"], "net6.0": ["Microsoft.CodeAnalysis.Common"], "net7.0": ["Microsoft.CodeAnalysis.Common"], "net8.0": ["Microsoft.CodeAnalysis.Common"], "net9.0": ["Microsoft.CodeAnalysis.Common"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common"]}, "targeting_pack_overrides": [], "framework_list": []},
             {"name": "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "id": "Microsoft.CodeAnalysis.VisualBasic.Workspaces", "version": "4.9.2", "sha512": "sha512-v07rvZvckHiPLDzKXFs9AXfEGsDeTvR+N9YHO9wQqboXgms4HCv0fTrZOOgqM/aVS7racJKRo1tf62UfjqMeEw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "net462": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "net47": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "net471": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "net472": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "net48": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "net5.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "net6.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "net7.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "net8.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "net9.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common", "Microsoft.CodeAnalysis.VisualBasic", "Microsoft.CodeAnalysis.Workspaces.Common"]}, "targeting_pack_overrides": [], "framework_list": []},
             {"name": "Microsoft.CodeAnalysis.Workspaces.Common", "id": "Microsoft.CodeAnalysis.Workspaces.Common", "version": "4.9.2", "sha512": "sha512-DieswZYcYVGDPeT6m7M4i+0aKkjSgyjmI9z9HJEDSRZdvXfKYLEKwmlFGUTyzFS4brnyMCwLSiw2KWVAydpzVA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "net462": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "net47": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "net471": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "net472": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "net48": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "net5.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "net6.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "net7.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "net8.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "net9.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "netcoreapp2.1": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "netcoreapp2.2": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "netcoreapp3.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "netcoreapp3.1": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"], "netstandard2.1": ["Microsoft.CodeAnalysis.Common", "Humanizer.Core", "System.Composition", "System.IO.Pipelines", "System.Threading.Channels"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.CodeCoverage", "id": "Microsoft.CodeCoverage", "version": "17.11.1", "sha512": "sha512-ZJ4Ch1u7AemIzNpc0BbLoysJ0dJildIvAybL2vBUfbqho86N2VqzX9PGNc9a9pemZ//1Y6AOJ7SJxi/pCvLhHA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.CodeCoverage", "id": "Microsoft.CodeCoverage", "version": "17.12.0", "sha512": "sha512-POBqg788rrLApvncy8rvtyJ3ynsBdU0/SGUXD+vPqyRDM/aUJbPZWx01qalGJRK1GcArSku8QDd9AVMa0TkCkA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
             {"name": "Microsoft.Extensions.ObjectPool", "id": "Microsoft.Extensions.ObjectPool", "version": "7.0.13", "sha512": "sha512-N66kAzKBfcs4zIX/iVMUOhfn8Xv3Ye1QpLGS8IUSpCHa+Vxh2ZsdDiqd0Y2m7ryPU6FU2LOTnZ+0ymmm83vC6w==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
             {"name": "Microsoft.NET.StringTools", "id": "Microsoft.NET.StringTools", "version": "17.8.3", "sha512": "sha512-3N/Ika66JZeORrIZ68fap6M0LSQ9+SQz277NxjA/dxETnR3dZwJXj67jAAc4FkijG6w//QzrC5NEregtIVjz1w==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": ["System.Runtime.CompilerServices.Unsafe"], "net48": ["System.Runtime.CompilerServices.Unsafe"], "net5.0": ["System.Runtime.CompilerServices.Unsafe"], "net6.0": ["System.Runtime.CompilerServices.Unsafe"], "net7.0": ["System.Runtime.CompilerServices.Unsafe"], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.1": ["System.Runtime.CompilerServices.Unsafe"], "netcoreapp2.2": ["System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.0": ["System.Runtime.CompilerServices.Unsafe"], "netcoreapp3.1": ["System.Runtime.CompilerServices.Unsafe"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Runtime.CompilerServices.Unsafe"], "netstandard2.1": ["System.Runtime.CompilerServices.Unsafe"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.NET.Test.Sdk", "id": "Microsoft.NET.Test.Sdk", "version": "17.11.1", "sha512": "sha512-k3ULrpyrTHKhVeKqdFwiUDOwqKVRtVTcyjmfKqKw/NrIHJ54mkTaGlU5ARUakDC894X1wTyXtdmzzaDZqelliA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": ["Microsoft.CodeCoverage"], "net47": ["Microsoft.CodeCoverage"], "net471": ["Microsoft.CodeCoverage"], "net472": ["Microsoft.CodeCoverage"], "net48": ["Microsoft.CodeCoverage"], "net5.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "net6.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "net7.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "net8.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "net9.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.NET.Test.Sdk", "id": "Microsoft.NET.Test.Sdk", "version": "17.12.0", "sha512": "sha512-hGf8I8+yo15etavoMd+7OXcOG6/G7HYPDEJg5aQnhMzsxaUpq+udNZzSxmEN9rGTWMZOAVFcyNXNL7YBsN6chw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": ["Microsoft.CodeCoverage"], "net47": ["Microsoft.CodeCoverage"], "net471": ["Microsoft.CodeCoverage"], "net472": ["Microsoft.CodeCoverage"], "net48": ["Microsoft.CodeCoverage"], "net5.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "net6.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "net7.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "net8.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "net9.0": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": ["Microsoft.TestPlatform.TestHost", "Microsoft.CodeCoverage"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
             {"name": "Microsoft.NETCore.Platforms", "id": "Microsoft.NETCore.Platforms", "version": "1.1.1", "sha512": "sha512-mDUJD1eLXIzmUnWCzWlmNQZGDp/cVGT8KyhzMcJNk2nlfdFUOoZai9idT8/FacJr8Nv8zhAmdf39FHm5qWUoGQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
             {"name": "Microsoft.NETCore.Targets", "id": "Microsoft.NETCore.Targets", "version": "1.1.3", "sha512": "sha512-pxwq8g2PYRiEF5KXVjmZFMNTqsg2Gr1puv/pR1sqAduAKHAGbaCuJ6+yc3pAJseClQUD29S2Ubrm7n/ZD78dUg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.TestPlatform.ObjectModel", "id": "Microsoft.TestPlatform.ObjectModel", "version": "17.11.1", "sha512": "sha512-9hJ6Gbf3IaPwOP2qgdADYLEk9NXtAsp5y3szBogAe0lj7zaBWU0n8GiCVxpJL8RaoPee46qlJBfZcu1z9DQgAA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Reflection.Metadata"], "net462": ["System.Reflection.Metadata"], "net47": ["System.Reflection.Metadata"], "net471": ["System.Reflection.Metadata"], "net472": ["System.Reflection.Metadata"], "net48": ["System.Reflection.Metadata"], "net5.0": ["System.Reflection.Metadata"], "net6.0": ["System.Reflection.Metadata"], "net7.0": ["System.Reflection.Metadata"], "net8.0": ["System.Reflection.Metadata"], "net9.0": ["System.Reflection.Metadata"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Reflection.Metadata"], "netcoreapp2.1": ["System.Reflection.Metadata"], "netcoreapp2.2": ["System.Reflection.Metadata"], "netcoreapp3.0": ["System.Reflection.Metadata"], "netcoreapp3.1": ["System.Reflection.Metadata"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Reflection.Metadata"], "netstandard2.1": ["System.Reflection.Metadata"]}, "targeting_pack_overrides": [], "framework_list": []},
-            {"name": "Microsoft.TestPlatform.TestHost", "id": "Microsoft.TestPlatform.TestHost", "version": "17.11.1", "sha512": "sha512-deRHZRRzHUWbCu31aoFmFt9qelMkDmuBsgJ3jgqQt8KEIj2Tx0R1Qe7nDRZ3YUF84YGICMXMBd+BABtWRw3Wxg==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "net6.0": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "net7.0": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "net8.0": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "net9.0": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.TestPlatform.ObjectModel", "id": "Microsoft.TestPlatform.ObjectModel", "version": "17.12.0", "sha512": "sha512-klsXMgAPNWYo3ceakLkod4wYrk4lAV2Ehi676zUKgiVpQ5Yj6q3vsMhk/3pm97Ltk/hdcSW0rJKJvcQvTzPgYA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["System.Reflection.Metadata"], "net462": ["System.Reflection.Metadata"], "net47": ["System.Reflection.Metadata"], "net471": ["System.Reflection.Metadata"], "net472": ["System.Reflection.Metadata"], "net48": ["System.Reflection.Metadata"], "net5.0": ["System.Reflection.Metadata"], "net6.0": ["System.Reflection.Metadata"], "net7.0": ["System.Reflection.Metadata"], "net8.0": ["System.Reflection.Metadata"], "net9.0": ["System.Reflection.Metadata"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["System.Reflection.Metadata"], "netcoreapp2.1": ["System.Reflection.Metadata"], "netcoreapp2.2": ["System.Reflection.Metadata"], "netcoreapp3.0": ["System.Reflection.Metadata"], "netcoreapp3.1": ["System.Reflection.Metadata"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["System.Reflection.Metadata"], "netstandard2.1": ["System.Reflection.Metadata"]}, "targeting_pack_overrides": [], "framework_list": []},
+            {"name": "Microsoft.TestPlatform.TestHost", "id": "Microsoft.TestPlatform.TestHost", "version": "17.12.0", "sha512": "sha512-gYM2BOGQvFEP2fZt61f3f5Gu+imL1G1bvGUrbJjpYcl66R6uzs5yESg0XMn8IgUgldz8RldOOaYmjk2KcSeG1Q==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "net6.0": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "net7.0": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "net8.0": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "net9.0": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": ["Microsoft.TestPlatform.ObjectModel", "Newtonsoft.Json"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
             {"name": "Microsoft.Win32.Primitives", "id": "Microsoft.Win32.Primitives", "version": "4.3.0", "sha512": "sha512-Nm8Hp51y9tYcK3xD6qk43Wjftrg1mdH24CCJsTb6gr7HS21U1uA+CKPGEtUcVZbjU1y8Kynzm5eoJ7Pnx5gm8A==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net6.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net7.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net8.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "net9.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp1.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp1.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp2.2": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp3.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netcoreapp3.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.4": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.5": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard1.6": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard2.0": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"], "netstandard2.1": ["Microsoft.NETCore.Platforms", "Microsoft.NETCore.Targets", "System.Runtime"]}, "targeting_pack_overrides": [], "framework_list": []},
             {"name": "Microsoft.Win32.SystemEvents", "id": "Microsoft.Win32.SystemEvents", "version": "7.0.0", "sha512": "sha512-GO6SWx/wSZIFvxOn67Y6OiIGdz9JGCg5CRDDbSAAvBDQeZFbybu9sEOUb9w/vUlQv+A2XakTFZg9Ug1w+tgbWQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
             {"name": "Mono.Posix.NETStandard", "id": "Mono.Posix.NETStandard", "version": "1.0.0", "sha512": "sha512-RtGiutQZJAmajvQ0QvBvh73VJye85iW9f9tjZlzF88idLxNMo4lAktP/4Y9ilCpais0LDO0tpoICt9Hdv6wooA==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": []},
diff --git a/csharp/ql/integration-tests/all-platforms/dotnet_build/test.py b/csharp/ql/integration-tests/all-platforms/dotnet_build/test.py
index c32d966acb4..75ba09477fa 100644
--- a/csharp/ql/integration-tests/all-platforms/dotnet_build/test.py
+++ b/csharp/ql/integration-tests/all-platforms/dotnet_build/test.py
@@ -1,7 +1,6 @@
 import os
 
 def check_build_out(msg, s):
-    lines = s.splitlines()
     lines = s.splitlines()
     assert (
         any (("[build-stdout]" in line) and (msg in line) for line in lines)
diff --git a/csharp/ql/lib/change-notes/2024-11-26-model-microsoft.jsinterop.ijsruntime.md b/csharp/ql/lib/change-notes/2024-11-26-model-microsoft.jsinterop.ijsruntime.md
new file mode 100644
index 00000000000..a99f9c8e0fd
--- /dev/null
+++ b/csharp/ql/lib/change-notes/2024-11-26-model-microsoft.jsinterop.ijsruntime.md
@@ -0,0 +1,5 @@
+---
+category: minorAnalysis
+---
+* Added `js-interop` sinks for the `InvokeAsync` and `InvokeVoidAsync` methods of `Microsoft.JSInterop.IJSRuntime`, which can run arbitrary JavaScript. 
+
diff --git a/csharp/ql/lib/change-notes/2024-11-27-navigationmanager.uri-and-uri-parsing-utilities.md b/csharp/ql/lib/change-notes/2024-11-27-navigationmanager.uri-and-uri-parsing-utilities.md
new file mode 100644
index 00000000000..2d9866c2e15
--- /dev/null
+++ b/csharp/ql/lib/change-notes/2024-11-27-navigationmanager.uri-and-uri-parsing-utilities.md
@@ -0,0 +1,8 @@
+---
+category: minorAnalysis
+---
+* Added `Microsoft.AspNetCore.Components.NagivationManager::Uri` as a remote flow source, since this value may contain user-specified values.
+* Added the following URI-parsing methods as summaries, as they may be tainted with user-specified values:
+  - `System.Web.HttpUtility::ParseQueryString`
+  - `Microsoft.AspNetCore.WebUtilities.QueryHelpers::ParseQuery`
+  - `Microsoft.AspNetCore.WebUtilities.QueryHelpers::ParseNullableQuery`
diff --git a/csharp/ql/lib/change-notes/2024-12-03-dynamic-field-flow.md b/csharp/ql/lib/change-notes/2024-12-03-dynamic-field-flow.md
new file mode 100644
index 00000000000..4d5f8f9258e
--- /dev/null
+++ b/csharp/ql/lib/change-notes/2024-12-03-dynamic-field-flow.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Added support for data-flow through member accesses of objects with `dynamic` types.
diff --git a/csharp/ql/lib/change-notes/2024-12-03-public-protected-reference.md b/csharp/ql/lib/change-notes/2024-12-03-public-protected-reference.md
new file mode 100644
index 00000000000..7b284df3652
--- /dev/null
+++ b/csharp/ql/lib/change-notes/2024-12-03-public-protected-reference.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Only extract *public* and *protected* members from reference assemblies. This yields an approximate average speed-up of around 10% for extraction and query execution. Custom MaD rows using `Field`-based summaries may need to be changed to `SyntheticField`-based flows if they reference private fields.
diff --git a/csharp/ql/lib/change-notes/2024-12-03-remove-dataflow-config-class-api.md b/csharp/ql/lib/change-notes/2024-12-03-remove-dataflow-config-class-api.md
new file mode 100644
index 00000000000..d09ec528c99
--- /dev/null
+++ b/csharp/ql/lib/change-notes/2024-12-03-remove-dataflow-config-class-api.md
@@ -0,0 +1,4 @@
+---
+category: breaking
+---
+* Deleted the old deprecated data flow API that was based on extending a configuration class. See https://github.blog/changelog/2023-08-14-new-dataflow-api-for-writing-custom-codeql-queries for instructions on migrating your queries to use the new API.
diff --git a/csharp/ql/lib/experimental/code/csharp/Cryptography/NonCryptographicHashes.qll b/csharp/ql/lib/experimental/code/csharp/Cryptography/NonCryptographicHashes.qll
index 0f22f772620..49dd011658d 100644
--- a/csharp/ql/lib/experimental/code/csharp/Cryptography/NonCryptographicHashes.qll
+++ b/csharp/ql/lib/experimental/code/csharp/Cryptography/NonCryptographicHashes.qll
@@ -8,7 +8,6 @@
 
 import csharp
 private import DataFlow
-private import semmle.code.csharp.dataflow.TaintTracking2
 
 predicate maybeANonCryptographicHash(
   Callable callable, Variable v, Expr xor, Expr mul, LoopStmt loop
diff --git a/csharp/ql/lib/ext/Microsoft.AspNetCore.Components.model.yml b/csharp/ql/lib/ext/Microsoft.AspNetCore.Components.model.yml
new file mode 100644
index 00000000000..13c7168a1d1
--- /dev/null
+++ b/csharp/ql/lib/ext/Microsoft.AspNetCore.Components.model.yml
@@ -0,0 +1,12 @@
+extensions:
+  - addsTo:
+      pack: codeql/csharp-all
+      extensible: sourceModel
+    data:
+      - ["Microsoft.AspNetCore.Components", "NagivationManager", True, "get_BaseUri", "", "", "ReturnValue", "remote", "manual"]
+      - ["Microsoft.AspNetCore.Components", "NagivationManager", True, "get_Uri", "", "", "ReturnValue", "remote", "manual"]
+  - addsTo:
+      pack: codeql/csharp-all
+      extensible: summaryModel
+    data:
+      - ["Microsoft.AspNetCore.Components", "NagivationManager", True, "ToAbsoluteUri", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
diff --git a/csharp/ql/lib/ext/Microsoft.AspNetCore.WebUtilities.model.yml b/csharp/ql/lib/ext/Microsoft.AspNetCore.WebUtilities.model.yml
new file mode 100644
index 00000000000..3554f5bb7a6
--- /dev/null
+++ b/csharp/ql/lib/ext/Microsoft.AspNetCore.WebUtilities.model.yml
@@ -0,0 +1,7 @@
+extensions:
+  - addsTo:
+      pack: codeql/csharp-all
+      extensible: summaryModel
+    data:
+      - ["Microsoft.AspNetCore.WebUtilities", "QueryHelpers", False, "ParseQuery", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["Microsoft.AspNetCore.WebUtilities", "QueryHelpers", False, "ParseNullableQuery", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
diff --git a/csharp/ql/lib/ext/Microsoft.JSInterop.model.yml b/csharp/ql/lib/ext/Microsoft.JSInterop.model.yml
new file mode 100644
index 00000000000..78f5c0964c1
--- /dev/null
+++ b/csharp/ql/lib/ext/Microsoft.JSInterop.model.yml
@@ -0,0 +1,7 @@
+extensions:
+  - addsTo:
+      pack: codeql/csharp-all
+      extensible: sinkModel
+    data:
+      - ["Microsoft.JSInterop", "JSRuntimeExtensions", True, "InvokeAsync<TValue>", "", "", "Argument[1]", "js-injection", "manual"]
+      - ["Microsoft.JSInterop", "JSRuntimeExtensions", True, "InvokeVoidAsync", "", "", "Argument[1]", "js-injection", "manual"]
diff --git a/csharp/ql/lib/ext/System.Web.model.yml b/csharp/ql/lib/ext/System.Web.model.yml
index a2a7470ef8e..ba644e1cc70 100644
--- a/csharp/ql/lib/ext/System.Web.model.yml
+++ b/csharp/ql/lib/ext/System.Web.model.yml
@@ -22,6 +22,7 @@ extensions:
       - ["System.Web", "HttpUtility", False, "HtmlEncode", "(System.String,System.IO.TextWriter)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["System.Web", "HttpUtility", False, "JavaScriptStringEncode", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["System.Web", "HttpUtility", False, "JavaScriptStringEncode", "(System.String,System.Boolean)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["System.Web", "HttpUtility", False, "ParseQueryString", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["System.Web", "HttpUtility", False, "UrlEncode", "(System.Byte[])", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["System.Web", "HttpUtility", False, "UrlEncode", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["System.Web", "HttpUtility", False, "UrlEncode", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
diff --git a/csharp/ql/lib/ext/generated/System.Web.model.yml b/csharp/ql/lib/ext/generated/System.Web.model.yml
index 19ef940f9ea..af5047a0fc2 100644
--- a/csharp/ql/lib/ext/generated/System.Web.model.yml
+++ b/csharp/ql/lib/ext/generated/System.Web.model.yml
@@ -25,8 +25,6 @@ extensions:
       - ["System.Web", "AspNetHostingPermissionAttribute", "AspNetHostingPermissionAttribute", "(System.Security.Permissions.SecurityAction)", "summary", "df-generated"]
       - ["System.Web", "AspNetHostingPermissionAttribute", "CreatePermission", "()", "summary", "df-generated"]
       - ["System.Web", "HttpUtility", "HtmlDecode", "(System.String,System.IO.TextWriter)", "summary", "df-generated"]
-      - ["System.Web", "HttpUtility", "ParseQueryString", "(System.String)", "summary", "df-generated"]
-      - ["System.Web", "HttpUtility", "ParseQueryString", "(System.String,System.Text.Encoding)", "summary", "df-generated"]
       - ["System.Web", "HttpUtility", "UrlDecode", "(System.Byte[],System.Int32,System.Int32,System.Text.Encoding)", "summary", "df-generated"]
       - ["System.Web", "HttpUtility", "UrlDecode", "(System.Byte[],System.Text.Encoding)", "summary", "df-generated"]
       - ["System.Web", "HttpUtility", "UrlDecode", "(System.String)", "summary", "df-generated"]
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/DataFlow.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/DataFlow.qll
index 0fc12debaa8..9c1c8c2fee3 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/DataFlow.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/DataFlow.qll
@@ -9,5 +9,5 @@ module DataFlow {
   private import semmle.code.csharp.dataflow.internal.DataFlowImplSpecific
   private import codeql.dataflow.DataFlow
   import DataFlowMake<Location, CsharpDataFlow>
-  import semmle.code.csharp.dataflow.internal.DataFlowImpl1
+  import Public
 }
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/DataFlow2.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/DataFlow2.qll
deleted file mode 100644
index 60525016d31..00000000000
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/DataFlow2.qll
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) data flow analyses.
- */
-
-import csharp
-
-module DataFlow2 {
-  import semmle.code.csharp.dataflow.internal.DataFlowImpl2
-}
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/DataFlow3.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/DataFlow3.qll
deleted file mode 100644
index 7f3b9469449..00000000000
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/DataFlow3.qll
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) data flow analyses.
- */
-
-import csharp
-
-module DataFlow3 {
-  import semmle.code.csharp.dataflow.internal.DataFlowImpl3
-}
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/DataFlow4.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/DataFlow4.qll
deleted file mode 100644
index 29c994a2eec..00000000000
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/DataFlow4.qll
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) data flow analyses.
- */
-
-import csharp
-
-module DataFlow4 {
-  import semmle.code.csharp.dataflow.internal.DataFlowImpl4
-}
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/DataFlow5.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/DataFlow5.qll
deleted file mode 100644
index 48148117166..00000000000
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/DataFlow5.qll
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) data flow analyses.
- */
-
-import csharp
-
-module DataFlow5 {
-  import semmle.code.csharp.dataflow.internal.DataFlowImpl5
-}
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/TaintTracking.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/TaintTracking.qll
index fb39294ed23..781953a8348 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/TaintTracking.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/TaintTracking.qll
@@ -6,10 +6,9 @@
 import csharp
 
 module TaintTracking {
-  import semmle.code.csharp.dataflow.internal.tainttracking1.TaintTrackingParameter::Public
+  import semmle.code.csharp.dataflow.internal.TaintTrackingPublic
   private import semmle.code.csharp.dataflow.internal.DataFlowImplSpecific
   private import semmle.code.csharp.dataflow.internal.TaintTrackingImplSpecific
   private import codeql.dataflow.TaintTracking
   import TaintFlowMake<Location, CsharpDataFlow, CsharpTaintTracking>
-  import semmle.code.csharp.dataflow.internal.tainttracking1.TaintTrackingImpl
 }
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/TaintTracking2.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/TaintTracking2.qll
deleted file mode 100644
index 9ee798ed9fd..00000000000
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/TaintTracking2.qll
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) taint-tracking analyses.
- */
-
-import csharp
-
-module TaintTracking2 {
-  import semmle.code.csharp.dataflow.internal.tainttracking2.TaintTrackingImpl
-}
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/TaintTracking3.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/TaintTracking3.qll
deleted file mode 100644
index 476d7bf7dd7..00000000000
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/TaintTracking3.qll
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) taint-tracking analyses.
- */
-
-import csharp
-
-module TaintTracking3 {
-  import semmle.code.csharp.dataflow.internal.tainttracking3.TaintTrackingImpl
-}
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/TaintTracking4.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/TaintTracking4.qll
deleted file mode 100644
index 45b8f12be5c..00000000000
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/TaintTracking4.qll
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) taint-tracking analyses.
- */
-
-import csharp
-
-module TaintTracking4 {
-  import semmle.code.csharp.dataflow.internal.tainttracking4.TaintTrackingImpl
-}
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/TaintTracking5.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/TaintTracking5.qll
deleted file mode 100644
index 7a75ce532bc..00000000000
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/TaintTracking5.qll
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) taint-tracking analyses.
- */
-
-import csharp
-
-module TaintTracking5 {
-  import semmle.code.csharp.dataflow.internal.tainttracking5.TaintTrackingImpl
-}
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl1.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl1.qll
deleted file mode 100644
index 17def0c431d..00000000000
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl1.qll
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides a `Configuration` class backwards-compatible interface to the data
- * flow library.
- */
-
-private import DataFlowImplCommon
-private import DataFlowImplSpecific::Private
-import DataFlowImplSpecific::Public
-private import DataFlowImpl
-import DataFlowImplCommonPublic
-deprecated import FlowStateString
-private import codeql.util.Unit
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural data flow analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the global data flow library must define its own unique extension
- * of this abstract class. To create a configuration, extend this class with
- * a subclass whose characteristic predicate is a unique singleton string.
- * For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends DataFlow::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isBarrier`.
- *   // Optionally override `isAdditionalFlowStep`.
- * }
- * ```
- * Conceptually, this defines a graph where the nodes are `DataFlow::Node`s and
- * the edges are those data-flow steps that preserve the value of the node
- * along with any additional edges defined by `isAdditionalFlowStep`.
- * Specifying nodes in `isBarrier` will remove those nodes from the graph, and
- * specifying nodes in `isBarrierIn` and/or `isBarrierOut` will remove in-going
- * and/or out-going edges from those nodes, respectively.
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but two classes extending
- * `DataFlow::Configuration` should never depend on each other. One of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`.
- */
-abstract deprecated class Configuration extends string {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant data flow source.
-   */
-  predicate isSource(Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant data flow source with the given initial
-   * `state`.
-   */
-  predicate isSource(Node source, FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink.
-   */
-  predicate isSink(Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink accepting `state`.
-   */
-  predicate isSink(Node sink, FlowState state) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited. This completely removes
-   * `node` from the data flow graph.
-   */
-  predicate isBarrier(Node node) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited when the flow state is
-   * `state`.
-   */
-  predicate isBarrier(Node node, FlowState state) { none() }
-
-  /** Holds if data flow into `node` is prohibited. */
-  predicate isBarrierIn(Node node) { none() }
-
-  /** Holds if data flow out of `node` is prohibited. */
-  predicate isBarrierOut(Node node) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   */
-  predicate isAdditionalFlowStep(Node node1, Node node2) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
-    none()
-  }
-
-  /**
-   * Holds if an arbitrary number of implicit read steps of content `c` may be
-   * taken at `node`.
-   */
-  predicate allowImplicitRead(Node node, ContentSet c) { none() }
-
-  /**
-   * Gets the virtual dispatch branching limit when calculating field flow.
-   * This can be overridden to a smaller value to improve performance (a
-   * value of 0 disables field flow), or a larger value to get more results.
-   */
-  int fieldFlowBranchLimit() { result = 2 }
-
-  /**
-   * Gets a data flow configuration feature to add restrictions to the set of
-   * valid flow paths.
-   *
-   * - `FeatureHasSourceCallContext`:
-   *    Assume that sources have some existing call context to disallow
-   *    conflicting return-flow directly following the source.
-   * - `FeatureHasSinkCallContext`:
-   *    Assume that sinks have some existing call context to disallow
-   *    conflicting argument-to-parameter flow directly preceding the sink.
-   * - `FeatureEqualSourceSinkCallContext`:
-   *    Implies both of the above and additionally ensures that the entire flow
-   *    path preserves the call context.
-   *
-   * These features are generally not relevant for typical end-to-end data flow
-   * queries, but should only be used for constructing paths that need to
-   * somehow be pluggable in another path context.
-   */
-  FlowFeature getAFeature() { none() }
-
-  /** Holds if sources should be grouped in the result of `hasFlowPath`. */
-  predicate sourceGrouping(Node source, string sourceGroup) { none() }
-
-  /** Holds if sinks should be grouped in the result of `hasFlowPath`. */
-  predicate sinkGrouping(Node sink, string sinkGroup) { none() }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   */
-  predicate hasFlow(Node source, Node sink) { hasFlow(source, sink, this) }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   *
-   * The corresponding paths are generated from the end-points and the graph
-   * included in the module `PathGraph`.
-   */
-  predicate hasFlowPath(PathNode source, PathNode sink) { hasFlowPath(source, sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowTo(Node sink) { hasFlowTo(sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowToExpr(DataFlowExpr sink) { this.hasFlowTo(exprNode(sink)) }
-
-  /**
-   * Holds if hidden nodes should be included in the data flow graph.
-   *
-   * This feature should only be used for debugging or when the data flow graph
-   * is not visualized (for example in a `path-problem` query).
-   */
-  predicate includeHiddenNodes() { none() }
-}
-
-/**
- * This class exists to prevent mutual recursion between the user-overridden
- * member predicates of `Configuration` and the rest of the data-flow library.
- * Good performance cannot be guaranteed in the presence of such recursion, so
- * it should be replaced by using more than one copy of the data flow library.
- */
-abstract deprecated private class ConfigurationRecursionPrevention extends Configuration {
-  bindingset[this]
-  ConfigurationRecursionPrevention() { any() }
-
-  override predicate hasFlow(Node source, Node sink) {
-    strictcount(Node n | this.isSource(n)) < 0
-    or
-    strictcount(Node n | this.isSource(n, _)) < 0
-    or
-    strictcount(Node n | this.isSink(n)) < 0
-    or
-    strictcount(Node n | this.isSink(n, _)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, _, n2, _)) < 0
-    or
-    super.hasFlow(source, sink)
-  }
-}
-
-deprecated private FlowState relevantState(Configuration config) {
-  config.isSource(_, result) or
-  config.isSink(_, result) or
-  config.isBarrier(_, result) or
-  config.isAdditionalFlowStep(_, result, _, _) or
-  config.isAdditionalFlowStep(_, _, _, result)
-}
-
-private newtype TConfigState =
-  deprecated TMkConfigState(Configuration config, FlowState state) {
-    state = relevantState(config) or state instanceof FlowStateEmpty
-  }
-
-deprecated private Configuration getConfig(TConfigState state) { state = TMkConfigState(result, _) }
-
-deprecated private FlowState getState(TConfigState state) { state = TMkConfigState(_, result) }
-
-deprecated private predicate singleConfiguration() { 1 = strictcount(Configuration c) }
-
-deprecated private module Config implements FullStateConfigSig {
-  class FlowState = TConfigState;
-
-  predicate isSource(Node source, FlowState state) {
-    getConfig(state).isSource(source, getState(state))
-    or
-    getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isSink(Node sink) { none() }
-
-  predicate isSink(Node sink, FlowState state) {
-    getConfig(state).isSink(sink, getState(state))
-    or
-    getConfig(state).isSink(sink) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isBarrier(Node node) { none() }
-
-  predicate isBarrier(Node node, FlowState state) {
-    getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node)
-  }
-
-  predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
-
-  predicate isBarrierOut(Node node) { any(Configuration config).isBarrierOut(node) }
-
-  predicate isBarrierIn(Node node, FlowState state) { none() }
-
-  predicate isBarrierOut(Node node, FlowState state) { none() }
-
-  predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
-    singleConfiguration() and
-    any(Configuration config).isAdditionalFlowStep(node1, node2) and
-    model = ""
-  }
-
-  predicate isAdditionalFlowStep(
-    Node node1, FlowState state1, Node node2, FlowState state2, string model
-  ) {
-    getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1) and
-    model = ""
-    or
-    not singleConfiguration() and
-    getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1 and
-    model = ""
-  }
-
-  predicate allowImplicitRead(Node node, ContentSet c) {
-    any(Configuration config).allowImplicitRead(node, c)
-  }
-
-  predicate neverSkip(Node node) { none() }
-
-  int fieldFlowBranchLimit() { result = min(any(Configuration config).fieldFlowBranchLimit()) }
-
-  int accessPathLimit() { result = 5 }
-
-  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
-
-  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
-
-  predicate observeDiffInformedIncrementalMode() { none() }
-}
-
-deprecated private import Impl<Config> as I
-
-/**
- * A `Node` augmented with a call context (except for sinks), an access path, and a configuration.
- * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
- */
-deprecated class PathNode instanceof I::PathNode {
-  /** Gets a textual representation of this element. */
-  final string toString() { result = super.toString() }
-
-  /**
-   * Gets a textual representation of this element, including a textual
-   * representation of the call context.
-   */
-  final string toStringWithContext() { result = super.toStringWithContext() }
-
-  /**
-   * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
-   * For more information, see
-   * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
-   */
-  final predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    super.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-
-  /** Gets the underlying `Node`. */
-  final Node getNode() { result = super.getNode() }
-
-  /** Gets the `FlowState` of this node. */
-  deprecated final FlowState getState() { result = getState(super.getState()) }
-
-  /** Gets the associated configuration. */
-  deprecated final Configuration getConfiguration() { result = getConfig(super.getState()) }
-
-  /** Gets a successor of this node, if any. */
-  final PathNode getASuccessor() { result = super.getASuccessor() }
-
-  /** Holds if this node is a source. */
-  final predicate isSource() { super.isSource() }
-
-  /** Holds if this node is a grouping of source nodes. */
-  final predicate isSourceGroup(string group) { super.isSourceGroup(group) }
-
-  /** Holds if this node is a grouping of sink nodes. */
-  final predicate isSinkGroup(string group) { super.isSinkGroup(group) }
-}
-
-deprecated module PathGraph = I::PathGraph;
-
-deprecated private predicate hasFlow(Node source, Node sink, Configuration config) {
-  exists(PathNode source0, PathNode sink0 |
-    hasFlowPath(source0, sink0, config) and
-    source0.getNode() = source and
-    sink0.getNode() = sink
-  )
-}
-
-deprecated private predicate hasFlowPath(PathNode source, PathNode sink, Configuration config) {
-  I::flowPath(source, sink) and source.getConfiguration() = config
-}
-
-deprecated private predicate hasFlowTo(Node sink, Configuration config) { hasFlow(_, sink, config) }
-
-deprecated predicate flowsTo = hasFlow/3;
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll
deleted file mode 100644
index 17def0c431d..00000000000
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides a `Configuration` class backwards-compatible interface to the data
- * flow library.
- */
-
-private import DataFlowImplCommon
-private import DataFlowImplSpecific::Private
-import DataFlowImplSpecific::Public
-private import DataFlowImpl
-import DataFlowImplCommonPublic
-deprecated import FlowStateString
-private import codeql.util.Unit
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural data flow analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the global data flow library must define its own unique extension
- * of this abstract class. To create a configuration, extend this class with
- * a subclass whose characteristic predicate is a unique singleton string.
- * For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends DataFlow::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isBarrier`.
- *   // Optionally override `isAdditionalFlowStep`.
- * }
- * ```
- * Conceptually, this defines a graph where the nodes are `DataFlow::Node`s and
- * the edges are those data-flow steps that preserve the value of the node
- * along with any additional edges defined by `isAdditionalFlowStep`.
- * Specifying nodes in `isBarrier` will remove those nodes from the graph, and
- * specifying nodes in `isBarrierIn` and/or `isBarrierOut` will remove in-going
- * and/or out-going edges from those nodes, respectively.
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but two classes extending
- * `DataFlow::Configuration` should never depend on each other. One of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`.
- */
-abstract deprecated class Configuration extends string {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant data flow source.
-   */
-  predicate isSource(Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant data flow source with the given initial
-   * `state`.
-   */
-  predicate isSource(Node source, FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink.
-   */
-  predicate isSink(Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink accepting `state`.
-   */
-  predicate isSink(Node sink, FlowState state) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited. This completely removes
-   * `node` from the data flow graph.
-   */
-  predicate isBarrier(Node node) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited when the flow state is
-   * `state`.
-   */
-  predicate isBarrier(Node node, FlowState state) { none() }
-
-  /** Holds if data flow into `node` is prohibited. */
-  predicate isBarrierIn(Node node) { none() }
-
-  /** Holds if data flow out of `node` is prohibited. */
-  predicate isBarrierOut(Node node) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   */
-  predicate isAdditionalFlowStep(Node node1, Node node2) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
-    none()
-  }
-
-  /**
-   * Holds if an arbitrary number of implicit read steps of content `c` may be
-   * taken at `node`.
-   */
-  predicate allowImplicitRead(Node node, ContentSet c) { none() }
-
-  /**
-   * Gets the virtual dispatch branching limit when calculating field flow.
-   * This can be overridden to a smaller value to improve performance (a
-   * value of 0 disables field flow), or a larger value to get more results.
-   */
-  int fieldFlowBranchLimit() { result = 2 }
-
-  /**
-   * Gets a data flow configuration feature to add restrictions to the set of
-   * valid flow paths.
-   *
-   * - `FeatureHasSourceCallContext`:
-   *    Assume that sources have some existing call context to disallow
-   *    conflicting return-flow directly following the source.
-   * - `FeatureHasSinkCallContext`:
-   *    Assume that sinks have some existing call context to disallow
-   *    conflicting argument-to-parameter flow directly preceding the sink.
-   * - `FeatureEqualSourceSinkCallContext`:
-   *    Implies both of the above and additionally ensures that the entire flow
-   *    path preserves the call context.
-   *
-   * These features are generally not relevant for typical end-to-end data flow
-   * queries, but should only be used for constructing paths that need to
-   * somehow be pluggable in another path context.
-   */
-  FlowFeature getAFeature() { none() }
-
-  /** Holds if sources should be grouped in the result of `hasFlowPath`. */
-  predicate sourceGrouping(Node source, string sourceGroup) { none() }
-
-  /** Holds if sinks should be grouped in the result of `hasFlowPath`. */
-  predicate sinkGrouping(Node sink, string sinkGroup) { none() }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   */
-  predicate hasFlow(Node source, Node sink) { hasFlow(source, sink, this) }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   *
-   * The corresponding paths are generated from the end-points and the graph
-   * included in the module `PathGraph`.
-   */
-  predicate hasFlowPath(PathNode source, PathNode sink) { hasFlowPath(source, sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowTo(Node sink) { hasFlowTo(sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowToExpr(DataFlowExpr sink) { this.hasFlowTo(exprNode(sink)) }
-
-  /**
-   * Holds if hidden nodes should be included in the data flow graph.
-   *
-   * This feature should only be used for debugging or when the data flow graph
-   * is not visualized (for example in a `path-problem` query).
-   */
-  predicate includeHiddenNodes() { none() }
-}
-
-/**
- * This class exists to prevent mutual recursion between the user-overridden
- * member predicates of `Configuration` and the rest of the data-flow library.
- * Good performance cannot be guaranteed in the presence of such recursion, so
- * it should be replaced by using more than one copy of the data flow library.
- */
-abstract deprecated private class ConfigurationRecursionPrevention extends Configuration {
-  bindingset[this]
-  ConfigurationRecursionPrevention() { any() }
-
-  override predicate hasFlow(Node source, Node sink) {
-    strictcount(Node n | this.isSource(n)) < 0
-    or
-    strictcount(Node n | this.isSource(n, _)) < 0
-    or
-    strictcount(Node n | this.isSink(n)) < 0
-    or
-    strictcount(Node n | this.isSink(n, _)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, _, n2, _)) < 0
-    or
-    super.hasFlow(source, sink)
-  }
-}
-
-deprecated private FlowState relevantState(Configuration config) {
-  config.isSource(_, result) or
-  config.isSink(_, result) or
-  config.isBarrier(_, result) or
-  config.isAdditionalFlowStep(_, result, _, _) or
-  config.isAdditionalFlowStep(_, _, _, result)
-}
-
-private newtype TConfigState =
-  deprecated TMkConfigState(Configuration config, FlowState state) {
-    state = relevantState(config) or state instanceof FlowStateEmpty
-  }
-
-deprecated private Configuration getConfig(TConfigState state) { state = TMkConfigState(result, _) }
-
-deprecated private FlowState getState(TConfigState state) { state = TMkConfigState(_, result) }
-
-deprecated private predicate singleConfiguration() { 1 = strictcount(Configuration c) }
-
-deprecated private module Config implements FullStateConfigSig {
-  class FlowState = TConfigState;
-
-  predicate isSource(Node source, FlowState state) {
-    getConfig(state).isSource(source, getState(state))
-    or
-    getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isSink(Node sink) { none() }
-
-  predicate isSink(Node sink, FlowState state) {
-    getConfig(state).isSink(sink, getState(state))
-    or
-    getConfig(state).isSink(sink) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isBarrier(Node node) { none() }
-
-  predicate isBarrier(Node node, FlowState state) {
-    getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node)
-  }
-
-  predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
-
-  predicate isBarrierOut(Node node) { any(Configuration config).isBarrierOut(node) }
-
-  predicate isBarrierIn(Node node, FlowState state) { none() }
-
-  predicate isBarrierOut(Node node, FlowState state) { none() }
-
-  predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
-    singleConfiguration() and
-    any(Configuration config).isAdditionalFlowStep(node1, node2) and
-    model = ""
-  }
-
-  predicate isAdditionalFlowStep(
-    Node node1, FlowState state1, Node node2, FlowState state2, string model
-  ) {
-    getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1) and
-    model = ""
-    or
-    not singleConfiguration() and
-    getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1 and
-    model = ""
-  }
-
-  predicate allowImplicitRead(Node node, ContentSet c) {
-    any(Configuration config).allowImplicitRead(node, c)
-  }
-
-  predicate neverSkip(Node node) { none() }
-
-  int fieldFlowBranchLimit() { result = min(any(Configuration config).fieldFlowBranchLimit()) }
-
-  int accessPathLimit() { result = 5 }
-
-  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
-
-  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
-
-  predicate observeDiffInformedIncrementalMode() { none() }
-}
-
-deprecated private import Impl<Config> as I
-
-/**
- * A `Node` augmented with a call context (except for sinks), an access path, and a configuration.
- * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
- */
-deprecated class PathNode instanceof I::PathNode {
-  /** Gets a textual representation of this element. */
-  final string toString() { result = super.toString() }
-
-  /**
-   * Gets a textual representation of this element, including a textual
-   * representation of the call context.
-   */
-  final string toStringWithContext() { result = super.toStringWithContext() }
-
-  /**
-   * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
-   * For more information, see
-   * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
-   */
-  final predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    super.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-
-  /** Gets the underlying `Node`. */
-  final Node getNode() { result = super.getNode() }
-
-  /** Gets the `FlowState` of this node. */
-  deprecated final FlowState getState() { result = getState(super.getState()) }
-
-  /** Gets the associated configuration. */
-  deprecated final Configuration getConfiguration() { result = getConfig(super.getState()) }
-
-  /** Gets a successor of this node, if any. */
-  final PathNode getASuccessor() { result = super.getASuccessor() }
-
-  /** Holds if this node is a source. */
-  final predicate isSource() { super.isSource() }
-
-  /** Holds if this node is a grouping of source nodes. */
-  final predicate isSourceGroup(string group) { super.isSourceGroup(group) }
-
-  /** Holds if this node is a grouping of sink nodes. */
-  final predicate isSinkGroup(string group) { super.isSinkGroup(group) }
-}
-
-deprecated module PathGraph = I::PathGraph;
-
-deprecated private predicate hasFlow(Node source, Node sink, Configuration config) {
-  exists(PathNode source0, PathNode sink0 |
-    hasFlowPath(source0, sink0, config) and
-    source0.getNode() = source and
-    sink0.getNode() = sink
-  )
-}
-
-deprecated private predicate hasFlowPath(PathNode source, PathNode sink, Configuration config) {
-  I::flowPath(source, sink) and source.getConfiguration() = config
-}
-
-deprecated private predicate hasFlowTo(Node sink, Configuration config) { hasFlow(_, sink, config) }
-
-deprecated predicate flowsTo = hasFlow/3;
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll
deleted file mode 100644
index 17def0c431d..00000000000
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides a `Configuration` class backwards-compatible interface to the data
- * flow library.
- */
-
-private import DataFlowImplCommon
-private import DataFlowImplSpecific::Private
-import DataFlowImplSpecific::Public
-private import DataFlowImpl
-import DataFlowImplCommonPublic
-deprecated import FlowStateString
-private import codeql.util.Unit
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural data flow analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the global data flow library must define its own unique extension
- * of this abstract class. To create a configuration, extend this class with
- * a subclass whose characteristic predicate is a unique singleton string.
- * For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends DataFlow::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isBarrier`.
- *   // Optionally override `isAdditionalFlowStep`.
- * }
- * ```
- * Conceptually, this defines a graph where the nodes are `DataFlow::Node`s and
- * the edges are those data-flow steps that preserve the value of the node
- * along with any additional edges defined by `isAdditionalFlowStep`.
- * Specifying nodes in `isBarrier` will remove those nodes from the graph, and
- * specifying nodes in `isBarrierIn` and/or `isBarrierOut` will remove in-going
- * and/or out-going edges from those nodes, respectively.
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but two classes extending
- * `DataFlow::Configuration` should never depend on each other. One of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`.
- */
-abstract deprecated class Configuration extends string {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant data flow source.
-   */
-  predicate isSource(Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant data flow source with the given initial
-   * `state`.
-   */
-  predicate isSource(Node source, FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink.
-   */
-  predicate isSink(Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink accepting `state`.
-   */
-  predicate isSink(Node sink, FlowState state) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited. This completely removes
-   * `node` from the data flow graph.
-   */
-  predicate isBarrier(Node node) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited when the flow state is
-   * `state`.
-   */
-  predicate isBarrier(Node node, FlowState state) { none() }
-
-  /** Holds if data flow into `node` is prohibited. */
-  predicate isBarrierIn(Node node) { none() }
-
-  /** Holds if data flow out of `node` is prohibited. */
-  predicate isBarrierOut(Node node) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   */
-  predicate isAdditionalFlowStep(Node node1, Node node2) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
-    none()
-  }
-
-  /**
-   * Holds if an arbitrary number of implicit read steps of content `c` may be
-   * taken at `node`.
-   */
-  predicate allowImplicitRead(Node node, ContentSet c) { none() }
-
-  /**
-   * Gets the virtual dispatch branching limit when calculating field flow.
-   * This can be overridden to a smaller value to improve performance (a
-   * value of 0 disables field flow), or a larger value to get more results.
-   */
-  int fieldFlowBranchLimit() { result = 2 }
-
-  /**
-   * Gets a data flow configuration feature to add restrictions to the set of
-   * valid flow paths.
-   *
-   * - `FeatureHasSourceCallContext`:
-   *    Assume that sources have some existing call context to disallow
-   *    conflicting return-flow directly following the source.
-   * - `FeatureHasSinkCallContext`:
-   *    Assume that sinks have some existing call context to disallow
-   *    conflicting argument-to-parameter flow directly preceding the sink.
-   * - `FeatureEqualSourceSinkCallContext`:
-   *    Implies both of the above and additionally ensures that the entire flow
-   *    path preserves the call context.
-   *
-   * These features are generally not relevant for typical end-to-end data flow
-   * queries, but should only be used for constructing paths that need to
-   * somehow be pluggable in another path context.
-   */
-  FlowFeature getAFeature() { none() }
-
-  /** Holds if sources should be grouped in the result of `hasFlowPath`. */
-  predicate sourceGrouping(Node source, string sourceGroup) { none() }
-
-  /** Holds if sinks should be grouped in the result of `hasFlowPath`. */
-  predicate sinkGrouping(Node sink, string sinkGroup) { none() }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   */
-  predicate hasFlow(Node source, Node sink) { hasFlow(source, sink, this) }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   *
-   * The corresponding paths are generated from the end-points and the graph
-   * included in the module `PathGraph`.
-   */
-  predicate hasFlowPath(PathNode source, PathNode sink) { hasFlowPath(source, sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowTo(Node sink) { hasFlowTo(sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowToExpr(DataFlowExpr sink) { this.hasFlowTo(exprNode(sink)) }
-
-  /**
-   * Holds if hidden nodes should be included in the data flow graph.
-   *
-   * This feature should only be used for debugging or when the data flow graph
-   * is not visualized (for example in a `path-problem` query).
-   */
-  predicate includeHiddenNodes() { none() }
-}
-
-/**
- * This class exists to prevent mutual recursion between the user-overridden
- * member predicates of `Configuration` and the rest of the data-flow library.
- * Good performance cannot be guaranteed in the presence of such recursion, so
- * it should be replaced by using more than one copy of the data flow library.
- */
-abstract deprecated private class ConfigurationRecursionPrevention extends Configuration {
-  bindingset[this]
-  ConfigurationRecursionPrevention() { any() }
-
-  override predicate hasFlow(Node source, Node sink) {
-    strictcount(Node n | this.isSource(n)) < 0
-    or
-    strictcount(Node n | this.isSource(n, _)) < 0
-    or
-    strictcount(Node n | this.isSink(n)) < 0
-    or
-    strictcount(Node n | this.isSink(n, _)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, _, n2, _)) < 0
-    or
-    super.hasFlow(source, sink)
-  }
-}
-
-deprecated private FlowState relevantState(Configuration config) {
-  config.isSource(_, result) or
-  config.isSink(_, result) or
-  config.isBarrier(_, result) or
-  config.isAdditionalFlowStep(_, result, _, _) or
-  config.isAdditionalFlowStep(_, _, _, result)
-}
-
-private newtype TConfigState =
-  deprecated TMkConfigState(Configuration config, FlowState state) {
-    state = relevantState(config) or state instanceof FlowStateEmpty
-  }
-
-deprecated private Configuration getConfig(TConfigState state) { state = TMkConfigState(result, _) }
-
-deprecated private FlowState getState(TConfigState state) { state = TMkConfigState(_, result) }
-
-deprecated private predicate singleConfiguration() { 1 = strictcount(Configuration c) }
-
-deprecated private module Config implements FullStateConfigSig {
-  class FlowState = TConfigState;
-
-  predicate isSource(Node source, FlowState state) {
-    getConfig(state).isSource(source, getState(state))
-    or
-    getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isSink(Node sink) { none() }
-
-  predicate isSink(Node sink, FlowState state) {
-    getConfig(state).isSink(sink, getState(state))
-    or
-    getConfig(state).isSink(sink) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isBarrier(Node node) { none() }
-
-  predicate isBarrier(Node node, FlowState state) {
-    getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node)
-  }
-
-  predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
-
-  predicate isBarrierOut(Node node) { any(Configuration config).isBarrierOut(node) }
-
-  predicate isBarrierIn(Node node, FlowState state) { none() }
-
-  predicate isBarrierOut(Node node, FlowState state) { none() }
-
-  predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
-    singleConfiguration() and
-    any(Configuration config).isAdditionalFlowStep(node1, node2) and
-    model = ""
-  }
-
-  predicate isAdditionalFlowStep(
-    Node node1, FlowState state1, Node node2, FlowState state2, string model
-  ) {
-    getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1) and
-    model = ""
-    or
-    not singleConfiguration() and
-    getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1 and
-    model = ""
-  }
-
-  predicate allowImplicitRead(Node node, ContentSet c) {
-    any(Configuration config).allowImplicitRead(node, c)
-  }
-
-  predicate neverSkip(Node node) { none() }
-
-  int fieldFlowBranchLimit() { result = min(any(Configuration config).fieldFlowBranchLimit()) }
-
-  int accessPathLimit() { result = 5 }
-
-  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
-
-  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
-
-  predicate observeDiffInformedIncrementalMode() { none() }
-}
-
-deprecated private import Impl<Config> as I
-
-/**
- * A `Node` augmented with a call context (except for sinks), an access path, and a configuration.
- * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
- */
-deprecated class PathNode instanceof I::PathNode {
-  /** Gets a textual representation of this element. */
-  final string toString() { result = super.toString() }
-
-  /**
-   * Gets a textual representation of this element, including a textual
-   * representation of the call context.
-   */
-  final string toStringWithContext() { result = super.toStringWithContext() }
-
-  /**
-   * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
-   * For more information, see
-   * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
-   */
-  final predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    super.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-
-  /** Gets the underlying `Node`. */
-  final Node getNode() { result = super.getNode() }
-
-  /** Gets the `FlowState` of this node. */
-  deprecated final FlowState getState() { result = getState(super.getState()) }
-
-  /** Gets the associated configuration. */
-  deprecated final Configuration getConfiguration() { result = getConfig(super.getState()) }
-
-  /** Gets a successor of this node, if any. */
-  final PathNode getASuccessor() { result = super.getASuccessor() }
-
-  /** Holds if this node is a source. */
-  final predicate isSource() { super.isSource() }
-
-  /** Holds if this node is a grouping of source nodes. */
-  final predicate isSourceGroup(string group) { super.isSourceGroup(group) }
-
-  /** Holds if this node is a grouping of sink nodes. */
-  final predicate isSinkGroup(string group) { super.isSinkGroup(group) }
-}
-
-deprecated module PathGraph = I::PathGraph;
-
-deprecated private predicate hasFlow(Node source, Node sink, Configuration config) {
-  exists(PathNode source0, PathNode sink0 |
-    hasFlowPath(source0, sink0, config) and
-    source0.getNode() = source and
-    sink0.getNode() = sink
-  )
-}
-
-deprecated private predicate hasFlowPath(PathNode source, PathNode sink, Configuration config) {
-  I::flowPath(source, sink) and source.getConfiguration() = config
-}
-
-deprecated private predicate hasFlowTo(Node sink, Configuration config) { hasFlow(_, sink, config) }
-
-deprecated predicate flowsTo = hasFlow/3;
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll
deleted file mode 100644
index 17def0c431d..00000000000
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides a `Configuration` class backwards-compatible interface to the data
- * flow library.
- */
-
-private import DataFlowImplCommon
-private import DataFlowImplSpecific::Private
-import DataFlowImplSpecific::Public
-private import DataFlowImpl
-import DataFlowImplCommonPublic
-deprecated import FlowStateString
-private import codeql.util.Unit
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural data flow analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the global data flow library must define its own unique extension
- * of this abstract class. To create a configuration, extend this class with
- * a subclass whose characteristic predicate is a unique singleton string.
- * For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends DataFlow::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isBarrier`.
- *   // Optionally override `isAdditionalFlowStep`.
- * }
- * ```
- * Conceptually, this defines a graph where the nodes are `DataFlow::Node`s and
- * the edges are those data-flow steps that preserve the value of the node
- * along with any additional edges defined by `isAdditionalFlowStep`.
- * Specifying nodes in `isBarrier` will remove those nodes from the graph, and
- * specifying nodes in `isBarrierIn` and/or `isBarrierOut` will remove in-going
- * and/or out-going edges from those nodes, respectively.
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but two classes extending
- * `DataFlow::Configuration` should never depend on each other. One of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`.
- */
-abstract deprecated class Configuration extends string {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant data flow source.
-   */
-  predicate isSource(Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant data flow source with the given initial
-   * `state`.
-   */
-  predicate isSource(Node source, FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink.
-   */
-  predicate isSink(Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink accepting `state`.
-   */
-  predicate isSink(Node sink, FlowState state) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited. This completely removes
-   * `node` from the data flow graph.
-   */
-  predicate isBarrier(Node node) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited when the flow state is
-   * `state`.
-   */
-  predicate isBarrier(Node node, FlowState state) { none() }
-
-  /** Holds if data flow into `node` is prohibited. */
-  predicate isBarrierIn(Node node) { none() }
-
-  /** Holds if data flow out of `node` is prohibited. */
-  predicate isBarrierOut(Node node) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   */
-  predicate isAdditionalFlowStep(Node node1, Node node2) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
-    none()
-  }
-
-  /**
-   * Holds if an arbitrary number of implicit read steps of content `c` may be
-   * taken at `node`.
-   */
-  predicate allowImplicitRead(Node node, ContentSet c) { none() }
-
-  /**
-   * Gets the virtual dispatch branching limit when calculating field flow.
-   * This can be overridden to a smaller value to improve performance (a
-   * value of 0 disables field flow), or a larger value to get more results.
-   */
-  int fieldFlowBranchLimit() { result = 2 }
-
-  /**
-   * Gets a data flow configuration feature to add restrictions to the set of
-   * valid flow paths.
-   *
-   * - `FeatureHasSourceCallContext`:
-   *    Assume that sources have some existing call context to disallow
-   *    conflicting return-flow directly following the source.
-   * - `FeatureHasSinkCallContext`:
-   *    Assume that sinks have some existing call context to disallow
-   *    conflicting argument-to-parameter flow directly preceding the sink.
-   * - `FeatureEqualSourceSinkCallContext`:
-   *    Implies both of the above and additionally ensures that the entire flow
-   *    path preserves the call context.
-   *
-   * These features are generally not relevant for typical end-to-end data flow
-   * queries, but should only be used for constructing paths that need to
-   * somehow be pluggable in another path context.
-   */
-  FlowFeature getAFeature() { none() }
-
-  /** Holds if sources should be grouped in the result of `hasFlowPath`. */
-  predicate sourceGrouping(Node source, string sourceGroup) { none() }
-
-  /** Holds if sinks should be grouped in the result of `hasFlowPath`. */
-  predicate sinkGrouping(Node sink, string sinkGroup) { none() }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   */
-  predicate hasFlow(Node source, Node sink) { hasFlow(source, sink, this) }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   *
-   * The corresponding paths are generated from the end-points and the graph
-   * included in the module `PathGraph`.
-   */
-  predicate hasFlowPath(PathNode source, PathNode sink) { hasFlowPath(source, sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowTo(Node sink) { hasFlowTo(sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowToExpr(DataFlowExpr sink) { this.hasFlowTo(exprNode(sink)) }
-
-  /**
-   * Holds if hidden nodes should be included in the data flow graph.
-   *
-   * This feature should only be used for debugging or when the data flow graph
-   * is not visualized (for example in a `path-problem` query).
-   */
-  predicate includeHiddenNodes() { none() }
-}
-
-/**
- * This class exists to prevent mutual recursion between the user-overridden
- * member predicates of `Configuration` and the rest of the data-flow library.
- * Good performance cannot be guaranteed in the presence of such recursion, so
- * it should be replaced by using more than one copy of the data flow library.
- */
-abstract deprecated private class ConfigurationRecursionPrevention extends Configuration {
-  bindingset[this]
-  ConfigurationRecursionPrevention() { any() }
-
-  override predicate hasFlow(Node source, Node sink) {
-    strictcount(Node n | this.isSource(n)) < 0
-    or
-    strictcount(Node n | this.isSource(n, _)) < 0
-    or
-    strictcount(Node n | this.isSink(n)) < 0
-    or
-    strictcount(Node n | this.isSink(n, _)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, _, n2, _)) < 0
-    or
-    super.hasFlow(source, sink)
-  }
-}
-
-deprecated private FlowState relevantState(Configuration config) {
-  config.isSource(_, result) or
-  config.isSink(_, result) or
-  config.isBarrier(_, result) or
-  config.isAdditionalFlowStep(_, result, _, _) or
-  config.isAdditionalFlowStep(_, _, _, result)
-}
-
-private newtype TConfigState =
-  deprecated TMkConfigState(Configuration config, FlowState state) {
-    state = relevantState(config) or state instanceof FlowStateEmpty
-  }
-
-deprecated private Configuration getConfig(TConfigState state) { state = TMkConfigState(result, _) }
-
-deprecated private FlowState getState(TConfigState state) { state = TMkConfigState(_, result) }
-
-deprecated private predicate singleConfiguration() { 1 = strictcount(Configuration c) }
-
-deprecated private module Config implements FullStateConfigSig {
-  class FlowState = TConfigState;
-
-  predicate isSource(Node source, FlowState state) {
-    getConfig(state).isSource(source, getState(state))
-    or
-    getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isSink(Node sink) { none() }
-
-  predicate isSink(Node sink, FlowState state) {
-    getConfig(state).isSink(sink, getState(state))
-    or
-    getConfig(state).isSink(sink) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isBarrier(Node node) { none() }
-
-  predicate isBarrier(Node node, FlowState state) {
-    getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node)
-  }
-
-  predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
-
-  predicate isBarrierOut(Node node) { any(Configuration config).isBarrierOut(node) }
-
-  predicate isBarrierIn(Node node, FlowState state) { none() }
-
-  predicate isBarrierOut(Node node, FlowState state) { none() }
-
-  predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
-    singleConfiguration() and
-    any(Configuration config).isAdditionalFlowStep(node1, node2) and
-    model = ""
-  }
-
-  predicate isAdditionalFlowStep(
-    Node node1, FlowState state1, Node node2, FlowState state2, string model
-  ) {
-    getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1) and
-    model = ""
-    or
-    not singleConfiguration() and
-    getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1 and
-    model = ""
-  }
-
-  predicate allowImplicitRead(Node node, ContentSet c) {
-    any(Configuration config).allowImplicitRead(node, c)
-  }
-
-  predicate neverSkip(Node node) { none() }
-
-  int fieldFlowBranchLimit() { result = min(any(Configuration config).fieldFlowBranchLimit()) }
-
-  int accessPathLimit() { result = 5 }
-
-  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
-
-  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
-
-  predicate observeDiffInformedIncrementalMode() { none() }
-}
-
-deprecated private import Impl<Config> as I
-
-/**
- * A `Node` augmented with a call context (except for sinks), an access path, and a configuration.
- * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
- */
-deprecated class PathNode instanceof I::PathNode {
-  /** Gets a textual representation of this element. */
-  final string toString() { result = super.toString() }
-
-  /**
-   * Gets a textual representation of this element, including a textual
-   * representation of the call context.
-   */
-  final string toStringWithContext() { result = super.toStringWithContext() }
-
-  /**
-   * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
-   * For more information, see
-   * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
-   */
-  final predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    super.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-
-  /** Gets the underlying `Node`. */
-  final Node getNode() { result = super.getNode() }
-
-  /** Gets the `FlowState` of this node. */
-  deprecated final FlowState getState() { result = getState(super.getState()) }
-
-  /** Gets the associated configuration. */
-  deprecated final Configuration getConfiguration() { result = getConfig(super.getState()) }
-
-  /** Gets a successor of this node, if any. */
-  final PathNode getASuccessor() { result = super.getASuccessor() }
-
-  /** Holds if this node is a source. */
-  final predicate isSource() { super.isSource() }
-
-  /** Holds if this node is a grouping of source nodes. */
-  final predicate isSourceGroup(string group) { super.isSourceGroup(group) }
-
-  /** Holds if this node is a grouping of sink nodes. */
-  final predicate isSinkGroup(string group) { super.isSinkGroup(group) }
-}
-
-deprecated module PathGraph = I::PathGraph;
-
-deprecated private predicate hasFlow(Node source, Node sink, Configuration config) {
-  exists(PathNode source0, PathNode sink0 |
-    hasFlowPath(source0, sink0, config) and
-    source0.getNode() = source and
-    sink0.getNode() = sink
-  )
-}
-
-deprecated private predicate hasFlowPath(PathNode source, PathNode sink, Configuration config) {
-  I::flowPath(source, sink) and source.getConfiguration() = config
-}
-
-deprecated private predicate hasFlowTo(Node sink, Configuration config) { hasFlow(_, sink, config) }
-
-deprecated predicate flowsTo = hasFlow/3;
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll
deleted file mode 100644
index 17def0c431d..00000000000
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides a `Configuration` class backwards-compatible interface to the data
- * flow library.
- */
-
-private import DataFlowImplCommon
-private import DataFlowImplSpecific::Private
-import DataFlowImplSpecific::Public
-private import DataFlowImpl
-import DataFlowImplCommonPublic
-deprecated import FlowStateString
-private import codeql.util.Unit
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural data flow analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the global data flow library must define its own unique extension
- * of this abstract class. To create a configuration, extend this class with
- * a subclass whose characteristic predicate is a unique singleton string.
- * For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends DataFlow::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isBarrier`.
- *   // Optionally override `isAdditionalFlowStep`.
- * }
- * ```
- * Conceptually, this defines a graph where the nodes are `DataFlow::Node`s and
- * the edges are those data-flow steps that preserve the value of the node
- * along with any additional edges defined by `isAdditionalFlowStep`.
- * Specifying nodes in `isBarrier` will remove those nodes from the graph, and
- * specifying nodes in `isBarrierIn` and/or `isBarrierOut` will remove in-going
- * and/or out-going edges from those nodes, respectively.
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but two classes extending
- * `DataFlow::Configuration` should never depend on each other. One of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`.
- */
-abstract deprecated class Configuration extends string {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant data flow source.
-   */
-  predicate isSource(Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant data flow source with the given initial
-   * `state`.
-   */
-  predicate isSource(Node source, FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink.
-   */
-  predicate isSink(Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink accepting `state`.
-   */
-  predicate isSink(Node sink, FlowState state) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited. This completely removes
-   * `node` from the data flow graph.
-   */
-  predicate isBarrier(Node node) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited when the flow state is
-   * `state`.
-   */
-  predicate isBarrier(Node node, FlowState state) { none() }
-
-  /** Holds if data flow into `node` is prohibited. */
-  predicate isBarrierIn(Node node) { none() }
-
-  /** Holds if data flow out of `node` is prohibited. */
-  predicate isBarrierOut(Node node) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   */
-  predicate isAdditionalFlowStep(Node node1, Node node2) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
-    none()
-  }
-
-  /**
-   * Holds if an arbitrary number of implicit read steps of content `c` may be
-   * taken at `node`.
-   */
-  predicate allowImplicitRead(Node node, ContentSet c) { none() }
-
-  /**
-   * Gets the virtual dispatch branching limit when calculating field flow.
-   * This can be overridden to a smaller value to improve performance (a
-   * value of 0 disables field flow), or a larger value to get more results.
-   */
-  int fieldFlowBranchLimit() { result = 2 }
-
-  /**
-   * Gets a data flow configuration feature to add restrictions to the set of
-   * valid flow paths.
-   *
-   * - `FeatureHasSourceCallContext`:
-   *    Assume that sources have some existing call context to disallow
-   *    conflicting return-flow directly following the source.
-   * - `FeatureHasSinkCallContext`:
-   *    Assume that sinks have some existing call context to disallow
-   *    conflicting argument-to-parameter flow directly preceding the sink.
-   * - `FeatureEqualSourceSinkCallContext`:
-   *    Implies both of the above and additionally ensures that the entire flow
-   *    path preserves the call context.
-   *
-   * These features are generally not relevant for typical end-to-end data flow
-   * queries, but should only be used for constructing paths that need to
-   * somehow be pluggable in another path context.
-   */
-  FlowFeature getAFeature() { none() }
-
-  /** Holds if sources should be grouped in the result of `hasFlowPath`. */
-  predicate sourceGrouping(Node source, string sourceGroup) { none() }
-
-  /** Holds if sinks should be grouped in the result of `hasFlowPath`. */
-  predicate sinkGrouping(Node sink, string sinkGroup) { none() }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   */
-  predicate hasFlow(Node source, Node sink) { hasFlow(source, sink, this) }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   *
-   * The corresponding paths are generated from the end-points and the graph
-   * included in the module `PathGraph`.
-   */
-  predicate hasFlowPath(PathNode source, PathNode sink) { hasFlowPath(source, sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowTo(Node sink) { hasFlowTo(sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowToExpr(DataFlowExpr sink) { this.hasFlowTo(exprNode(sink)) }
-
-  /**
-   * Holds if hidden nodes should be included in the data flow graph.
-   *
-   * This feature should only be used for debugging or when the data flow graph
-   * is not visualized (for example in a `path-problem` query).
-   */
-  predicate includeHiddenNodes() { none() }
-}
-
-/**
- * This class exists to prevent mutual recursion between the user-overridden
- * member predicates of `Configuration` and the rest of the data-flow library.
- * Good performance cannot be guaranteed in the presence of such recursion, so
- * it should be replaced by using more than one copy of the data flow library.
- */
-abstract deprecated private class ConfigurationRecursionPrevention extends Configuration {
-  bindingset[this]
-  ConfigurationRecursionPrevention() { any() }
-
-  override predicate hasFlow(Node source, Node sink) {
-    strictcount(Node n | this.isSource(n)) < 0
-    or
-    strictcount(Node n | this.isSource(n, _)) < 0
-    or
-    strictcount(Node n | this.isSink(n)) < 0
-    or
-    strictcount(Node n | this.isSink(n, _)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, _, n2, _)) < 0
-    or
-    super.hasFlow(source, sink)
-  }
-}
-
-deprecated private FlowState relevantState(Configuration config) {
-  config.isSource(_, result) or
-  config.isSink(_, result) or
-  config.isBarrier(_, result) or
-  config.isAdditionalFlowStep(_, result, _, _) or
-  config.isAdditionalFlowStep(_, _, _, result)
-}
-
-private newtype TConfigState =
-  deprecated TMkConfigState(Configuration config, FlowState state) {
-    state = relevantState(config) or state instanceof FlowStateEmpty
-  }
-
-deprecated private Configuration getConfig(TConfigState state) { state = TMkConfigState(result, _) }
-
-deprecated private FlowState getState(TConfigState state) { state = TMkConfigState(_, result) }
-
-deprecated private predicate singleConfiguration() { 1 = strictcount(Configuration c) }
-
-deprecated private module Config implements FullStateConfigSig {
-  class FlowState = TConfigState;
-
-  predicate isSource(Node source, FlowState state) {
-    getConfig(state).isSource(source, getState(state))
-    or
-    getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isSink(Node sink) { none() }
-
-  predicate isSink(Node sink, FlowState state) {
-    getConfig(state).isSink(sink, getState(state))
-    or
-    getConfig(state).isSink(sink) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isBarrier(Node node) { none() }
-
-  predicate isBarrier(Node node, FlowState state) {
-    getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node)
-  }
-
-  predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
-
-  predicate isBarrierOut(Node node) { any(Configuration config).isBarrierOut(node) }
-
-  predicate isBarrierIn(Node node, FlowState state) { none() }
-
-  predicate isBarrierOut(Node node, FlowState state) { none() }
-
-  predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
-    singleConfiguration() and
-    any(Configuration config).isAdditionalFlowStep(node1, node2) and
-    model = ""
-  }
-
-  predicate isAdditionalFlowStep(
-    Node node1, FlowState state1, Node node2, FlowState state2, string model
-  ) {
-    getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1) and
-    model = ""
-    or
-    not singleConfiguration() and
-    getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1 and
-    model = ""
-  }
-
-  predicate allowImplicitRead(Node node, ContentSet c) {
-    any(Configuration config).allowImplicitRead(node, c)
-  }
-
-  predicate neverSkip(Node node) { none() }
-
-  int fieldFlowBranchLimit() { result = min(any(Configuration config).fieldFlowBranchLimit()) }
-
-  int accessPathLimit() { result = 5 }
-
-  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
-
-  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
-
-  predicate observeDiffInformedIncrementalMode() { none() }
-}
-
-deprecated private import Impl<Config> as I
-
-/**
- * A `Node` augmented with a call context (except for sinks), an access path, and a configuration.
- * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
- */
-deprecated class PathNode instanceof I::PathNode {
-  /** Gets a textual representation of this element. */
-  final string toString() { result = super.toString() }
-
-  /**
-   * Gets a textual representation of this element, including a textual
-   * representation of the call context.
-   */
-  final string toStringWithContext() { result = super.toStringWithContext() }
-
-  /**
-   * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
-   * For more information, see
-   * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
-   */
-  final predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    super.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-
-  /** Gets the underlying `Node`. */
-  final Node getNode() { result = super.getNode() }
-
-  /** Gets the `FlowState` of this node. */
-  deprecated final FlowState getState() { result = getState(super.getState()) }
-
-  /** Gets the associated configuration. */
-  deprecated final Configuration getConfiguration() { result = getConfig(super.getState()) }
-
-  /** Gets a successor of this node, if any. */
-  final PathNode getASuccessor() { result = super.getASuccessor() }
-
-  /** Holds if this node is a source. */
-  final predicate isSource() { super.isSource() }
-
-  /** Holds if this node is a grouping of source nodes. */
-  final predicate isSourceGroup(string group) { super.isSourceGroup(group) }
-
-  /** Holds if this node is a grouping of sink nodes. */
-  final predicate isSinkGroup(string group) { super.isSinkGroup(group) }
-}
-
-deprecated module PathGraph = I::PathGraph;
-
-deprecated private predicate hasFlow(Node source, Node sink, Configuration config) {
-  exists(PathNode source0, PathNode sink0 |
-    hasFlowPath(source0, sink0, config) and
-    source0.getNode() = source and
-    sink0.getNode() = sink
-  )
-}
-
-deprecated private predicate hasFlowPath(PathNode source, PathNode sink, Configuration config) {
-  I::flowPath(source, sink) and source.getConfiguration() = config
-}
-
-deprecated private predicate hasFlowTo(Node sink, Configuration config) { hasFlow(_, sink, config) }
-
-deprecated predicate flowsTo = hasFlow/3;
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPrivate.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPrivate.qll
index cab164846e2..5b1342bacd5 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPrivate.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPrivate.qll
@@ -731,11 +731,9 @@ module LocalFlow {
     or
     node2 = node1.(LocalFunctionCreationNode).getAnAccess(true)
     or
-    node1 =
-      unique(FlowSummaryNode n1 |
-        FlowSummaryImpl::Private::Steps::summaryLocalStep(n1.getSummaryNode(),
-          node2.(FlowSummaryNode).getSummaryNode(), true, _)
-      )
+    FlowSummaryImpl::Private::Steps::summaryLocalMustFlowStep(node1
+          .(FlowSummaryNode)
+          .getSummaryNode(), node2.(FlowSummaryNode).getSummaryNode())
   }
 }
 
@@ -885,6 +883,17 @@ private predicate fieldOrPropertyStore(Expr e, ContentSet c, Expr src, Expr q, b
         )
       )
   )
+  or
+  // A write to a dynamic property
+  exists(DynamicMemberAccess dma, AssignableDefinition def, DynamicProperty dp |
+    def.getTargetAccess() = dma and
+    dp.getAnAccess() = dma and
+    c.isDynamicProperty(dp) and
+    src = def.getSource() and
+    q = dma.getQualifier() and
+    e = def.getExpr() and
+    postUpdate = true
+  )
 }
 
 /**
@@ -896,6 +905,18 @@ private predicate fieldOrPropertyRead(Expr e1, ContentSet c, FieldOrPropertyRead
   c = e2.getTarget().(FieldOrProperty).getContentSet()
 }
 
+/**
+ * Holds if `e2` is an expression that reads the dynamic property `c` from
+ * expression `e1`.
+ */
+private predicate dynamicPropertyRead(Expr e1, ContentSet c, DynamicMemberRead e2) {
+  exists(DynamicPropertyContent dpc |
+    e1 = e2.getQualifier() and
+    dpc.getAnAccess() = e2 and
+    c.isDynamicProperty(dpc.getName())
+  )
+}
+
 /**
  * Holds if `ce` is a collection expression that adds `src` to the collection `ce`.
  */
@@ -1101,6 +1122,8 @@ private module Cached {
         |
           fieldOrPropertyRead(e, _, read)
           or
+          dynamicPropertyRead(e, _, read)
+          or
           arrayRead(e, read)
         )
       )
@@ -1142,6 +1165,7 @@ private module Cached {
   newtype TContent =
     TFieldContent(Field f) { f.isUnboundDeclaration() } or
     TPropertyContent(Property p) { p.isUnboundDeclaration() } or
+    TDynamicPropertyContent(DynamicProperty dp) or
     TElementContent() or
     TSyntheticFieldContent(SyntheticField f) or
     TPrimaryConstructorParameterContent(Parameter p) {
@@ -1156,12 +1180,16 @@ private module Cached {
   cached
   newtype TContentSet =
     TSingletonContent(Content c) { not c instanceof PropertyContent } or
-    TPropertyContentSet(Property p) { p.isUnboundDeclaration() }
+    TPropertyContentSet(Property p) { p.isUnboundDeclaration() } or
+    TDynamicPropertyContentSet(DynamicProperty dp)
 
   cached
   newtype TContentApprox =
     TFieldApproxContent(string firstChar) { firstChar = approximateFieldContent(_) } or
     TPropertyApproxContent(string firstChar) { firstChar = approximatePropertyContent(_) } or
+    TDynamicPropertyApproxContent(string firstChar) {
+      firstChar = approximateDynamicPropertyContent(_)
+    } or
     TElementApproxContent() or
     TSyntheticFieldApproxContent() or
     TPrimaryConstructorParameterApproxContent(string firstChar) {
@@ -2086,6 +2114,18 @@ class FieldOrProperty extends Assignable, Modifiable {
   }
 }
 
+/** A string that is a reference to a late-bound target of a dynamic member access. */
+class DynamicProperty extends string {
+  private DynamicMemberAccess dma;
+
+  DynamicProperty() { this = dma.getLateBoundTargetName() }
+
+  ContentSet getContentSet() { result.isDynamicProperty(this) }
+
+  /** Gets an access of this dynamic property. */
+  DynamicMemberAccess getAnAccess() { result = dma }
+}
+
 private class InstanceFieldOrProperty extends FieldOrProperty {
   InstanceFieldOrProperty() { not this.isStatic() }
 }
@@ -2344,6 +2384,11 @@ private class ReadStepConfiguration extends ControlFlowReachabilityConfiguration
     or
     exactScope = false and
     isSuccessor = true and
+    dynamicPropertyRead(e1, _, e2) and
+    scope = e2
+    or
+    exactScope = false and
+    isSuccessor = true and
     arrayRead(e1, e2) and
     scope = e2
     or
@@ -2476,6 +2521,8 @@ predicate readStep(Node node1, ContentSet c, Node node2) {
   exists(ReadStepConfiguration x | hasNodePath(x, node1, node2) |
     fieldOrPropertyRead(node1.asExpr(), c, node2.asExpr())
     or
+    dynamicPropertyRead(node1.asExpr(), c, node2.asExpr())
+    or
     node2.asExpr().(AwaitExpr).getExpr() = node1.asExpr() and
     c = getResultContent()
   )
@@ -3066,6 +3113,11 @@ class ContentApprox extends TContentApprox {
       this = TPropertyApproxContent(firstChar) and result = "approximated property " + firstChar
     )
     or
+    exists(string firstChar |
+      this = TDynamicPropertyApproxContent(firstChar) and
+      result = "approximated dynamic property " + firstChar
+    )
+    or
     this = TElementApproxContent() and result = "element"
     or
     this = TSyntheticFieldApproxContent() and result = "approximated synthetic field"
@@ -3097,6 +3149,11 @@ private string approximatePropertyContent(PropertyContent pc) {
   result = pc.getProperty().getName().prefix(1)
 }
 
+/** Gets a string for approximating the name of a dynamic property. */
+private string approximateDynamicPropertyContent(DynamicPropertyContent dpc) {
+  result = dpc.getName().prefix(1)
+}
+
 /**
  * Gets a string for approximating the name of a synthetic field corresponding
  * to a primary constructor parameter.
@@ -3112,6 +3169,8 @@ ContentApprox getContentApprox(Content c) {
   or
   result = TPropertyApproxContent(approximatePropertyContent(c))
   or
+  result = TDynamicPropertyApproxContent(approximateDynamicPropertyContent(c))
+  or
   c instanceof ElementContent and result = TElementApproxContent()
   or
   c instanceof SyntheticFieldContent and result = TSyntheticFieldApproxContent()
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPublic.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPublic.qll
index c5460652746..877630359fd 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPublic.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPublic.qll
@@ -239,6 +239,23 @@ class PropertyContent extends Content, TPropertyContent {
   override Location getLocation() { result = p.getLocation() }
 }
 
+/** A reference to a dynamic property. */
+class DynamicPropertyContent extends Content, TDynamicPropertyContent {
+  private DynamicProperty name;
+
+  DynamicPropertyContent() { this = TDynamicPropertyContent(name) }
+
+  /** Gets an access of this dynamic property. */
+  DynamicMemberAccess getAnAccess() { result = name.getAnAccess() }
+
+  override string toString() { result = "dynamic property " + name }
+
+  override EmptyLocation getLocation() { any() }
+
+  /** Gets the name that is referenced. */
+  string getName() { result = name }
+}
+
 /**
  * A reference to the index of an argument of a delegate call.
  */
@@ -324,6 +341,9 @@ class ContentSet extends TContentSet {
    */
   predicate isProperty(Property p) { this = TPropertyContentSet(p) }
 
+  /** Holds if this content set represents the dynamic property `name`. */
+  predicate isDynamicProperty(string name) { this = TDynamicPropertyContentSet(name) }
+
   /**
    * Holds if this content set represents the `i`th argument of a delegate call.
    */
@@ -348,6 +368,8 @@ class ContentSet extends TContentSet {
     this.isSingleton(result)
     or
     this.isProperty(result.(PropertyContent).getProperty())
+    or
+    this.isDynamicProperty(result.(DynamicPropertyContent).getName())
   }
 
   /** Gets a content that may be read from when reading from this set. */
@@ -362,6 +384,17 @@ class ContentSet extends TContentSet {
       or
       overridesOrImplementsSourceDecl(p1, p2)
     )
+    or
+    exists(FieldOrProperty p |
+      this = p.getContentSet() and
+      result.(DynamicPropertyContent).getName() = p.getName()
+    )
+    or
+    this.isDynamicProperty([
+        result.(DynamicPropertyContent).getName(),
+        result.(PropertyContent).getProperty().getName(),
+        result.(FieldContent).getField().getName()
+      ])
   }
 
   /** Gets a textual representation of this content set. */
@@ -375,6 +408,11 @@ class ContentSet extends TContentSet {
       this.isProperty(p) and
       result = "property " + p.getName()
     )
+    or
+    exists(string name |
+      this.isDynamicProperty(name) and
+      result = "dynamic property " + name
+    )
   }
 
   /** Gets the location of this content set. */
@@ -388,5 +426,8 @@ class ContentSet extends TContentSet {
       this.isProperty(p) and
       result = p.getLocation()
     )
+    or
+    this.isDynamicProperty(_) and
+    result instanceof EmptyLocation
   }
 }
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking1/TaintTrackingImpl.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
deleted file mode 100644
index 75e7856fd26..00000000000
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides an implementation of global (interprocedural) taint tracking.
- * This file re-exports the local (intraprocedural) taint-tracking analysis
- * from `TaintTrackingParameter::Public` and adds a global analysis, mainly
- * exposed through the `Configuration` class. For some languages, this file
- * exists in several identical copies, allowing queries to use multiple
- * `Configuration` classes that depend on each other without introducing
- * mutual recursion among those configurations.
- */
-
-import TaintTrackingParameter::Public
-private import TaintTrackingParameter::Private
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural taint tracking analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the taint tracking library must define its own unique extension of
- * this abstract class.
- *
- * A taint-tracking configuration is a special data flow configuration
- * (`DataFlow::Configuration`) that allows for flow through nodes that do not
- * necessarily preserve values but are still relevant from a taint tracking
- * perspective. (For example, string concatenation, where one of the operands
- * is tainted.)
- *
- * To create a configuration, extend this class with a subclass whose
- * characteristic predicate is a unique singleton string. For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends TaintTracking::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isSanitizer`.
- *   // Optionally override `isSanitizerIn`.
- *   // Optionally override `isSanitizerOut`.
- *   // Optionally override `isSanitizerGuard`.
- *   // Optionally override `isAdditionalTaintStep`.
- * }
- * ```
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but it is unsupported to depend on
- * another `TaintTracking::Configuration` or a `DataFlow::Configuration` in the
- * overridden predicates that define sources, sinks, or additional steps.
- * Instead, the dependency should go to a `TaintTracking2::Configuration` or a
- * `DataFlow2::Configuration`, `DataFlow3::Configuration`, etc.
- */
-abstract deprecated class Configuration extends DataFlow::Configuration {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant taint source.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant taint source with the given initial
-   * `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink accepting `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
-
-  /** Holds if the node `node` is a taint sanitizer. */
-  predicate isSanitizer(DataFlow::Node node) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node) {
-    this.isSanitizer(node) or
-    defaultTaintSanitizer(node)
-  }
-
-  /**
-   * Holds if the node `node` is a taint sanitizer when the flow state is
-   * `state`.
-   */
-  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
-    this.isSanitizer(node, state)
-  }
-
-  /** Holds if taint propagation into `node` is prohibited. */
-  predicate isSanitizerIn(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierIn(DataFlow::Node node) { this.isSanitizerIn(node) }
-
-  /** Holds if taint propagation out of `node` is prohibited. */
-  predicate isSanitizerOut(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   */
-  predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) { none() }
-
-  final override predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
-    this.isAdditionalTaintStep(node1, node2) or
-    defaultAdditionalTaintStep(node1, node2, _)
-  }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalTaintStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    none()
-  }
-
-  final override predicate isAdditionalFlowStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    this.isAdditionalTaintStep(node1, state1, node2, state2)
-  }
-
-  override predicate allowImplicitRead(DataFlow::Node node, DataFlow::ContentSet c) {
-    (
-      this.isSink(node) or
-      this.isSink(node, _) or
-      this.isAdditionalTaintStep(node, _) or
-      this.isAdditionalTaintStep(node, _, _, _)
-    ) and
-    defaultImplicitTaintRead(node, c)
-  }
-
-  /**
-   * Holds if taint may flow from `source` to `sink` for this configuration.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate hasFlow(DataFlow::Node source, DataFlow::Node sink) {
-    super.hasFlow(source, sink)
-  }
-}
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking1/TaintTrackingParameter.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking1/TaintTrackingParameter.qll
deleted file mode 100644
index 6fa484bea77..00000000000
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking1/TaintTrackingParameter.qll
+++ /dev/null
@@ -1,7 +0,0 @@
-import semmle.code.csharp.dataflow.internal.TaintTrackingPublic as Public
-
-module Private {
-  import semmle.code.csharp.dataflow.DataFlow::DataFlow as DataFlow
-  import semmle.code.csharp.dataflow.internal.DataFlowImpl as DataFlowInternal
-  import semmle.code.csharp.dataflow.internal.TaintTrackingPrivate
-}
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking2/TaintTrackingImpl.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking2/TaintTrackingImpl.qll
deleted file mode 100644
index 75e7856fd26..00000000000
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking2/TaintTrackingImpl.qll
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides an implementation of global (interprocedural) taint tracking.
- * This file re-exports the local (intraprocedural) taint-tracking analysis
- * from `TaintTrackingParameter::Public` and adds a global analysis, mainly
- * exposed through the `Configuration` class. For some languages, this file
- * exists in several identical copies, allowing queries to use multiple
- * `Configuration` classes that depend on each other without introducing
- * mutual recursion among those configurations.
- */
-
-import TaintTrackingParameter::Public
-private import TaintTrackingParameter::Private
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural taint tracking analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the taint tracking library must define its own unique extension of
- * this abstract class.
- *
- * A taint-tracking configuration is a special data flow configuration
- * (`DataFlow::Configuration`) that allows for flow through nodes that do not
- * necessarily preserve values but are still relevant from a taint tracking
- * perspective. (For example, string concatenation, where one of the operands
- * is tainted.)
- *
- * To create a configuration, extend this class with a subclass whose
- * characteristic predicate is a unique singleton string. For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends TaintTracking::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isSanitizer`.
- *   // Optionally override `isSanitizerIn`.
- *   // Optionally override `isSanitizerOut`.
- *   // Optionally override `isSanitizerGuard`.
- *   // Optionally override `isAdditionalTaintStep`.
- * }
- * ```
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but it is unsupported to depend on
- * another `TaintTracking::Configuration` or a `DataFlow::Configuration` in the
- * overridden predicates that define sources, sinks, or additional steps.
- * Instead, the dependency should go to a `TaintTracking2::Configuration` or a
- * `DataFlow2::Configuration`, `DataFlow3::Configuration`, etc.
- */
-abstract deprecated class Configuration extends DataFlow::Configuration {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant taint source.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant taint source with the given initial
-   * `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink accepting `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
-
-  /** Holds if the node `node` is a taint sanitizer. */
-  predicate isSanitizer(DataFlow::Node node) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node) {
-    this.isSanitizer(node) or
-    defaultTaintSanitizer(node)
-  }
-
-  /**
-   * Holds if the node `node` is a taint sanitizer when the flow state is
-   * `state`.
-   */
-  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
-    this.isSanitizer(node, state)
-  }
-
-  /** Holds if taint propagation into `node` is prohibited. */
-  predicate isSanitizerIn(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierIn(DataFlow::Node node) { this.isSanitizerIn(node) }
-
-  /** Holds if taint propagation out of `node` is prohibited. */
-  predicate isSanitizerOut(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   */
-  predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) { none() }
-
-  final override predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
-    this.isAdditionalTaintStep(node1, node2) or
-    defaultAdditionalTaintStep(node1, node2, _)
-  }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalTaintStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    none()
-  }
-
-  final override predicate isAdditionalFlowStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    this.isAdditionalTaintStep(node1, state1, node2, state2)
-  }
-
-  override predicate allowImplicitRead(DataFlow::Node node, DataFlow::ContentSet c) {
-    (
-      this.isSink(node) or
-      this.isSink(node, _) or
-      this.isAdditionalTaintStep(node, _) or
-      this.isAdditionalTaintStep(node, _, _, _)
-    ) and
-    defaultImplicitTaintRead(node, c)
-  }
-
-  /**
-   * Holds if taint may flow from `source` to `sink` for this configuration.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate hasFlow(DataFlow::Node source, DataFlow::Node sink) {
-    super.hasFlow(source, sink)
-  }
-}
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking2/TaintTrackingParameter.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking2/TaintTrackingParameter.qll
deleted file mode 100644
index 6a8fa23ef31..00000000000
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking2/TaintTrackingParameter.qll
+++ /dev/null
@@ -1,6 +0,0 @@
-import semmle.code.csharp.dataflow.internal.TaintTrackingPublic as Public
-
-module Private {
-  import semmle.code.csharp.dataflow.DataFlow2::DataFlow2 as DataFlow
-  import semmle.code.csharp.dataflow.internal.TaintTrackingPrivate
-}
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking3/TaintTrackingImpl.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking3/TaintTrackingImpl.qll
deleted file mode 100644
index 75e7856fd26..00000000000
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking3/TaintTrackingImpl.qll
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides an implementation of global (interprocedural) taint tracking.
- * This file re-exports the local (intraprocedural) taint-tracking analysis
- * from `TaintTrackingParameter::Public` and adds a global analysis, mainly
- * exposed through the `Configuration` class. For some languages, this file
- * exists in several identical copies, allowing queries to use multiple
- * `Configuration` classes that depend on each other without introducing
- * mutual recursion among those configurations.
- */
-
-import TaintTrackingParameter::Public
-private import TaintTrackingParameter::Private
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural taint tracking analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the taint tracking library must define its own unique extension of
- * this abstract class.
- *
- * A taint-tracking configuration is a special data flow configuration
- * (`DataFlow::Configuration`) that allows for flow through nodes that do not
- * necessarily preserve values but are still relevant from a taint tracking
- * perspective. (For example, string concatenation, where one of the operands
- * is tainted.)
- *
- * To create a configuration, extend this class with a subclass whose
- * characteristic predicate is a unique singleton string. For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends TaintTracking::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isSanitizer`.
- *   // Optionally override `isSanitizerIn`.
- *   // Optionally override `isSanitizerOut`.
- *   // Optionally override `isSanitizerGuard`.
- *   // Optionally override `isAdditionalTaintStep`.
- * }
- * ```
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but it is unsupported to depend on
- * another `TaintTracking::Configuration` or a `DataFlow::Configuration` in the
- * overridden predicates that define sources, sinks, or additional steps.
- * Instead, the dependency should go to a `TaintTracking2::Configuration` or a
- * `DataFlow2::Configuration`, `DataFlow3::Configuration`, etc.
- */
-abstract deprecated class Configuration extends DataFlow::Configuration {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant taint source.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant taint source with the given initial
-   * `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink accepting `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
-
-  /** Holds if the node `node` is a taint sanitizer. */
-  predicate isSanitizer(DataFlow::Node node) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node) {
-    this.isSanitizer(node) or
-    defaultTaintSanitizer(node)
-  }
-
-  /**
-   * Holds if the node `node` is a taint sanitizer when the flow state is
-   * `state`.
-   */
-  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
-    this.isSanitizer(node, state)
-  }
-
-  /** Holds if taint propagation into `node` is prohibited. */
-  predicate isSanitizerIn(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierIn(DataFlow::Node node) { this.isSanitizerIn(node) }
-
-  /** Holds if taint propagation out of `node` is prohibited. */
-  predicate isSanitizerOut(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   */
-  predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) { none() }
-
-  final override predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
-    this.isAdditionalTaintStep(node1, node2) or
-    defaultAdditionalTaintStep(node1, node2, _)
-  }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalTaintStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    none()
-  }
-
-  final override predicate isAdditionalFlowStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    this.isAdditionalTaintStep(node1, state1, node2, state2)
-  }
-
-  override predicate allowImplicitRead(DataFlow::Node node, DataFlow::ContentSet c) {
-    (
-      this.isSink(node) or
-      this.isSink(node, _) or
-      this.isAdditionalTaintStep(node, _) or
-      this.isAdditionalTaintStep(node, _, _, _)
-    ) and
-    defaultImplicitTaintRead(node, c)
-  }
-
-  /**
-   * Holds if taint may flow from `source` to `sink` for this configuration.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate hasFlow(DataFlow::Node source, DataFlow::Node sink) {
-    super.hasFlow(source, sink)
-  }
-}
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking3/TaintTrackingParameter.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking3/TaintTrackingParameter.qll
deleted file mode 100644
index 6c73b6ceda6..00000000000
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking3/TaintTrackingParameter.qll
+++ /dev/null
@@ -1,6 +0,0 @@
-import semmle.code.csharp.dataflow.internal.TaintTrackingPublic as Public
-
-module Private {
-  import semmle.code.csharp.dataflow.DataFlow3::DataFlow3 as DataFlow
-  import semmle.code.csharp.dataflow.internal.TaintTrackingPrivate
-}
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking4/TaintTrackingImpl.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking4/TaintTrackingImpl.qll
deleted file mode 100644
index 75e7856fd26..00000000000
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking4/TaintTrackingImpl.qll
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides an implementation of global (interprocedural) taint tracking.
- * This file re-exports the local (intraprocedural) taint-tracking analysis
- * from `TaintTrackingParameter::Public` and adds a global analysis, mainly
- * exposed through the `Configuration` class. For some languages, this file
- * exists in several identical copies, allowing queries to use multiple
- * `Configuration` classes that depend on each other without introducing
- * mutual recursion among those configurations.
- */
-
-import TaintTrackingParameter::Public
-private import TaintTrackingParameter::Private
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural taint tracking analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the taint tracking library must define its own unique extension of
- * this abstract class.
- *
- * A taint-tracking configuration is a special data flow configuration
- * (`DataFlow::Configuration`) that allows for flow through nodes that do not
- * necessarily preserve values but are still relevant from a taint tracking
- * perspective. (For example, string concatenation, where one of the operands
- * is tainted.)
- *
- * To create a configuration, extend this class with a subclass whose
- * characteristic predicate is a unique singleton string. For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends TaintTracking::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isSanitizer`.
- *   // Optionally override `isSanitizerIn`.
- *   // Optionally override `isSanitizerOut`.
- *   // Optionally override `isSanitizerGuard`.
- *   // Optionally override `isAdditionalTaintStep`.
- * }
- * ```
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but it is unsupported to depend on
- * another `TaintTracking::Configuration` or a `DataFlow::Configuration` in the
- * overridden predicates that define sources, sinks, or additional steps.
- * Instead, the dependency should go to a `TaintTracking2::Configuration` or a
- * `DataFlow2::Configuration`, `DataFlow3::Configuration`, etc.
- */
-abstract deprecated class Configuration extends DataFlow::Configuration {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant taint source.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant taint source with the given initial
-   * `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink accepting `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
-
-  /** Holds if the node `node` is a taint sanitizer. */
-  predicate isSanitizer(DataFlow::Node node) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node) {
-    this.isSanitizer(node) or
-    defaultTaintSanitizer(node)
-  }
-
-  /**
-   * Holds if the node `node` is a taint sanitizer when the flow state is
-   * `state`.
-   */
-  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
-    this.isSanitizer(node, state)
-  }
-
-  /** Holds if taint propagation into `node` is prohibited. */
-  predicate isSanitizerIn(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierIn(DataFlow::Node node) { this.isSanitizerIn(node) }
-
-  /** Holds if taint propagation out of `node` is prohibited. */
-  predicate isSanitizerOut(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   */
-  predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) { none() }
-
-  final override predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
-    this.isAdditionalTaintStep(node1, node2) or
-    defaultAdditionalTaintStep(node1, node2, _)
-  }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalTaintStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    none()
-  }
-
-  final override predicate isAdditionalFlowStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    this.isAdditionalTaintStep(node1, state1, node2, state2)
-  }
-
-  override predicate allowImplicitRead(DataFlow::Node node, DataFlow::ContentSet c) {
-    (
-      this.isSink(node) or
-      this.isSink(node, _) or
-      this.isAdditionalTaintStep(node, _) or
-      this.isAdditionalTaintStep(node, _, _, _)
-    ) and
-    defaultImplicitTaintRead(node, c)
-  }
-
-  /**
-   * Holds if taint may flow from `source` to `sink` for this configuration.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate hasFlow(DataFlow::Node source, DataFlow::Node sink) {
-    super.hasFlow(source, sink)
-  }
-}
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking4/TaintTrackingParameter.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking4/TaintTrackingParameter.qll
deleted file mode 100644
index e394e27a50c..00000000000
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking4/TaintTrackingParameter.qll
+++ /dev/null
@@ -1,6 +0,0 @@
-import semmle.code.csharp.dataflow.internal.TaintTrackingPublic as Public
-
-module Private {
-  import semmle.code.csharp.dataflow.DataFlow4::DataFlow4 as DataFlow
-  import semmle.code.csharp.dataflow.internal.TaintTrackingPrivate
-}
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking5/TaintTrackingImpl.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking5/TaintTrackingImpl.qll
deleted file mode 100644
index 75e7856fd26..00000000000
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking5/TaintTrackingImpl.qll
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides an implementation of global (interprocedural) taint tracking.
- * This file re-exports the local (intraprocedural) taint-tracking analysis
- * from `TaintTrackingParameter::Public` and adds a global analysis, mainly
- * exposed through the `Configuration` class. For some languages, this file
- * exists in several identical copies, allowing queries to use multiple
- * `Configuration` classes that depend on each other without introducing
- * mutual recursion among those configurations.
- */
-
-import TaintTrackingParameter::Public
-private import TaintTrackingParameter::Private
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural taint tracking analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the taint tracking library must define its own unique extension of
- * this abstract class.
- *
- * A taint-tracking configuration is a special data flow configuration
- * (`DataFlow::Configuration`) that allows for flow through nodes that do not
- * necessarily preserve values but are still relevant from a taint tracking
- * perspective. (For example, string concatenation, where one of the operands
- * is tainted.)
- *
- * To create a configuration, extend this class with a subclass whose
- * characteristic predicate is a unique singleton string. For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends TaintTracking::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isSanitizer`.
- *   // Optionally override `isSanitizerIn`.
- *   // Optionally override `isSanitizerOut`.
- *   // Optionally override `isSanitizerGuard`.
- *   // Optionally override `isAdditionalTaintStep`.
- * }
- * ```
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but it is unsupported to depend on
- * another `TaintTracking::Configuration` or a `DataFlow::Configuration` in the
- * overridden predicates that define sources, sinks, or additional steps.
- * Instead, the dependency should go to a `TaintTracking2::Configuration` or a
- * `DataFlow2::Configuration`, `DataFlow3::Configuration`, etc.
- */
-abstract deprecated class Configuration extends DataFlow::Configuration {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant taint source.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant taint source with the given initial
-   * `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink accepting `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
-
-  /** Holds if the node `node` is a taint sanitizer. */
-  predicate isSanitizer(DataFlow::Node node) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node) {
-    this.isSanitizer(node) or
-    defaultTaintSanitizer(node)
-  }
-
-  /**
-   * Holds if the node `node` is a taint sanitizer when the flow state is
-   * `state`.
-   */
-  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
-    this.isSanitizer(node, state)
-  }
-
-  /** Holds if taint propagation into `node` is prohibited. */
-  predicate isSanitizerIn(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierIn(DataFlow::Node node) { this.isSanitizerIn(node) }
-
-  /** Holds if taint propagation out of `node` is prohibited. */
-  predicate isSanitizerOut(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   */
-  predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) { none() }
-
-  final override predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
-    this.isAdditionalTaintStep(node1, node2) or
-    defaultAdditionalTaintStep(node1, node2, _)
-  }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalTaintStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    none()
-  }
-
-  final override predicate isAdditionalFlowStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    this.isAdditionalTaintStep(node1, state1, node2, state2)
-  }
-
-  override predicate allowImplicitRead(DataFlow::Node node, DataFlow::ContentSet c) {
-    (
-      this.isSink(node) or
-      this.isSink(node, _) or
-      this.isAdditionalTaintStep(node, _) or
-      this.isAdditionalTaintStep(node, _, _, _)
-    ) and
-    defaultImplicitTaintRead(node, c)
-  }
-
-  /**
-   * Holds if taint may flow from `source` to `sink` for this configuration.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate hasFlow(DataFlow::Node source, DataFlow::Node sink) {
-    super.hasFlow(source, sink)
-  }
-}
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking5/TaintTrackingParameter.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking5/TaintTrackingParameter.qll
deleted file mode 100644
index 2668be3b376..00000000000
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking5/TaintTrackingParameter.qll
+++ /dev/null
@@ -1,6 +0,0 @@
-import semmle.code.csharp.dataflow.internal.TaintTrackingPublic as Public
-
-module Private {
-  import semmle.code.csharp.dataflow.DataFlow5::DataFlow5 as DataFlow
-  import semmle.code.csharp.dataflow.internal.TaintTrackingPrivate
-}
diff --git a/csharp/ql/lib/semmle/code/csharp/frameworks/Format.qll b/csharp/ql/lib/semmle/code/csharp/frameworks/Format.qll
index f0666b921b2..6cef58990b0 100644
--- a/csharp/ql/lib/semmle/code/csharp/frameworks/Format.qll
+++ b/csharp/ql/lib/semmle/code/csharp/frameworks/Format.qll
@@ -5,7 +5,6 @@
 import csharp
 private import semmle.code.csharp.frameworks.System
 private import semmle.code.csharp.frameworks.system.Text
-private import semmle.code.csharp.dataflow.DataFlow2
 
 /** A method that formats a string, for example `string.Format()`. */
 class FormatMethod extends Method {
diff --git a/csharp/ql/lib/semmle/code/csharp/frameworks/Sql.qll b/csharp/ql/lib/semmle/code/csharp/frameworks/Sql.qll
index b3b85299c69..75f72352deb 100644
--- a/csharp/ql/lib/semmle/code/csharp/frameworks/Sql.qll
+++ b/csharp/ql/lib/semmle/code/csharp/frameworks/Sql.qll
@@ -6,7 +6,6 @@ private import semmle.code.csharp.frameworks.system.data.SqlClient
 private import semmle.code.csharp.frameworks.EntityFramework
 private import semmle.code.csharp.frameworks.NHibernate
 private import semmle.code.csharp.frameworks.Dapper
-private import semmle.code.csharp.dataflow.DataFlow4
 
 /** An expression containing a SQL command. */
 abstract class SqlExpr extends Expr {
diff --git a/csharp/ql/lib/semmle/code/csharp/frameworks/system/Xml.qll b/csharp/ql/lib/semmle/code/csharp/frameworks/system/Xml.qll
index 0644e75c3df..c0edf9e110e 100644
--- a/csharp/ql/lib/semmle/code/csharp/frameworks/system/Xml.qll
+++ b/csharp/ql/lib/semmle/code/csharp/frameworks/system/Xml.qll
@@ -2,7 +2,6 @@
 
 import csharp
 private import semmle.code.csharp.frameworks.System
-private import semmle.code.csharp.dataflow.DataFlow3
 
 /** The `System.Xml` namespace. */
 class SystemXmlNamespace extends Namespace {
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/ReDoSQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/ReDoSQuery.qll
index 5addc03bd88..94dbf1d4cdc 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/ReDoSQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/ReDoSQuery.qll
@@ -4,7 +4,6 @@
  */
 
 import csharp
-private import semmle.code.csharp.dataflow.DataFlow2
 private import semmle.code.csharp.security.dataflow.flowsinks.FlowSinks
 private import semmle.code.csharp.security.dataflow.flowsources.FlowSources
 private import semmle.code.csharp.frameworks.system.text.RegularExpressions
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/UnsafeDeserializationQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/UnsafeDeserializationQuery.qll
index 009e1ab73c1..5d9d18dcbac 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/UnsafeDeserializationQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/UnsafeDeserializationQuery.qll
@@ -5,7 +5,6 @@
 
 import csharp
 private import semmle.code.csharp.serialization.Deserializers
-private import semmle.code.csharp.dataflow.TaintTracking2
 private import semmle.code.csharp.security.dataflow.flowsinks.FlowSinks
 private import semmle.code.csharp.security.dataflow.flowsources.FlowSources
 
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/XSSQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/XSSQuery.qll
index 81029cc6572..2d687b51d67 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/XSSQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/XSSQuery.qll
@@ -7,8 +7,6 @@ import csharp
 private import XSSSinks
 private import semmle.code.csharp.security.Sanitizers
 private import semmle.code.csharp.security.dataflow.flowsources.FlowSources
-private import semmle.code.csharp.dataflow.DataFlow2
-private import semmle.code.csharp.dataflow.TaintTracking2
 
 /**
  * Holds if there is tainted flow from `source` to `sink` that may lead to a
diff --git a/csharp/ql/lib/semmle/code/csharp/security/xml/InsecureXMLQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/xml/InsecureXMLQuery.qll
index ba98888fa6f..1abeaf797b0 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/xml/InsecureXMLQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/xml/InsecureXMLQuery.qll
@@ -150,8 +150,6 @@ module XmlSettings {
 
 /** Provides predicates related to `System.Xml.XmlReader`. */
 module XmlReader {
-  private import semmle.code.csharp.dataflow.DataFlow2
-
   private class InsecureXmlReaderCreate extends InsecureXmlProcessing, MethodCall {
     InsecureXmlReaderCreate() {
       this.getTarget().hasFullyQualifiedName("System.Xml.XmlReader", "Create")
diff --git a/csharp/ql/src/Likely Bugs/ThreadUnsafeICryptoTransform.ql b/csharp/ql/src/Likely Bugs/ThreadUnsafeICryptoTransform.ql
index e64d714f8bb..f1487d7a2ce 100644
--- a/csharp/ql/src/Likely Bugs/ThreadUnsafeICryptoTransform.ql	
+++ b/csharp/ql/src/Likely Bugs/ThreadUnsafeICryptoTransform.ql	
@@ -52,6 +52,7 @@ class ICryptoTransform extends ValueOrRefType {
 }
 
 from UnsafeField field
+where field.fromSource()
 select field,
   "Static field '" + field.getName() +
     "' contains a 'System.Security.Cryptography.ICryptoTransform' that could be used in an unsafe way."
diff --git a/csharp/ql/src/Telemetry/DatabaseQuality.qll b/csharp/ql/src/Telemetry/DatabaseQuality.qll
index 9ef132710ab..eba5ebb5211 100644
--- a/csharp/ql/src/Telemetry/DatabaseQuality.qll
+++ b/csharp/ql/src/Telemetry/DatabaseQuality.qll
@@ -35,15 +35,73 @@ module ReportStats<StatsSig Stats> {
 module CallTargetStats implements StatsSig {
   int getNumberOfOk() { result = count(Call c | exists(c.getTarget())) }
 
-  int getNumberOfNotOk() {
-    result =
-      count(Call c |
-        not exists(c.getTarget()) and
-        not c instanceof DelegateCall and
-        not c instanceof DynamicExpr
+  private predicate isNoSetterPropertyCallInConstructor(PropertyCall c) {
+    exists(Property p, Constructor ctor |
+      p = c.getProperty() and
+      not exists(Setter a | a = p.getAnAccessor()) and
+      c.getEnclosingCallable() = ctor and
+      (
+        c.hasThisQualifier()
+        or
+        ctor instanceof StaticConstructor and p.getDeclaringType() = ctor.getDeclaringType()
       )
+    )
   }
 
+  private predicate isNoSetterPropertyInitialization(PropertyCall c) {
+    exists(Property p, AssignExpr assign |
+      p = c.getProperty() and
+      not exists(Setter a | a = p.getAnAccessor()) and
+      assign = c.getParent() and
+      assign.getLValue() = c and
+      assign.getParent() instanceof Property
+    )
+  }
+
+  private predicate isAnonymousObjectMemberDeclaration(PropertyCall c) {
+    exists(Property p, AssignExpr assign |
+      p = c.getProperty() and
+      assign = c.getParent() and
+      assign.getLValue() = c and
+      assign.getParent() instanceof ObjectInitializer and
+      assign.getParent().getParent() instanceof AnonymousObjectCreation
+    )
+  }
+
+  private predicate isInitializedWithObjectOrCollectionInitializer(PropertyCall c) {
+    exists(Property p, AssignExpr assign |
+      p = c.getProperty() and
+      assign = c.getParent() and
+      assign.getLValue() = c and
+      assign.getRValue() instanceof ObjectOrCollectionInitializer
+    )
+  }
+
+  private predicate isEventFieldAccess(EventCall c) {
+    exists(Event e | c.getEvent() = e |
+      forall(Accessor a | e.getAnAccessor() = a | a.isCompilerGenerated())
+    )
+  }
+
+  private predicate isTypeParameterInstantiation(ObjectCreation e) {
+    e.getType() instanceof TypeParameter
+  }
+
+  additional predicate isNotOkCall(Call c) {
+    not exists(c.getTarget()) and
+    not c instanceof DelegateCall and
+    not c instanceof DynamicExpr and
+    not isNoSetterPropertyCallInConstructor(c) and
+    not isNoSetterPropertyInitialization(c) and
+    not isAnonymousObjectMemberDeclaration(c) and
+    not isInitializedWithObjectOrCollectionInitializer(c) and
+    not c.getParent+() instanceof NameOfExpr and
+    not isEventFieldAccess(c) and
+    not isTypeParameterInstantiation(c)
+  }
+
+  int getNumberOfNotOk() { result = count(Call c | isNotOkCall(c)) }
+
   string getOkText() { result = "calls with call target" }
 
   string getNotOkText() { result = "calls with missing call target" }
diff --git a/csharp/ql/src/change-notes/2024-11-28-db-quality-property-access.md b/csharp/ql/src/change-notes/2024-11-28-db-quality-property-access.md
new file mode 100644
index 00000000000..212c01f24bb
--- /dev/null
+++ b/csharp/ql/src/change-notes/2024-11-28-db-quality-property-access.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* `csharp/diagnostic/database-quality` has been changed to exclude various property access expressions from database quality evaluation. The excluded property access expressions are expected to have no target callables even in manual or autobuilt databases.
diff --git a/csharp/ql/src/experimental/dataflow/flowsources/AuthCookie.qll b/csharp/ql/src/experimental/dataflow/flowsources/AuthCookie.qll
index 928cf3bdc4f..401944adcc4 100644
--- a/csharp/ql/src/experimental/dataflow/flowsources/AuthCookie.qll
+++ b/csharp/ql/src/experimental/dataflow/flowsources/AuthCookie.qll
@@ -114,61 +114,6 @@ Expr getAValueForProp(ObjectCreation create, Assignment a, string prop) {
  */
 predicate isPropertySet(ObjectCreation oc, string prop) { exists(getAValueForProp(oc, _, prop)) }
 
-/**
- * Tracks if a callback used in `OnAppendCookie` sets a cookie property to `true`.
- */
-abstract deprecated private class OnAppendCookieTrackingConfig extends DataFlow::Configuration {
-  bindingset[this]
-  OnAppendCookieTrackingConfig() { any() }
-
-  /**
-   * Specifies the cookie property name to track.
-   */
-  abstract string propertyName();
-
-  override predicate isSource(DataFlow::Node source) {
-    exists(PropertyWrite pw, Assignment delegateAssign, Callable c |
-      pw.getProperty().getName() = "OnAppendCookie" and
-      pw.getProperty().getDeclaringType() instanceof MicrosoftAspNetCoreBuilderCookiePolicyOptions and
-      delegateAssign.getLValue() = pw and
-      (
-        exists(LambdaExpr lambda |
-          delegateAssign.getRValue() = lambda and
-          lambda = c
-        )
-        or
-        exists(DelegateCreation delegate |
-          delegateAssign.getRValue() = delegate and
-          delegate.getArgument().(CallableAccess).getTarget() = c
-        )
-      ) and
-      c.getParameter(0) = source.asParameter()
-    )
-  }
-
-  override predicate isSink(DataFlow::Node sink) {
-    exists(PropertyWrite pw, Assignment a |
-      pw.getProperty().getDeclaringType() instanceof MicrosoftAspNetCoreHttpCookieOptions and
-      pw.getProperty().getName() = this.propertyName() and
-      a.getLValue() = pw and
-      exists(Expr val |
-        DataFlow::localExprFlow(val, a.getRValue()) and
-        val.getValue() = "true"
-      ) and
-      sink.asExpr() = pw.getQualifier()
-    )
-  }
-
-  override predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
-    node2.asExpr() =
-      any(PropertyRead pr |
-        pr.getQualifier() = node1.asExpr() and
-        pr.getProperty().getDeclaringType() instanceof
-          MicrosoftAspNetCoreCookiePolicyAppendCookieContext
-      )
-  }
-}
-
 private signature string propertyName();
 
 /**
diff --git a/csharp/ql/test/library-tests/conversion/operator/Operator.expected b/csharp/ql/test/library-tests/conversion/operator/Operator.expected
index dd11565ad2a..b0dcfc54260 100644
--- a/csharp/ql/test/library-tests/conversion/operator/Operator.expected
+++ b/csharp/ql/test/library-tests/conversion/operator/Operator.expected
@@ -21,7 +21,6 @@
 | Int32 | Decimal |
 | Int32 | Index |
 | Int32 | Int128 |
-| Int32 | MetadataToken |
 | Int32 | NFloat |
 | Int64 | Decimal |
 | Int64 | Int128 |
@@ -29,7 +28,6 @@
 | IntPtr | Int128 |
 | IntPtr | NFloat |
 | Memory`1 | ReadOnlyMemory<T> |
-| MetadataToken | Int32 |
 | NFloat | Double |
 | SByte | Decimal |
 | SByte | Half |
@@ -59,4 +57,3 @@
 | UIntPtr | Int128 |
 | UIntPtr | NFloat |
 | UIntPtr | UInt128 |
-| UnixFileMode | Nullable<UnixFileMode> |
diff --git a/csharp/ql/test/library-tests/conversion/reftype/RefType.expected b/csharp/ql/test/library-tests/conversion/reftype/RefType.expected
index ab433d45896..ff2c9da9ea3 100644
--- a/csharp/ql/test/library-tests/conversion/reftype/RefType.expected
+++ b/csharp/ql/test/library-tests/conversion/reftype/RefType.expected
@@ -183,8 +183,6 @@
 | IReadOnlyList<T4> | dynamic |
 | Int16[] | Object |
 | Int16[] | dynamic |
-| Int32[,] | Object |
-| Int32[,] | dynamic |
 | Int32[] | Object |
 | Int32[] | dynamic |
 | Int64[] | Object |
@@ -223,8 +221,6 @@
 | T5 | C1 |
 | T5 | Object |
 | T5 | dynamic |
-| UInt16[][] | Object |
-| UInt16[][] | dynamic |
 | UInt32[] | Object |
 | UInt32[] | dynamic |
 | UInt64[] | Object |
@@ -283,7 +279,6 @@
 | null | IReadOnlyList<T3> |
 | null | IReadOnlyList<T4> |
 | null | Int16[] |
-| null | Int32[,] |
 | null | Int32[] |
 | null | Int64[] |
 | null | Object |
@@ -294,7 +289,6 @@
 | null | T4 |
 | null | T4[] |
 | null | T5 |
-| null | UInt16[][] |
 | null | UInt32[] |
 | null | UInt64[] |
 | null | dynamic |
diff --git a/csharp/ql/test/library-tests/csharp9/FunctionPointer.expected b/csharp/ql/test/library-tests/csharp9/FunctionPointer.expected
index d2617be088b..1bf279341ce 100644
--- a/csharp/ql/test/library-tests/csharp9/FunctionPointer.expected
+++ b/csharp/ql/test/library-tests/csharp9/FunctionPointer.expected
@@ -1,68 +1,33 @@
 type
 | file://:0:0:0:0 | delegate* default<A,B> | B | DefaultCallingConvention |
 | file://:0:0:0:0 | delegate* default<B,A> | A | DefaultCallingConvention |
-| file://:0:0:0:0 | delegate* default<Byte ref,Void> | Void | DefaultCallingConvention |
 | file://:0:0:0:0 | delegate* default<Int32 ref,Object out,Int32 in,Int32 ref> | ref int | DefaultCallingConvention |
 | file://:0:0:0:0 | delegate* default<Int32 ref,Object out,Int32 ref readonly> | readonly int | DefaultCallingConvention |
 | file://:0:0:0:0 | delegate* default<Int32*,Void*> | Void* | DefaultCallingConvention |
 | file://:0:0:0:0 | delegate* default<Int32> | int | DefaultCallingConvention |
-| file://:0:0:0:0 | delegate* default<IntPtr,Byte ref,PortableTailCallFrame*,Void> | Void | DefaultCallingConvention |
-| file://:0:0:0:0 | delegate* default<Object,Void> | Void | DefaultCallingConvention |
 | file://:0:0:0:0 | delegate* default<T,Int32> | int | DefaultCallingConvention |
 | file://:0:0:0:0 | delegate* default<Void*,Int32*> | int* | DefaultCallingConvention |
-| file://:0:0:0:0 | delegate* default<Void*,Object> | object | DefaultCallingConvention |
 | file://:0:0:0:0 | delegate* stdcall<Int32 ref,Object out,T,Void> | Void | StdCallCallingConvention |
-| file://:0:0:0:0 | delegate* unmanaged<Byte*,Int32,Byte,Int64,Int64,EVENT_FILTER_DESCRIPTOR*,Void*,Void> | Void | UnmanagedCallingConvention |
-| file://:0:0:0:0 | delegate* unmanaged<Char*,IntPtr,Void> | Void | UnmanagedCallingConvention |
-| file://:0:0:0:0 | delegate* unmanaged<Int32,PosixSignal,Int32> | int | UnmanagedCallingConvention |
 | file://:0:0:0:0 | delegate* unmanaged<IntPtr,Int32> | int | UnmanagedCallingConvention |
 | file://:0:0:0:0 | delegate* unmanaged<IntPtr,Void> | Void | UnmanagedCallingConvention |
-| file://:0:0:0:0 | delegate* unmanaged<NoGCRegionCallbackFinalizerWorkItem*,Void> | Void | UnmanagedCallingConvention |
-| file://:0:0:0:0 | delegate* unmanaged<Void*,Byte*,Void> | Void | UnmanagedCallingConvention |
-| file://:0:0:0:0 | delegate* unmanaged<Void*,Void*,Void*,GCConfigurationType,Int64,Void> | Void | UnmanagedCallingConvention |
 | file://:0:0:0:0 | delegate* unmanaged<Void> | Void | UnmanagedCallingConvention |
 unmanagedCallingConvention
 parameter
 | file://:0:0:0:0 | delegate* default<A,B> | 0 | file://:0:0:0:0 |  | A |
 | file://:0:0:0:0 | delegate* default<B,A> | 0 | file://:0:0:0:0 |  | B |
-| file://:0:0:0:0 | delegate* default<Byte ref,Void> | 0 | file://:0:0:0:0 |  | ref byte! |
 | file://:0:0:0:0 | delegate* default<Int32 ref,Object out,Int32 in,Int32 ref> | 0 | file://:0:0:0:0 |  | ref int! |
 | file://:0:0:0:0 | delegate* default<Int32 ref,Object out,Int32 in,Int32 ref> | 1 | file://:0:0:0:0 | `1 | out object? |
 | file://:0:0:0:0 | delegate* default<Int32 ref,Object out,Int32 in,Int32 ref> | 2 | file://:0:0:0:0 | `2 | readonly int! |
 | file://:0:0:0:0 | delegate* default<Int32 ref,Object out,Int32 ref readonly> | 0 | file://:0:0:0:0 |  | ref int! |
 | file://:0:0:0:0 | delegate* default<Int32 ref,Object out,Int32 ref readonly> | 1 | file://:0:0:0:0 | `1 | out object? |
 | file://:0:0:0:0 | delegate* default<Int32*,Void*> | 0 | file://:0:0:0:0 |  | int*! |
-| file://:0:0:0:0 | delegate* default<IntPtr,Byte ref,PortableTailCallFrame*,Void> | 0 | file://:0:0:0:0 |  | IntPtr! |
-| file://:0:0:0:0 | delegate* default<IntPtr,Byte ref,PortableTailCallFrame*,Void> | 1 | file://:0:0:0:0 | `1 | ref byte! |
-| file://:0:0:0:0 | delegate* default<IntPtr,Byte ref,PortableTailCallFrame*,Void> | 2 | file://:0:0:0:0 | `2 | PortableTailCallFrame*! |
-| file://:0:0:0:0 | delegate* default<Object,Void> | 0 | file://:0:0:0:0 |  | object |
 | file://:0:0:0:0 | delegate* default<T,Int32> | 0 | file://:0:0:0:0 |  | T |
 | file://:0:0:0:0 | delegate* default<Void*,Int32*> | 0 | file://:0:0:0:0 |  | Void*! |
-| file://:0:0:0:0 | delegate* default<Void*,Object> | 0 | file://:0:0:0:0 |  | Void*! |
 | file://:0:0:0:0 | delegate* stdcall<Int32 ref,Object out,T,Void> | 0 | file://:0:0:0:0 |  | ref int! |
 | file://:0:0:0:0 | delegate* stdcall<Int32 ref,Object out,T,Void> | 1 | file://:0:0:0:0 | `1 | out object? |
 | file://:0:0:0:0 | delegate* stdcall<Int32 ref,Object out,T,Void> | 2 | file://:0:0:0:0 | `2 | T |
-| file://:0:0:0:0 | delegate* unmanaged<Byte*,Int32,Byte,Int64,Int64,EVENT_FILTER_DESCRIPTOR*,Void*,Void> | 0 | file://:0:0:0:0 |  | byte*! |
-| file://:0:0:0:0 | delegate* unmanaged<Byte*,Int32,Byte,Int64,Int64,EVENT_FILTER_DESCRIPTOR*,Void*,Void> | 1 | file://:0:0:0:0 | `1 | int! |
-| file://:0:0:0:0 | delegate* unmanaged<Byte*,Int32,Byte,Int64,Int64,EVENT_FILTER_DESCRIPTOR*,Void*,Void> | 2 | file://:0:0:0:0 | `2 | byte! |
-| file://:0:0:0:0 | delegate* unmanaged<Byte*,Int32,Byte,Int64,Int64,EVENT_FILTER_DESCRIPTOR*,Void*,Void> | 3 | file://:0:0:0:0 | `3 | long! |
-| file://:0:0:0:0 | delegate* unmanaged<Byte*,Int32,Byte,Int64,Int64,EVENT_FILTER_DESCRIPTOR*,Void*,Void> | 4 | file://:0:0:0:0 | `4 | long! |
-| file://:0:0:0:0 | delegate* unmanaged<Byte*,Int32,Byte,Int64,Int64,EVENT_FILTER_DESCRIPTOR*,Void*,Void> | 5 | file://:0:0:0:0 | `5 | EVENT_FILTER_DESCRIPTOR*! |
-| file://:0:0:0:0 | delegate* unmanaged<Byte*,Int32,Byte,Int64,Int64,EVENT_FILTER_DESCRIPTOR*,Void*,Void> | 6 | file://:0:0:0:0 | `6 | Void*! |
-| file://:0:0:0:0 | delegate* unmanaged<Char*,IntPtr,Void> | 0 | file://:0:0:0:0 |  | char*! |
-| file://:0:0:0:0 | delegate* unmanaged<Char*,IntPtr,Void> | 1 | file://:0:0:0:0 | `1 | IntPtr! |
-| file://:0:0:0:0 | delegate* unmanaged<Int32,PosixSignal,Int32> | 0 | file://:0:0:0:0 |  | int! |
-| file://:0:0:0:0 | delegate* unmanaged<Int32,PosixSignal,Int32> | 1 | file://:0:0:0:0 | `1 | PosixSignal! |
 | file://:0:0:0:0 | delegate* unmanaged<IntPtr,Int32> | 0 | file://:0:0:0:0 |  | IntPtr! |
 | file://:0:0:0:0 | delegate* unmanaged<IntPtr,Void> | 0 | file://:0:0:0:0 |  | IntPtr! |
-| file://:0:0:0:0 | delegate* unmanaged<NoGCRegionCallbackFinalizerWorkItem*,Void> | 0 | file://:0:0:0:0 |  | NoGCRegionCallbackFinalizerWorkItem*! |
-| file://:0:0:0:0 | delegate* unmanaged<Void*,Byte*,Void> | 0 | file://:0:0:0:0 |  | Void*! |
-| file://:0:0:0:0 | delegate* unmanaged<Void*,Byte*,Void> | 1 | file://:0:0:0:0 | `1 | byte*! |
-| file://:0:0:0:0 | delegate* unmanaged<Void*,Void*,Void*,GCConfigurationType,Int64,Void> | 0 | file://:0:0:0:0 |  | Void*! |
-| file://:0:0:0:0 | delegate* unmanaged<Void*,Void*,Void*,GCConfigurationType,Int64,Void> | 1 | file://:0:0:0:0 | `1 | Void*! |
-| file://:0:0:0:0 | delegate* unmanaged<Void*,Void*,Void*,GCConfigurationType,Int64,Void> | 2 | file://:0:0:0:0 | `2 | Void*! |
-| file://:0:0:0:0 | delegate* unmanaged<Void*,Void*,Void*,GCConfigurationType,Int64,Void> | 3 | file://:0:0:0:0 | `3 | GCConfigurationType! |
-| file://:0:0:0:0 | delegate* unmanaged<Void*,Void*,Void*,GCConfigurationType,Int64,Void> | 4 | file://:0:0:0:0 | `4 | long! |
 invocation
 | FunctionPointer.cs:17:21:17:43 | function pointer call |
 | FunctionPointer.cs:23:13:23:44 | function pointer call |
diff --git a/csharp/ql/test/library-tests/dataflow/fields/FieldFlow.expected b/csharp/ql/test/library-tests/dataflow/fields/FieldFlow.expected
index e4cf0bb2673..ef31681f96c 100644
--- a/csharp/ql/test/library-tests/dataflow/fields/FieldFlow.expected
+++ b/csharp/ql/test/library-tests/dataflow/fields/FieldFlow.expected
@@ -1162,6 +1162,54 @@ edges
 | K.cs:8:22:8:22 | access to local variable o : String | K.cs:8:9:8:15 | [post] access to field Strings : String[] [element] : String | provenance |  |
 | K.cs:13:14:13:20 | access to field Strings : String[] [element] : String | K.cs:13:14:13:23 | access to array element | provenance |  |
 | K.cs:13:14:13:20 | access to field Strings : String[] [element] : String | K.cs:13:14:13:23 | access to array element | provenance |  |
+| L.cs:17:9:17:10 | [post] access to local variable d1 : Object [dynamic property p1] : String | L.cs:18:14:18:15 | access to local variable d1 : Object [dynamic property p1] : String | provenance |  |
+| L.cs:17:9:17:10 | [post] access to local variable d1 : Object [dynamic property p1] : String | L.cs:18:14:18:15 | access to local variable d1 : Object [dynamic property p1] : String | provenance |  |
+| L.cs:17:17:17:33 | call to method Source<String> : String | L.cs:17:9:17:10 | [post] access to local variable d1 : Object [dynamic property p1] : String | provenance |  |
+| L.cs:17:17:17:33 | call to method Source<String> : String | L.cs:17:9:17:10 | [post] access to local variable d1 : Object [dynamic property p1] : String | provenance |  |
+| L.cs:18:14:18:15 | access to local variable d1 : Object [dynamic property p1] : String | L.cs:18:14:18:18 | dynamic access to member p1 | provenance |  |
+| L.cs:18:14:18:15 | access to local variable d1 : Object [dynamic property p1] : String | L.cs:18:14:18:18 | dynamic access to member p1 | provenance |  |
+| L.cs:22:9:22:10 | [post] access to local variable d2 : Object [dynamic property p2] : String | L.cs:23:16:23:17 | (...) ... : L [dynamic property p2] : String | provenance |  |
+| L.cs:22:9:22:10 | [post] access to local variable d2 : Object [dynamic property p2] : String | L.cs:23:16:23:17 | (...) ... : L [dynamic property p2] : String | provenance |  |
+| L.cs:22:17:22:33 | call to method Source<String> : String | L.cs:22:9:22:10 | [post] access to local variable d2 : Object [dynamic property p2] : String | provenance |  |
+| L.cs:22:17:22:33 | call to method Source<String> : String | L.cs:22:9:22:10 | [post] access to local variable d2 : Object [dynamic property p2] : String | provenance |  |
+| L.cs:23:11:23:12 | access to local variable l2 : L [dynamic property p2] : String | L.cs:24:14:24:15 | access to local variable l2 : L [dynamic property p2] : String | provenance |  |
+| L.cs:23:11:23:12 | access to local variable l2 : L [dynamic property p2] : String | L.cs:24:14:24:15 | access to local variable l2 : L [dynamic property p2] : String | provenance |  |
+| L.cs:23:16:23:17 | (...) ... : L [dynamic property p2] : String | L.cs:23:11:23:12 | access to local variable l2 : L [dynamic property p2] : String | provenance |  |
+| L.cs:23:16:23:17 | (...) ... : L [dynamic property p2] : String | L.cs:23:11:23:12 | access to local variable l2 : L [dynamic property p2] : String | provenance |  |
+| L.cs:24:14:24:15 | access to local variable l2 : L [dynamic property p2] : String | L.cs:24:14:24:18 | access to property p2 | provenance |  |
+| L.cs:24:14:24:15 | access to local variable l2 : L [dynamic property p2] : String | L.cs:24:14:24:18 | access to property p2 | provenance |  |
+| L.cs:27:9:27:12 | [post] this access : L [property p3] : String | L.cs:28:17:28:18 | access to local variable d3 : L [property p3] : String | provenance |  |
+| L.cs:27:9:27:12 | [post] this access : L [property p3] : String | L.cs:28:17:28:18 | access to local variable d3 : L [property p3] : String | provenance |  |
+| L.cs:27:19:27:35 | call to method Source<String> : String | L.cs:27:9:27:12 | [post] this access : L [property p3] : String | provenance |  |
+| L.cs:27:19:27:35 | call to method Source<String> : String | L.cs:27:9:27:12 | [post] this access : L [property p3] : String | provenance |  |
+| L.cs:28:17:28:18 | access to local variable d3 : L [property p3] : String | L.cs:29:14:29:15 | access to local variable d3 : L [property p3] : String | provenance |  |
+| L.cs:28:17:28:18 | access to local variable d3 : L [property p3] : String | L.cs:29:14:29:15 | access to local variable d3 : L [property p3] : String | provenance |  |
+| L.cs:29:14:29:15 | access to local variable d3 : L [property p3] : String | L.cs:29:14:29:18 | dynamic access to member p3 | provenance |  |
+| L.cs:29:14:29:15 | access to local variable d3 : L [property p3] : String | L.cs:29:14:29:18 | dynamic access to member p3 | provenance |  |
+| L.cs:33:9:33:10 | [post] access to local variable d4 : Object [dynamic property f1] : String | L.cs:34:14:34:15 | access to local variable d4 : Object [dynamic property f1] : String | provenance |  |
+| L.cs:33:9:33:10 | [post] access to local variable d4 : Object [dynamic property f1] : String | L.cs:34:14:34:15 | access to local variable d4 : Object [dynamic property f1] : String | provenance |  |
+| L.cs:33:17:33:33 | call to method Source<String> : String | L.cs:33:9:33:10 | [post] access to local variable d4 : Object [dynamic property f1] : String | provenance |  |
+| L.cs:33:17:33:33 | call to method Source<String> : String | L.cs:33:9:33:10 | [post] access to local variable d4 : Object [dynamic property f1] : String | provenance |  |
+| L.cs:34:14:34:15 | access to local variable d4 : Object [dynamic property f1] : String | L.cs:34:14:34:18 | dynamic access to member f1 | provenance |  |
+| L.cs:34:14:34:15 | access to local variable d4 : Object [dynamic property f1] : String | L.cs:34:14:34:18 | dynamic access to member f1 | provenance |  |
+| L.cs:38:9:38:10 | [post] access to local variable d5 : Object [dynamic property f2] : String | L.cs:39:16:39:17 | (...) ... : L [dynamic property f2] : String | provenance |  |
+| L.cs:38:9:38:10 | [post] access to local variable d5 : Object [dynamic property f2] : String | L.cs:39:16:39:17 | (...) ... : L [dynamic property f2] : String | provenance |  |
+| L.cs:38:17:38:33 | call to method Source<String> : String | L.cs:38:9:38:10 | [post] access to local variable d5 : Object [dynamic property f2] : String | provenance |  |
+| L.cs:38:17:38:33 | call to method Source<String> : String | L.cs:38:9:38:10 | [post] access to local variable d5 : Object [dynamic property f2] : String | provenance |  |
+| L.cs:39:11:39:12 | access to local variable l5 : L [dynamic property f2] : String | L.cs:40:14:40:15 | access to local variable l5 : L [dynamic property f2] : String | provenance |  |
+| L.cs:39:11:39:12 | access to local variable l5 : L [dynamic property f2] : String | L.cs:40:14:40:15 | access to local variable l5 : L [dynamic property f2] : String | provenance |  |
+| L.cs:39:16:39:17 | (...) ... : L [dynamic property f2] : String | L.cs:39:11:39:12 | access to local variable l5 : L [dynamic property f2] : String | provenance |  |
+| L.cs:39:16:39:17 | (...) ... : L [dynamic property f2] : String | L.cs:39:11:39:12 | access to local variable l5 : L [dynamic property f2] : String | provenance |  |
+| L.cs:40:14:40:15 | access to local variable l5 : L [dynamic property f2] : String | L.cs:40:14:40:18 | access to field f2 | provenance |  |
+| L.cs:40:14:40:15 | access to local variable l5 : L [dynamic property f2] : String | L.cs:40:14:40:18 | access to field f2 | provenance |  |
+| L.cs:43:9:43:12 | [post] this access : L [field f3] : String | L.cs:44:17:44:18 | access to local variable d6 : L [field f3] : String | provenance |  |
+| L.cs:43:9:43:12 | [post] this access : L [field f3] : String | L.cs:44:17:44:18 | access to local variable d6 : L [field f3] : String | provenance |  |
+| L.cs:43:19:43:35 | call to method Source<String> : String | L.cs:43:9:43:12 | [post] this access : L [field f3] : String | provenance |  |
+| L.cs:43:19:43:35 | call to method Source<String> : String | L.cs:43:9:43:12 | [post] this access : L [field f3] : String | provenance |  |
+| L.cs:44:17:44:18 | access to local variable d6 : L [field f3] : String | L.cs:45:14:45:15 | access to local variable d6 : L [field f3] : String | provenance |  |
+| L.cs:44:17:44:18 | access to local variable d6 : L [field f3] : String | L.cs:45:14:45:15 | access to local variable d6 : L [field f3] : String | provenance |  |
+| L.cs:45:14:45:15 | access to local variable d6 : L [field f3] : String | L.cs:45:14:45:18 | dynamic access to member f3 | provenance |  |
+| L.cs:45:14:45:15 | access to local variable d6 : L [field f3] : String | L.cs:45:14:45:18 | dynamic access to member f3 | provenance |  |
 nodes
 | A.cs:5:13:5:13 | access to local variable c : C | semmle.label | access to local variable c : C |
 | A.cs:5:13:5:13 | access to local variable c : C | semmle.label | access to local variable c : C |
@@ -2415,6 +2463,66 @@ nodes
 | K.cs:13:14:13:20 | access to field Strings : String[] [element] : String | semmle.label | access to field Strings : String[] [element] : String |
 | K.cs:13:14:13:23 | access to array element | semmle.label | access to array element |
 | K.cs:13:14:13:23 | access to array element | semmle.label | access to array element |
+| L.cs:17:9:17:10 | [post] access to local variable d1 : Object [dynamic property p1] : String | semmle.label | [post] access to local variable d1 : Object [dynamic property p1] : String |
+| L.cs:17:9:17:10 | [post] access to local variable d1 : Object [dynamic property p1] : String | semmle.label | [post] access to local variable d1 : Object [dynamic property p1] : String |
+| L.cs:17:17:17:33 | call to method Source<String> : String | semmle.label | call to method Source<String> : String |
+| L.cs:17:17:17:33 | call to method Source<String> : String | semmle.label | call to method Source<String> : String |
+| L.cs:18:14:18:15 | access to local variable d1 : Object [dynamic property p1] : String | semmle.label | access to local variable d1 : Object [dynamic property p1] : String |
+| L.cs:18:14:18:15 | access to local variable d1 : Object [dynamic property p1] : String | semmle.label | access to local variable d1 : Object [dynamic property p1] : String |
+| L.cs:18:14:18:18 | dynamic access to member p1 | semmle.label | dynamic access to member p1 |
+| L.cs:18:14:18:18 | dynamic access to member p1 | semmle.label | dynamic access to member p1 |
+| L.cs:22:9:22:10 | [post] access to local variable d2 : Object [dynamic property p2] : String | semmle.label | [post] access to local variable d2 : Object [dynamic property p2] : String |
+| L.cs:22:9:22:10 | [post] access to local variable d2 : Object [dynamic property p2] : String | semmle.label | [post] access to local variable d2 : Object [dynamic property p2] : String |
+| L.cs:22:17:22:33 | call to method Source<String> : String | semmle.label | call to method Source<String> : String |
+| L.cs:22:17:22:33 | call to method Source<String> : String | semmle.label | call to method Source<String> : String |
+| L.cs:23:11:23:12 | access to local variable l2 : L [dynamic property p2] : String | semmle.label | access to local variable l2 : L [dynamic property p2] : String |
+| L.cs:23:11:23:12 | access to local variable l2 : L [dynamic property p2] : String | semmle.label | access to local variable l2 : L [dynamic property p2] : String |
+| L.cs:23:16:23:17 | (...) ... : L [dynamic property p2] : String | semmle.label | (...) ... : L [dynamic property p2] : String |
+| L.cs:23:16:23:17 | (...) ... : L [dynamic property p2] : String | semmle.label | (...) ... : L [dynamic property p2] : String |
+| L.cs:24:14:24:15 | access to local variable l2 : L [dynamic property p2] : String | semmle.label | access to local variable l2 : L [dynamic property p2] : String |
+| L.cs:24:14:24:15 | access to local variable l2 : L [dynamic property p2] : String | semmle.label | access to local variable l2 : L [dynamic property p2] : String |
+| L.cs:24:14:24:18 | access to property p2 | semmle.label | access to property p2 |
+| L.cs:24:14:24:18 | access to property p2 | semmle.label | access to property p2 |
+| L.cs:27:9:27:12 | [post] this access : L [property p3] : String | semmle.label | [post] this access : L [property p3] : String |
+| L.cs:27:9:27:12 | [post] this access : L [property p3] : String | semmle.label | [post] this access : L [property p3] : String |
+| L.cs:27:19:27:35 | call to method Source<String> : String | semmle.label | call to method Source<String> : String |
+| L.cs:27:19:27:35 | call to method Source<String> : String | semmle.label | call to method Source<String> : String |
+| L.cs:28:17:28:18 | access to local variable d3 : L [property p3] : String | semmle.label | access to local variable d3 : L [property p3] : String |
+| L.cs:28:17:28:18 | access to local variable d3 : L [property p3] : String | semmle.label | access to local variable d3 : L [property p3] : String |
+| L.cs:29:14:29:15 | access to local variable d3 : L [property p3] : String | semmle.label | access to local variable d3 : L [property p3] : String |
+| L.cs:29:14:29:15 | access to local variable d3 : L [property p3] : String | semmle.label | access to local variable d3 : L [property p3] : String |
+| L.cs:29:14:29:18 | dynamic access to member p3 | semmle.label | dynamic access to member p3 |
+| L.cs:29:14:29:18 | dynamic access to member p3 | semmle.label | dynamic access to member p3 |
+| L.cs:33:9:33:10 | [post] access to local variable d4 : Object [dynamic property f1] : String | semmle.label | [post] access to local variable d4 : Object [dynamic property f1] : String |
+| L.cs:33:9:33:10 | [post] access to local variable d4 : Object [dynamic property f1] : String | semmle.label | [post] access to local variable d4 : Object [dynamic property f1] : String |
+| L.cs:33:17:33:33 | call to method Source<String> : String | semmle.label | call to method Source<String> : String |
+| L.cs:33:17:33:33 | call to method Source<String> : String | semmle.label | call to method Source<String> : String |
+| L.cs:34:14:34:15 | access to local variable d4 : Object [dynamic property f1] : String | semmle.label | access to local variable d4 : Object [dynamic property f1] : String |
+| L.cs:34:14:34:15 | access to local variable d4 : Object [dynamic property f1] : String | semmle.label | access to local variable d4 : Object [dynamic property f1] : String |
+| L.cs:34:14:34:18 | dynamic access to member f1 | semmle.label | dynamic access to member f1 |
+| L.cs:34:14:34:18 | dynamic access to member f1 | semmle.label | dynamic access to member f1 |
+| L.cs:38:9:38:10 | [post] access to local variable d5 : Object [dynamic property f2] : String | semmle.label | [post] access to local variable d5 : Object [dynamic property f2] : String |
+| L.cs:38:9:38:10 | [post] access to local variable d5 : Object [dynamic property f2] : String | semmle.label | [post] access to local variable d5 : Object [dynamic property f2] : String |
+| L.cs:38:17:38:33 | call to method Source<String> : String | semmle.label | call to method Source<String> : String |
+| L.cs:38:17:38:33 | call to method Source<String> : String | semmle.label | call to method Source<String> : String |
+| L.cs:39:11:39:12 | access to local variable l5 : L [dynamic property f2] : String | semmle.label | access to local variable l5 : L [dynamic property f2] : String |
+| L.cs:39:11:39:12 | access to local variable l5 : L [dynamic property f2] : String | semmle.label | access to local variable l5 : L [dynamic property f2] : String |
+| L.cs:39:16:39:17 | (...) ... : L [dynamic property f2] : String | semmle.label | (...) ... : L [dynamic property f2] : String |
+| L.cs:39:16:39:17 | (...) ... : L [dynamic property f2] : String | semmle.label | (...) ... : L [dynamic property f2] : String |
+| L.cs:40:14:40:15 | access to local variable l5 : L [dynamic property f2] : String | semmle.label | access to local variable l5 : L [dynamic property f2] : String |
+| L.cs:40:14:40:15 | access to local variable l5 : L [dynamic property f2] : String | semmle.label | access to local variable l5 : L [dynamic property f2] : String |
+| L.cs:40:14:40:18 | access to field f2 | semmle.label | access to field f2 |
+| L.cs:40:14:40:18 | access to field f2 | semmle.label | access to field f2 |
+| L.cs:43:9:43:12 | [post] this access : L [field f3] : String | semmle.label | [post] this access : L [field f3] : String |
+| L.cs:43:9:43:12 | [post] this access : L [field f3] : String | semmle.label | [post] this access : L [field f3] : String |
+| L.cs:43:19:43:35 | call to method Source<String> : String | semmle.label | call to method Source<String> : String |
+| L.cs:43:19:43:35 | call to method Source<String> : String | semmle.label | call to method Source<String> : String |
+| L.cs:44:17:44:18 | access to local variable d6 : L [field f3] : String | semmle.label | access to local variable d6 : L [field f3] : String |
+| L.cs:44:17:44:18 | access to local variable d6 : L [field f3] : String | semmle.label | access to local variable d6 : L [field f3] : String |
+| L.cs:45:14:45:15 | access to local variable d6 : L [field f3] : String | semmle.label | access to local variable d6 : L [field f3] : String |
+| L.cs:45:14:45:15 | access to local variable d6 : L [field f3] : String | semmle.label | access to local variable d6 : L [field f3] : String |
+| L.cs:45:14:45:18 | dynamic access to member f3 | semmle.label | dynamic access to member f3 |
+| L.cs:45:14:45:18 | dynamic access to member f3 | semmle.label | dynamic access to member f3 |
 subpaths
 | A.cs:6:24:6:24 | access to local variable c : C | A.cs:147:32:147:32 | c : C | A.cs:149:20:149:27 | object creation of type B : B [field c] : C | A.cs:6:17:6:25 | call to method Make : B [field c] : C |
 | A.cs:6:24:6:24 | access to local variable c : C | A.cs:147:32:147:32 | c : C | A.cs:149:20:149:27 | object creation of type B : B [field c] : C | A.cs:6:17:6:25 | call to method Make : B [field c] : C |
@@ -2672,3 +2780,15 @@ testFailures
 | J.cs:125:14:125:17 | (...) ... | J.cs:119:20:119:34 | call to method Source<Int32> : Int32 | J.cs:125:14:125:17 | (...) ... | $@ | J.cs:119:20:119:34 | call to method Source<Int32> : Int32 | call to method Source<Int32> : Int32 |
 | K.cs:13:14:13:23 | access to array element | K.cs:7:17:7:33 | call to method Source<String> : String | K.cs:13:14:13:23 | access to array element | $@ | K.cs:7:17:7:33 | call to method Source<String> : String | call to method Source<String> : String |
 | K.cs:13:14:13:23 | access to array element | K.cs:7:17:7:33 | call to method Source<String> : String | K.cs:13:14:13:23 | access to array element | $@ | K.cs:7:17:7:33 | call to method Source<String> : String | call to method Source<String> : String |
+| L.cs:18:14:18:18 | dynamic access to member p1 | L.cs:17:17:17:33 | call to method Source<String> : String | L.cs:18:14:18:18 | dynamic access to member p1 | $@ | L.cs:17:17:17:33 | call to method Source<String> : String | call to method Source<String> : String |
+| L.cs:18:14:18:18 | dynamic access to member p1 | L.cs:17:17:17:33 | call to method Source<String> : String | L.cs:18:14:18:18 | dynamic access to member p1 | $@ | L.cs:17:17:17:33 | call to method Source<String> : String | call to method Source<String> : String |
+| L.cs:24:14:24:18 | access to property p2 | L.cs:22:17:22:33 | call to method Source<String> : String | L.cs:24:14:24:18 | access to property p2 | $@ | L.cs:22:17:22:33 | call to method Source<String> : String | call to method Source<String> : String |
+| L.cs:24:14:24:18 | access to property p2 | L.cs:22:17:22:33 | call to method Source<String> : String | L.cs:24:14:24:18 | access to property p2 | $@ | L.cs:22:17:22:33 | call to method Source<String> : String | call to method Source<String> : String |
+| L.cs:29:14:29:18 | dynamic access to member p3 | L.cs:27:19:27:35 | call to method Source<String> : String | L.cs:29:14:29:18 | dynamic access to member p3 | $@ | L.cs:27:19:27:35 | call to method Source<String> : String | call to method Source<String> : String |
+| L.cs:29:14:29:18 | dynamic access to member p3 | L.cs:27:19:27:35 | call to method Source<String> : String | L.cs:29:14:29:18 | dynamic access to member p3 | $@ | L.cs:27:19:27:35 | call to method Source<String> : String | call to method Source<String> : String |
+| L.cs:34:14:34:18 | dynamic access to member f1 | L.cs:33:17:33:33 | call to method Source<String> : String | L.cs:34:14:34:18 | dynamic access to member f1 | $@ | L.cs:33:17:33:33 | call to method Source<String> : String | call to method Source<String> : String |
+| L.cs:34:14:34:18 | dynamic access to member f1 | L.cs:33:17:33:33 | call to method Source<String> : String | L.cs:34:14:34:18 | dynamic access to member f1 | $@ | L.cs:33:17:33:33 | call to method Source<String> : String | call to method Source<String> : String |
+| L.cs:40:14:40:18 | access to field f2 | L.cs:38:17:38:33 | call to method Source<String> : String | L.cs:40:14:40:18 | access to field f2 | $@ | L.cs:38:17:38:33 | call to method Source<String> : String | call to method Source<String> : String |
+| L.cs:40:14:40:18 | access to field f2 | L.cs:38:17:38:33 | call to method Source<String> : String | L.cs:40:14:40:18 | access to field f2 | $@ | L.cs:38:17:38:33 | call to method Source<String> : String | call to method Source<String> : String |
+| L.cs:45:14:45:18 | dynamic access to member f3 | L.cs:43:19:43:35 | call to method Source<String> : String | L.cs:45:14:45:18 | dynamic access to member f3 | $@ | L.cs:43:19:43:35 | call to method Source<String> : String | call to method Source<String> : String |
+| L.cs:45:14:45:18 | dynamic access to member f3 | L.cs:43:19:43:35 | call to method Source<String> : String | L.cs:45:14:45:18 | dynamic access to member f3 | $@ | L.cs:43:19:43:35 | call to method Source<String> : String | call to method Source<String> : String |
diff --git a/csharp/ql/test/library-tests/dataflow/fields/L.cs b/csharp/ql/test/library-tests/dataflow/fields/L.cs
new file mode 100644
index 00000000000..7bc53f45133
--- /dev/null
+++ b/csharp/ql/test/library-tests/dataflow/fields/L.cs
@@ -0,0 +1,51 @@
+using System;
+
+public class L
+{
+    public string p1 { get; set; }
+    public string p2 { get; set; }
+    public string p3 { get; set; }
+    
+    private string f1;
+    private string f2;
+    private string f3;
+
+    private void M1()
+    {
+        // dynamic property write followed by dynamic property read
+        dynamic d1 = this;
+        d1.p1 = Source<string>(1);
+        Sink(d1.p1); // $ hasValueFlow=1
+
+        // dynamic property write followed by static property read
+        dynamic d2 = this;
+        d2.p2 = Source<string>(2);
+        L l2 = d2;
+        Sink(l2.p2); // $ hasValueFlow=2
+
+        // static property write followed by dynamic property read
+        this.p3 = Source<string>(3);
+        dynamic d3 = this;
+        Sink(d3.p3); // $ hasValueFlow=3
+
+        // dynamic property write followed by dynamic field read
+        dynamic d4 = this;
+        d4.f1 = Source<string>(4);
+        Sink(d4.f1); // $ hasValueFlow=4
+
+        // dynamic property write followed by static field read
+        dynamic d5 = this;
+        d5.f2 = Source<string>(5);
+        L l5 = d5;
+        Sink(l5.f2); // $ hasValueFlow=5
+
+        // static field write followed by dynamic property read
+        this.f3 = Source<string>(6);
+        dynamic d6 = this;
+        Sink(d6.f3); // $ hasValueFlow=6
+    }
+
+    public static void Sink(object o) { }
+
+    static T Source<T>(object source) => throw null;
+}
diff --git a/csharp/ql/test/library-tests/dataflow/library/FlowSummaries.expected b/csharp/ql/test/library-tests/dataflow/library/FlowSummaries.expected
index 7b6e623288f..033c83df3bd 100644
--- a/csharp/ql/test/library-tests/dataflow/library/FlowSummaries.expected
+++ b/csharp/ql/test/library-tests/dataflow/library/FlowSummaries.expected
@@ -256,6 +256,12 @@ sink
 | Microsoft.EntityFrameworkCore;RelationalDatabaseFacadeExtensions;ExecuteSqlRawAsync;(Microsoft.EntityFrameworkCore.Infrastructure.DatabaseFacade,System.String,System.Object[]);Argument[1];sql-injection;manual |
 | Microsoft.EntityFrameworkCore;RelationalDatabaseFacadeExtensions;ExecuteSqlRawAsync;(Microsoft.EntityFrameworkCore.Infrastructure.DatabaseFacade,System.String,System.Threading.CancellationToken);Argument[1];sql-injection;manual |
 | Microsoft.EntityFrameworkCore;RelationalQueryableExtensions;FromSqlRaw<TEntity>;(Microsoft.EntityFrameworkCore.DbSet<TEntity>,System.String,System.Object[]);Argument[1];sql-injection;manual |
+| Microsoft.JSInterop;JSRuntimeExtensions;InvokeAsync<TValue>;(Microsoft.JSInterop.IJSRuntime,System.String,System.Object[]);Argument[1];js-injection;manual |
+| Microsoft.JSInterop;JSRuntimeExtensions;InvokeAsync<TValue>;(Microsoft.JSInterop.IJSRuntime,System.String,System.Threading.CancellationToken,System.Object[]);Argument[1];js-injection;manual |
+| Microsoft.JSInterop;JSRuntimeExtensions;InvokeAsync<TValue>;(Microsoft.JSInterop.IJSRuntime,System.String,System.TimeSpan,System.Object[]);Argument[1];js-injection;manual |
+| Microsoft.JSInterop;JSRuntimeExtensions;InvokeVoidAsync;(Microsoft.JSInterop.IJSRuntime,System.String,System.Object[]);Argument[1];js-injection;manual |
+| Microsoft.JSInterop;JSRuntimeExtensions;InvokeVoidAsync;(Microsoft.JSInterop.IJSRuntime,System.String,System.Threading.CancellationToken,System.Object[]);Argument[1];js-injection;manual |
+| Microsoft.JSInterop;JSRuntimeExtensions;InvokeVoidAsync;(Microsoft.JSInterop.IJSRuntime,System.String,System.TimeSpan,System.Object[]);Argument[1];js-injection;manual |
 | ServiceStack.Messaging;BackgroundMqClient;SendAllOneWay;(System.Collections.Generic.IEnumerable<System.Object>);Argument[1].Element;file-content-store;manual |
 | ServiceStack.Messaging;BackgroundMqClient;SendOneWay;(System.Object);Argument[0];file-content-store;manual |
 | ServiceStack.Messaging;BackgroundMqClient;SendOneWay;(System.String,System.Object);Argument[1];file-content-store;manual |
@@ -1693,6 +1699,8 @@ summary
 | Microsoft.AspNetCore.WebUtilities;HttpResponseStreamWriter;WriteLineAsync;(System.String);Argument[0];ReturnValue;taint;df-generated |
 | Microsoft.AspNetCore.WebUtilities;HttpResponseStreamWriter;WriteLineAsync;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.AspNetCore.WebUtilities;HttpResponseStreamWriter;get_Encoding;();Argument[this];ReturnValue;taint;df-generated |
+| Microsoft.AspNetCore.WebUtilities;QueryHelpers;ParseNullableQuery;(System.String);Argument[0];ReturnValue;taint;manual |
+| Microsoft.AspNetCore.WebUtilities;QueryHelpers;ParseQuery;(System.String);Argument[0];ReturnValue;taint;manual |
 | Microsoft.AspNetCore;WebHost;Start;(Microsoft.AspNetCore.Http.RequestDelegate);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.AspNetCore;WebHost;Start;(System.Action<Microsoft.AspNetCore.Routing.IRouteBuilder>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.AspNetCore;WebHost;Start;(System.String,Microsoft.AspNetCore.Http.RequestDelegate);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -18315,6 +18323,8 @@ summary
 | System.Web;HttpUtility;HtmlEncode;(System.String,System.IO.TextWriter);Argument[0];ReturnValue;taint;manual |
 | System.Web;HttpUtility;JavaScriptStringEncode;(System.String);Argument[0];ReturnValue;taint;manual |
 | System.Web;HttpUtility;JavaScriptStringEncode;(System.String,System.Boolean);Argument[0];ReturnValue;taint;manual |
+| System.Web;HttpUtility;ParseQueryString;(System.String);Argument[0];ReturnValue;taint;manual |
+| System.Web;HttpUtility;ParseQueryString;(System.String,System.Text.Encoding);Argument[0];ReturnValue;taint;manual |
 | System.Web;HttpUtility;UrlEncode;(System.Byte[]);Argument[0];ReturnValue;taint;manual |
 | System.Web;HttpUtility;UrlEncode;(System.Byte[],System.Int32,System.Int32);Argument[0];ReturnValue;taint;manual |
 | System.Web;HttpUtility;UrlEncode;(System.String);Argument[0];ReturnValue;taint;manual |
@@ -51120,8 +51130,6 @@ neutral
 | System.Web;AspNetHostingPermissionAttribute;CreatePermission;();summary;df-generated |
 | System.Web;HtmlString;ToHtmlString;();summary;df-generated |
 | System.Web;HttpUtility;HtmlDecode;(System.String,System.IO.TextWriter);summary;df-generated |
-| System.Web;HttpUtility;ParseQueryString;(System.String);summary;df-generated |
-| System.Web;HttpUtility;ParseQueryString;(System.String,System.Text.Encoding);summary;df-generated |
 | System.Web;HttpUtility;UrlDecode;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding);summary;df-generated |
 | System.Web;HttpUtility;UrlDecode;(System.Byte[],System.Text.Encoding);summary;df-generated |
 | System.Web;HttpUtility;UrlDecode;(System.String);summary;df-generated |
diff --git a/csharp/ql/test/library-tests/dataflow/library/FlowSummariesFiltered.expected b/csharp/ql/test/library-tests/dataflow/library/FlowSummariesFiltered.expected
index 6fb375dae85..199ccee5a50 100644
--- a/csharp/ql/test/library-tests/dataflow/library/FlowSummariesFiltered.expected
+++ b/csharp/ql/test/library-tests/dataflow/library/FlowSummariesFiltered.expected
@@ -650,6 +650,8 @@
 | Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;FileBufferingReadStream;(System.IO.Stream,System.Int32,System.Nullable<System.Int64>,System.Func<System.String>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;FileBufferingReadStream;(System.IO.Stream,System.Int32,System.Nullable<System.Int64>,System.Func<System.String>,System.Buffers.ArrayPool<System.Byte>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;FileBufferingWriteStream;(System.Int32,System.Nullable<System.Int64>,System.Func<System.String>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
+| Microsoft.AspNetCore.WebUtilities;QueryHelpers;ParseNullableQuery;(System.String);Argument[0];ReturnValue;taint;manual |
+| Microsoft.AspNetCore.WebUtilities;QueryHelpers;ParseQuery;(System.String);Argument[0];ReturnValue;taint;manual |
 | Microsoft.AspNetCore;WebHost;Start;(Microsoft.AspNetCore.Http.RequestDelegate);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.AspNetCore;WebHost;Start;(System.Action<Microsoft.AspNetCore.Routing.IRouteBuilder>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.AspNetCore;WebHost;Start;(System.String,Microsoft.AspNetCore.Http.RequestDelegate);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
@@ -13988,6 +13990,8 @@
 | System.Web;HttpUtility;HtmlEncode;(System.String,System.IO.TextWriter);Argument[0];ReturnValue;taint;manual |
 | System.Web;HttpUtility;JavaScriptStringEncode;(System.String);Argument[0];ReturnValue;taint;manual |
 | System.Web;HttpUtility;JavaScriptStringEncode;(System.String,System.Boolean);Argument[0];ReturnValue;taint;manual |
+| System.Web;HttpUtility;ParseQueryString;(System.String);Argument[0];ReturnValue;taint;manual |
+| System.Web;HttpUtility;ParseQueryString;(System.String,System.Text.Encoding);Argument[0];ReturnValue;taint;manual |
 | System.Web;HttpUtility;UrlEncode;(System.Byte[]);Argument[0];ReturnValue;taint;manual |
 | System.Web;HttpUtility;UrlEncode;(System.Byte[],System.Int32,System.Int32);Argument[0];ReturnValue;taint;manual |
 | System.Web;HttpUtility;UrlEncode;(System.String);Argument[0];ReturnValue;taint;manual |
diff --git a/csharp/ql/test/library-tests/tuples/tuples.expected b/csharp/ql/test/library-tests/tuples/tuples.expected
index c2042bfb14a..cb39eb0ca3b 100644
--- a/csharp/ql/test/library-tests/tuples/tuples.expected
+++ b/csharp/ql/test/library-tests/tuples/tuples.expected
@@ -8,13 +8,11 @@ members2
 | tuple.cs:7:17:7:22 | (Int32,Int32) | ValueTuple<int, int> | Equals(object, IEqualityComparer) |
 | tuple.cs:7:17:7:22 | (Int32,Int32) | ValueTuple<int, int> | GetHashCode() |
 | tuple.cs:7:17:7:22 | (Int32,Int32) | ValueTuple<int, int> | GetHashCode(IEqualityComparer) |
-| tuple.cs:7:17:7:22 | (Int32,Int32) | ValueTuple<int, int> | GetHashCodeCore(IEqualityComparer) |
 | tuple.cs:7:17:7:22 | (Int32,Int32) | ValueTuple<int, int> | Item1 |
 | tuple.cs:7:17:7:22 | (Int32,Int32) | ValueTuple<int, int> | Item2 |
 | tuple.cs:7:17:7:22 | (Int32,Int32) | ValueTuple<int, int> | Item[int] |
 | tuple.cs:7:17:7:22 | (Int32,Int32) | ValueTuple<int, int> | Length |
 | tuple.cs:7:17:7:22 | (Int32,Int32) | ValueTuple<int, int> | ToString() |
-| tuple.cs:7:17:7:22 | (Int32,Int32) | ValueTuple<int, int> | ToStringEnd() |
 | tuple.cs:7:17:7:22 | (Int32,Int32) | ValueTuple<int, int> | ValueTuple() |
 | tuple.cs:7:17:7:22 | (Int32,Int32) | ValueTuple<int, int> | ValueTuple(int, int) |
 | tuple.cs:12:17:12:37 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int> | CompareTo((int, int, int, int, int, int, int)) |
@@ -25,7 +23,6 @@ members2
 | tuple.cs:12:17:12:37 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int> | Equals(object, IEqualityComparer) |
 | tuple.cs:12:17:12:37 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int> | GetHashCode() |
 | tuple.cs:12:17:12:37 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int> | GetHashCode(IEqualityComparer) |
-| tuple.cs:12:17:12:37 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int> | GetHashCodeCore(IEqualityComparer) |
 | tuple.cs:12:17:12:37 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int> | Item1 |
 | tuple.cs:12:17:12:37 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int> | Item2 |
 | tuple.cs:12:17:12:37 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int> | Item3 |
@@ -36,7 +33,6 @@ members2
 | tuple.cs:12:17:12:37 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int> | Item[int] |
 | tuple.cs:12:17:12:37 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int> | Length |
 | tuple.cs:12:17:12:37 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int> | ToString() |
-| tuple.cs:12:17:12:37 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int> | ToStringEnd() |
 | tuple.cs:12:17:12:37 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int> | ValueTuple() |
 | tuple.cs:12:17:12:37 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int> | ValueTuple(int, int, int, int, int, int, int) |
 | tuple.cs:15:17:15:40 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int, (int)> | CompareTo((int, int, int, int, int, int, int, int)) |
@@ -47,7 +43,6 @@ members2
 | tuple.cs:15:17:15:40 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int, (int)> | Equals(object, IEqualityComparer) |
 | tuple.cs:15:17:15:40 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int, (int)> | GetHashCode() |
 | tuple.cs:15:17:15:40 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int, (int)> | GetHashCode(IEqualityComparer) |
-| tuple.cs:15:17:15:40 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int, (int)> | GetHashCodeCore(IEqualityComparer) |
 | tuple.cs:15:17:15:40 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int, (int)> | Item1 |
 | tuple.cs:15:17:15:40 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int, (int)> | Item2 |
 | tuple.cs:15:17:15:40 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int, (int)> | Item3 |
@@ -60,7 +55,6 @@ members2
 | tuple.cs:15:17:15:40 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int, (int)> | Length |
 | tuple.cs:15:17:15:40 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int, (int)> | Rest |
 | tuple.cs:15:17:15:40 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int, (int)> | ToString() |
-| tuple.cs:15:17:15:40 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int, (int)> | ToStringEnd() |
 | tuple.cs:15:17:15:40 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int, (int)> | ValueTuple() |
 | tuple.cs:15:17:15:40 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int, (int)> | ValueTuple(int, int, int, int, int, int, int, (int)) |
 | tuple.cs:18:17:18:47 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int, (int, int, int)> | CompareTo((int, int, int, int, int, int, int, int, int, int)) |
@@ -71,7 +65,6 @@ members2
 | tuple.cs:18:17:18:47 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int, (int, int, int)> | Equals(object, IEqualityComparer) |
 | tuple.cs:18:17:18:47 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int, (int, int, int)> | GetHashCode() |
 | tuple.cs:18:17:18:47 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int, (int, int, int)> | GetHashCode(IEqualityComparer) |
-| tuple.cs:18:17:18:47 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int, (int, int, int)> | GetHashCodeCore(IEqualityComparer) |
 | tuple.cs:18:17:18:47 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int, (int, int, int)> | Item1 |
 | tuple.cs:18:17:18:47 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int, (int, int, int)> | Item2 |
 | tuple.cs:18:17:18:47 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int, (int, int, int)> | Item3 |
@@ -86,6 +79,5 @@ members2
 | tuple.cs:18:17:18:47 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int, (int, int, int)> | Length |
 | tuple.cs:18:17:18:47 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int, (int, int, int)> | Rest |
 | tuple.cs:18:17:18:47 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int, (int, int, int)> | ToString() |
-| tuple.cs:18:17:18:47 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int, (int, int, int)> | ToStringEnd() |
 | tuple.cs:18:17:18:47 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int, (int, int, int)> | ValueTuple() |
 | tuple.cs:18:17:18:47 | (Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32,Int32) | ValueTuple<int, int, int, int, int, int, int, (int, int, int)> | ValueTuple(int, int, int, int, int, int, int, (int, int, int)) |
diff --git a/csharp/ql/test/query-tests/Telemetry/DatabaseQuality/IsNotOkayCall.expected b/csharp/ql/test/query-tests/Telemetry/DatabaseQuality/IsNotOkayCall.expected
new file mode 100644
index 00000000000..205022b7180
--- /dev/null
+++ b/csharp/ql/test/query-tests/Telemetry/DatabaseQuality/IsNotOkayCall.expected
@@ -0,0 +1,4 @@
+| Quality.cs:26:19:26:26 | access to indexer | Call without target $@. | Quality.cs:26:19:26:26 | access to indexer | access to indexer |
+| Quality.cs:29:21:29:27 | access to indexer | Call without target $@. | Quality.cs:29:21:29:27 | access to indexer | access to indexer |
+| Quality.cs:32:9:32:21 | access to indexer | Call without target $@. | Quality.cs:32:9:32:21 | access to indexer | access to indexer |
+| Quality.cs:34:21:34:25 | object creation of type null | Call without target $@. | Quality.cs:34:21:34:25 | object creation of type null | object creation of type null |
diff --git a/csharp/ql/test/query-tests/Telemetry/DatabaseQuality/IsNotOkayCall.ql b/csharp/ql/test/query-tests/Telemetry/DatabaseQuality/IsNotOkayCall.ql
new file mode 100644
index 00000000000..cbe7c82a4a1
--- /dev/null
+++ b/csharp/ql/test/query-tests/Telemetry/DatabaseQuality/IsNotOkayCall.ql
@@ -0,0 +1,12 @@
+/**
+ * @id test/missing-call-target
+ * @kind problem
+ * @problem.severity warning
+ */
+
+import csharp
+import Telemetry.DatabaseQuality
+
+from Call call
+where CallTargetStats::isNotOkCall(call)
+select call, "Call without target $@.", call, call.toString()
diff --git a/csharp/ql/test/query-tests/Telemetry/DatabaseQuality/NoTarget.expected b/csharp/ql/test/query-tests/Telemetry/DatabaseQuality/NoTarget.expected
new file mode 100644
index 00000000000..84b6994e033
--- /dev/null
+++ b/csharp/ql/test/query-tests/Telemetry/DatabaseQuality/NoTarget.expected
@@ -0,0 +1,15 @@
+| Quality.cs:8:9:8:19 | access to property MyProperty5 | Call without target $@. | Quality.cs:8:9:8:19 | access to property MyProperty5 | access to property MyProperty5 |
+| Quality.cs:13:9:13:19 | access to property MyProperty1 | Call without target $@. | Quality.cs:13:9:13:19 | access to property MyProperty1 | access to property MyProperty1 |
+| Quality.cs:14:24:14:34 | access to property MyProperty3 | Call without target $@. | Quality.cs:14:24:14:34 | access to property MyProperty3 | access to property MyProperty3 |
+| Quality.cs:15:24:15:34 | access to property MyProperty3 | Call without target $@. | Quality.cs:15:24:15:34 | access to property MyProperty3 | access to property MyProperty3 |
+| Quality.cs:15:24:15:46 | access to property MyProperty2 | Call without target $@. | Quality.cs:15:24:15:46 | access to property MyProperty2 | access to property MyProperty2 |
+| Quality.cs:19:13:19:23 | access to property MyProperty4 | Call without target $@. | Quality.cs:19:13:19:23 | access to property MyProperty4 | access to property MyProperty4 |
+| Quality.cs:20:13:20:23 | access to property MyProperty6 | Call without target $@. | Quality.cs:20:13:20:23 | access to property MyProperty6 | access to property MyProperty6 |
+| Quality.cs:23:9:23:14 | access to event Event1 | Call without target $@. | Quality.cs:23:9:23:14 | access to event Event1 | access to event Event1 |
+| Quality.cs:23:9:23:30 | delegate call | Call without target $@. | Quality.cs:23:9:23:30 | delegate call | delegate call |
+| Quality.cs:26:19:26:26 | access to indexer | Call without target $@. | Quality.cs:26:19:26:26 | access to indexer | access to indexer |
+| Quality.cs:29:21:29:27 | access to indexer | Call without target $@. | Quality.cs:29:21:29:27 | access to indexer | access to indexer |
+| Quality.cs:32:9:32:21 | access to indexer | Call without target $@. | Quality.cs:32:9:32:21 | access to indexer | access to indexer |
+| Quality.cs:34:21:34:25 | object creation of type null | Call without target $@. | Quality.cs:34:21:34:25 | object creation of type null | object creation of type null |
+| Quality.cs:38:16:38:26 | access to property MyProperty2 | Call without target $@. | Quality.cs:38:16:38:26 | access to property MyProperty2 | access to property MyProperty2 |
+| Quality.cs:50:20:50:26 | object creation of type T | Call without target $@. | Quality.cs:50:20:50:26 | object creation of type T | object creation of type T |
diff --git a/csharp/ql/test/query-tests/Telemetry/DatabaseQuality/NoTarget.ql b/csharp/ql/test/query-tests/Telemetry/DatabaseQuality/NoTarget.ql
new file mode 100644
index 00000000000..6aa56662a87
--- /dev/null
+++ b/csharp/ql/test/query-tests/Telemetry/DatabaseQuality/NoTarget.ql
@@ -0,0 +1,12 @@
+/**
+ * @id test/missing-call-target
+ * @kind problem
+ * @problem.severity warning
+ */
+
+import csharp
+import Telemetry.DatabaseQuality
+
+from Call call
+where not exists(call.getTarget())
+select call, "Call without target $@.", call, call.toString()
diff --git a/csharp/ql/test/query-tests/Telemetry/DatabaseQuality/Quality.cs b/csharp/ql/test/query-tests/Telemetry/DatabaseQuality/Quality.cs
new file mode 100644
index 00000000000..c3ec759d687
--- /dev/null
+++ b/csharp/ql/test/query-tests/Telemetry/DatabaseQuality/Quality.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+
+public class Test
+{
+    static Test()
+    {
+        MyProperty5 = 42;
+    }
+
+    public Test()
+    {
+        MyProperty1 = 42;
+        var x = nameof(MyProperty3);
+        var y = nameof(MyProperty3.MyProperty2);
+
+        new Test()
+        {
+            MyProperty4 = { 1, 2, 3 },
+            MyProperty6 = { [1] = "" }
+        };
+
+        Event1.Invoke(this, 5);
+
+        var str = "abcd";
+        var sub = str[..3];         // TODO: this is not an indexer call, but rather a `str.Substring(0, 3)` call.
+
+        Span<int> sp = null;
+        var slice = sp[..3];        // TODO: this is not an indexer call, but rather a `sp.Slice(0, 3)` call.
+
+        Span<byte> guidBytes = stackalloc byte[16];
+        guidBytes[08] = 1;          // TODO: this indexer call has no target, because the target is a `ref` returning getter.
+
+        new MyList([new(), new Test()]);        // TODO: the `new()` call has no target, which is unexpected, as we know at compile time, that this is a `new Test()` call.
+    }
+
+    public int MyProperty1 { get; }
+    public int MyProperty2 { get; } = 42;
+    public Test MyProperty3 { get; set; }
+    public List<int> MyProperty4 { get; }
+    static int MyProperty5 { get; }
+    public Dictionary<int, string> MyProperty6 { get; }
+
+    public event EventHandler<int> Event1;
+
+    class Gen<T> where T : new()
+    {
+        public static T Factory()
+        {
+            return new T();
+        }
+    }
+
+    class MyList
+    {
+        public MyList(IEnumerable<Test> init) { }
+    }
+}
diff --git a/csharp/ql/test/resources/stubs/System.Web.cs b/csharp/ql/test/resources/stubs/System.Web.cs
index d876a83e318..d1942c07dc1 100644
--- a/csharp/ql/test/resources/stubs/System.Web.cs
+++ b/csharp/ql/test/resources/stubs/System.Web.cs
@@ -390,6 +390,8 @@ namespace System.Web.Script.Serialization
         public JavaScriptSerializer() => throw null;
         public JavaScriptSerializer(System.Web.Script.Serialization.JavaScriptTypeResolver resolver) => throw null;
         public object DeserializeObject(string input) => throw null;
+        public T Deserialize<T> (string input) => throw null;
+        public object Deserialize(string input, Type targetType) => throw null;
     }
 
     // Generated from `System.Web.Script.Serialization.JavaScriptTypeResolver` in `System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35`
diff --git a/docs/codeql/codeql-language-guides/codeql-for-go.rst b/docs/codeql/codeql-language-guides/codeql-for-go.rst
index 360ff6bb82f..30799c146a8 100644
--- a/docs/codeql/codeql-language-guides/codeql-for-go.rst
+++ b/docs/codeql/codeql-language-guides/codeql-for-go.rst
@@ -12,6 +12,7 @@ Experiment and learn how to write effective and efficient queries for CodeQL dat
    codeql-library-for-go
    abstract-syntax-tree-classes-for-working-with-go-programs
    modeling-data-flow-in-go-libraries
+   customizing-library-models-for-go
 
 -  :doc:`Basic query for Go code <basic-query-for-go-code>`: Learn to write and run a simple CodeQL query.
 
@@ -23,3 +24,5 @@ Experiment and learn how to write effective and efficient queries for CodeQL dat
 
 -  :doc:`Modeling data flow in Go libraries <modeling-data-flow-in-go-libraries>`: When analyzing a Go program, CodeQL does not examine the source code for external packages.
    To track the flow of untrusted data through a library, you can create a model of the library.
+
+-  :doc:`Customizing library models for Go <customizing-library-models-for-go>`: You can model frameworks and libraries that your codebase depends on using data extensions and publish them as CodeQL model packs.
diff --git a/docs/codeql/codeql-language-guides/customizing-library-models-for-go.rst b/docs/codeql/codeql-language-guides/customizing-library-models-for-go.rst
new file mode 100644
index 00000000000..c5b74ccd73a
--- /dev/null
+++ b/docs/codeql/codeql-language-guides/customizing-library-models-for-go.rst
@@ -0,0 +1,427 @@
+.. _customizing-library-models-for-go:
+
+Customizing library models for Go
+=================================
+
+You can model the methods and functions that control data flow in any framework or library. This is especially useful for custom frameworks or niche libraries, that are not supported by the standard CodeQL libraries.
+
+.. include:: ../reusables/beta-note-customizing-library-models.rst
+
+About this article
+------------------
+
+This article contains reference material about how to define custom models for sources, sinks, and flow summaries for Go dependencies in data extension files.
+
+About data extensions
+---------------------
+
+You can customize analysis by defining models (summaries, sinks, and sources) of your code's Go dependencies in data extension files. Each model defines the behavior of one or more elements of your library or framework, such as functions, methods, and fields. When you run dataflow analysis, these models expand the potential sources and sinks tracked by dataflow analysis and improve the precision of results.
+
+Most of the security queries search for paths from a source of untrusted input to a sink that represents a vulnerability. This is known as taint tracking. Each source is a starting point for dataflow analysis to track tainted data and each sink is an end point.
+
+Taint tracking queries also need to know how data can flow through elements that are not included in the source code. These are modeled as summaries. A summary model enables queries to synthesize the flow behavior through elements in dependency code that is not stored in your repository.
+
+Syntax used to define an element in an extension file
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Each model of an element is defined using a data extension where each tuple constitutes a model.
+A data extension file to extend the standard Go queries included with CodeQL is a YAML file with the form:
+
+.. code-block:: yaml
+
+   extensions:
+     - addsTo:
+         pack: codeql/go-all
+         extensible: <name of extensible predicate>
+       data:
+         - <tuple1>
+         - <tuple2>
+         - ...
+
+Each YAML file may contain one or more top-level extensions.
+
+- ``addsTo`` defines the CodeQL pack name and extensible predicate that the extension is injected into.
+- ``data`` defines one or more rows of tuples that are injected as values into the extensible predicate. The number of columns and their types must match the definition of the extensible predicate.
+
+Data extensions use union semantics, which means that the tuples of all extensions for a single extensible predicate are combined, duplicates are removed, and all of the remaining tuples are queryable by referencing the extensible predicate.
+
+Publish data extension files in a CodeQL model pack to share
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+You can group one or more data extension files into a CodeQL model pack and publish it to the GitHub Container Registry. This makes it easy for anyone to download the model pack and use it to extend their analysis. For more information, see `Creating a CodeQL model pack <https://docs.github.com/en/code-security/codeql-cli/using-the-advanced-functionality-of-the-codeql-cli/creating-and-working-with-codeql-packs#creating-a-codeql-model-pack>`__ and `Publishing and using CodeQL packs <https://docs.github.com/en/code-security/codeql-cli/using-the-advanced-functionality-of-the-codeql-cli/publishing-and-using-codeql-packs/>`__ in the CodeQL CLI documentation.
+
+Extensible predicates used to create custom models in Go
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The CodeQL library for Go analysis exposes the following extensible predicates:
+
+- ``sourceModel(package, type, subtypes, name, signature, ext, output, kind, provenance)``. This is used to model sources of potentially tainted data. The ``kind`` of the sources defined using this predicate determine which threat model they are associated with. Different threat models can be used to customize the sources used in an analysis. For more information, see ":ref:`Threat models <threat-models-go>`."
+- ``sinkModel(package, type, subtypes, name, signature, ext, input, kind, provenance)``. This is used to model sinks where tainted data may be used in a way that makes the code vulnerable.
+- ``summaryModel(package, type, subtypes, name, signature, ext, input, output, kind, provenance)``. This is used to model flow through elements.
+- ``neutralModel(package, type, name, signature, kind, provenance)``. This is similar to a summary model but used to model the flow of values that have only a minor impact on the dataflow analysis. Manual neutral models (those with a provenance such as ``manual`` or ``ai-manual``) can be used to override generated summary models (those with a provenance such as ``df-generated``), so that the summary model will be ignored. Other than that, neutral models have no effect.
+
+The extensible predicates are populated using the models defined in data extension files.
+
+Examples of custom model definitions
+------------------------------------
+
+The examples in this section are taken from the standard CodeQL Go query pack published by GitHub. They demonstrate how to add tuples to extend extensible predicates that are used by the standard queries.
+
+Example: Taint sink in the ``database/sql`` package
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This example shows how the Go query pack models the argument of the ``Prepare`` method as a SQL injection sink.
+This is the ``Prepare`` method of the ``DB`` type in the ``database/sql`` package which creates a prepared statement.
+
+.. code-block:: go
+
+    func Tainted(db *sql.DB, name string) {
+        stmt, err := db.Prepare("SELECT * FROM users WHERE name = " + name) // The argument to this method is a SQL injection sink.
+        ...
+    }
+
+We need to add a tuple to the ``sinkModel``\(package, type, subtypes, name, signature, ext, input, kind, provenance) extensible predicate by updating a data extension file.
+
+.. code-block:: yaml
+
+   extensions:
+     - addsTo:
+         pack: codeql/go-all
+         extensible: sinkModel
+       data:
+         - ["database/sql", "DB", True, "Prepare", "", "", "Argument[0]", "sql-injection", "manual"]
+
+Since we want to add a new sink, we need to add a tuple to the ``sinkModel`` extensible predicate.
+The first five values identify the function (in this case a method) to be modeled as a sink.
+
+- The first value ``database/sql`` is the package name.
+- The second value ``DB`` is the name of the type that the method is associated with.
+- The third value ``True`` is a flag that indicates whether or not the sink also applies to subtypes. This includes when the subtype embeds the given type, so that the method or field is promoted to be a method or field of the subtype. For interface methods it also includes types which implement the interface type.
+- The fourth value ``Prepare`` is the method name.
+- The fifth value ``""`` is the input type signature. For Go it should always be an empty string. It is needed for other languages where multiple functions may have the same name and they need to be distinguished by the number and types of the arguments.
+
+The sixth value should be left empty and is out of scope for this documentation.
+The remaining values are used to define the ``access path``, the ``kind``, and the ``provenance`` (origin) of the sink.
+
+- The seventh value ``Argument[0]`` is the ``access path`` to the first argument passed to the method, which means that this is the location of the sink.
+- The eighth value ``sql-injection`` is the kind of the sink. The sink kind is used to define the queries where the sink is in scope. In this case - the SQL injection queries.
+- The ninth value ``manual`` is the provenance of the sink, which is used to identify the origin of the sink.
+
+Example: Taint source from the ``net/http`` package
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+This example shows how the Go query pack models the return value from the ``FormValue`` method as a ``remote`` source.
+This is the ``FormValue`` method of the ``Request`` type which is located in the ``net/http`` package.
+
+.. code-block:: go
+
+    func Tainted(r *http.Request) {
+        name := r.FormValue("name") // The return value of this method is a source of tainted data.
+        ...
+    }
+
+
+We need to add a tuple to the ``sourceModel``\(package, type, subtypes, name, signature, ext, output, kind, provenance) extensible predicate by updating a data extension file.
+
+.. code-block:: yaml
+
+   extensions:
+     - addsTo:
+         pack: codeql/go-all
+         extensible: sourceModel
+       data:
+         - ["net/http", "Request", True, "FormValue", "", "", "ReturnValue", "remote", "manual"]
+
+
+Since we are adding a new source, we need to add a tuple to the ``sourceModel`` extensible predicate.
+The first five values identify the function to be modeled as a source.
+
+- The first value ``net/http`` is the package name.
+- The second value ``Request`` is the type name, since the function is a method of the ``Request`` type.
+- The third value ``True`` is a flag that indicates whether or not the sink also applies to subtypes. This includes when the subtype embeds the given type, so that the method or field is promoted to be a method or field of the subtype. For interface methods it also includes types which implement the interface type.
+- The fourth value ``FormValue`` is the function name.
+- The fifth value ``""`` is the input type signature. For Go it should always be an empty string. It is needed for other languages where multiple functions may have the same name and they need to be distinguished by the number and types of the arguments.
+
+The sixth value should be left empty and is out of scope for this documentation.
+The remaining values are used to define the ``access path``, the ``kind``, and the ``provenance`` (origin) of the source.
+
+- The seventh value ``ReturnValue`` is the access path to the return of the method, which means that it is the return value that should be considered a source of tainted input.
+- The eighth value ``remote`` is the kind of the source. The source kind is used to define the threat model where the source is in scope. ``remote`` applies to many of the security related queries as it means a remote source of untrusted data. As an example the SQL injection query uses ``remote`` sources. For more information, see ":ref:`Threat models <threat-models-go>`."
+- The ninth value ``manual`` is the provenance of the source, which is used to identify the origin of the source.
+
+Example: Add flow through the ``Max`` function
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This example shows how the Go query pack models flow through a function for a simple case.
+This pattern covers many of the cases where we need to summarize flow through a function that is stored in a library or framework outside the repository.
+
+.. code-block:: go
+
+    func ValueFlow {
+        a := []int{1, 2, 3}
+        max := slices.Max(a) // There is value flow from the elements of `a` to `max`.
+        ...
+    }
+
+We need to add a tuple to the ``summaryModel``\(package, type, subtypes, name, signature, ext, input, output, kind, provenance) extensible predicate by updating a data extension file:
+
+.. code-block:: yaml
+
+   extensions:
+     - addsTo:
+         pack: codeql/go-all
+         extensible: summaryModel
+       data:
+         - ["slices", "", False, "Max", "", "", "Argument[0].ArrayElement", "ReturnValue", "value", "manual"] 
+
+Since we are adding flow through a method, we need to add tuples to the ``summaryModel`` extensible predicate.
+The first row defines flow from the first argument (``a`` in the example) to the return value (``max`` in the example).
+
+The first five values identify the function to be modeled as a summary.
+
+- The first value ``slices`` is the package name.
+- The second value ``""`` is left blank, since the function is not a method of a type.
+- The third value ``False`` is a flag that indicates whether or not the sink also applies to subtypes. This has no effect for non-method functions.
+- The fourth value ``Max`` is the function name.
+- The fifth value ``""`` is the input type signature. For Go it should always be an empty string. It is needed for other languages where multiple functions may have the same name and they need to be distinguished by the number and types of the arguments.
+
+The sixth value should be left empty and is out of scope for this documentation.
+The remaining values are used to define the ``access path``, the ``kind``, and the ``provenance`` (origin) of the summary.
+
+- The seventh value is the access path to the input (where data flows from). ``Argument[0].ArrayElement`` is the access path to the array elements of the first argument (the elements of the slice in the example).
+- The eighth value ``ReturnValue`` is the access path to the output (where data flows to), in this case ``ReturnValue``, which means that the input flows to the return value.
+- The ninth value ``value`` is the kind of the flow. ``value`` flow indicates an entire value is moved, ``taint`` means that taint is propagated through the call.
+- The tenth value ``manual`` is the provenance of the summary, which is used to identify the origin of the summary.
+
+Example: Add flow through the ``Concat`` function
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This example shows how the Go query pack models flow through a function for a simple case.
+This pattern covers many of the cases where we need to summarize flow through a function that is stored in a library or framework outside the repository.
+
+.. code-block:: go
+
+    func ValueFlow {
+        a := []int{1, 2, 3}
+        b := []int{4, 5, 6}
+        c := slices.Concat(a, b) // There is taint flow from `a` and `b` to `c`.
+        ...
+    }
+
+We need to add a tuple to the ``summaryModel``\(package, type, subtypes, name, signature, ext, input, output, kind, provenance) extensible predicate by updating a data extension file:
+
+.. code-block:: yaml
+
+   extensions:
+     - addsTo:
+         pack: codeql/go-all
+         extensible: summaryModel
+       data:
+         - ["slices", "", False, "Concat", "", "", "Argument[0].ArrayElement.ArrayElement", "ReturnValue.ArrayElement", "value", "manual"]
+
+Since we are adding flow through a method, we need to add tuples to the ``summaryModel`` extensible predicate.
+The first row defines flow from the arguments (``a`` and ``b`` in the example) to the return value (``c`` in the example).
+
+The first five values identify the function to be modeled as a summary.
+
+- The first value ``slices`` is the package name.
+- The second value ``""`` is left blank, since the function is not a method of a type.
+- The third value ``False`` is a flag that indicates whether or not the sink also applies to subtypes. This has no effect for non-method functions.
+- The fourth value ``Max`` is the function name.
+- The fifth value ``""`` is the input type signature. For Go it should always be an empty string. It is needed for other languages where multiple functions may have the same name and they need to be distinguished by the number and types of the arguments.
+
+The sixth value should be left empty and is out of scope for this documentation.
+The remaining values are used to define the ``access path``, the ``kind``, and the ``provenance`` (origin) of the summary.
+
+- The seventh value is the access path to the input (where data flows from). ``Argument[0].ArrayElement.ArrayElement`` is the access path to the array elements of the array elements of the first argument. Note that a variadic parameter of type `...T` is treated as if it has type `[]T` and arguments corresponding to the variadic parameter are accessed as elements of this slice.
+- The eighth value ``ReturnValue.ArrayElement`` is the access path to the output (where data flows to), in this case ``ReturnValue.ArrayElement``, which means that the input flows to the array elements of the return value.
+- The ninth value ``value`` is the kind of the flow. ``value`` flow indicates an entire value is moved, ``taint`` means that taint is propagated through the call.
+- The tenth value ``manual`` is the provenance of the summary, which is used to identify the origin of the summary.
+
+Example: Add flow through the ``Join`` function
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+This example shows how the Go query pack models flow through a method for a simple case.
+This pattern covers many of the cases where we need to summarize flow through a function that is stored in a library or framework outside the repository.
+
+.. code-block:: go
+
+    func TaintFlow() {
+        elems := []string{"Hello", "World"}
+        sep := " "
+        t := strings.Join(elems, sep) // There is taint flow from elems and sep to t.
+        ...
+    }
+
+We need to add tuples to the ``summaryModel``\(package, type, subtypes, name, signature, ext, input, output, kind, provenance) extensible predicate by updating a data extension file:
+
+.. code-block:: yaml
+
+   extensions:
+     - addsTo:
+         pack: codeql/go-all
+         extensible: summaryModel
+       data:
+         - ["strings", "", False, "Join", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+         - ["strings", "", False, "Join", "", "", "Argument[1]", "ReturnValue", "taint", "manual"]
+
+Since we are adding flow through a method, we need to add tuples to the ``summaryModel`` extensible predicate.
+Each tuple defines flow from one argument to the return value.
+The first row defines flow from the first argument (``elems`` in the example) to the return value (``t`` in the example) and the second row defines flow from the second argument (``sep`` in the example) to the return value (``t`` in the example).
+
+The first five values identify the function to be modeled as a summary.
+These are the same for both of the rows above as we are adding two summaries for the same method.
+
+- The first value ``strings`` is the package name.
+- The second value ``""`` is left blank, since the function is not a method of a type.
+- The third value ``False`` is a flag that indicates whether or not the sink also applies to subtypes. This has no effect for non-method functions.
+- The fourth value ``Join`` is the function name.
+- The fifth value ``""`` is the input type signature. For Go it should always be an empty string. It is needed for other languages where multiple functions may have the same name and they need to be distinguished by the number and types of the arguments.
+
+The sixth value should be left empty and is out of scope for this documentation.
+The remaining values are used to define the ``access path``, the ``kind``, and the ``provenance`` (origin) of the summary.
+
+- The seventh value is the access path to the input (where data flows from). ``Argument[0]`` is the access path to the first argument (``elems`` in the example) and ``Argument[1]`` is the access path to the second argument (``sep`` in the example).
+- The eighth value ``ReturnValue`` is the access path to the output (where data flows to), in this case ``ReturnValue``, which means that the input flows to the return value.
+- The ninth value ``taint`` is the kind of the flow. ``taint`` means that taint is propagated through the call.
+- The tenth value ``manual`` is the provenance of the summary, which is used to identify the origin of the summary.
+
+It would also be possible to merge the two rows into one by using ".." to indicate a range in the seventh value. This would be useful if the method has many arguments and the flow is the same for all of them.
+
+.. code-block:: yaml
+
+   extensions:
+     - addsTo:
+         pack: codeql/go-all
+         extensible: summaryModel
+       data:
+         - ["strings", "", False, "Join", "", "", "Argument[0..1]", "ReturnValue", "taint", "manual"]
+
+This row defines flow from both the first and the second argument to the return value. The seventh value ``Argument[0..1]`` is shorthand for specifying an access path to both ``Argument[0]`` and ``Argument[1]``.
+
+Example: Add flow through the ``Hostname`` method
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+This example shows how the Go query pack models flow through a method for a simple case.
+
+.. code-block:: go
+
+    func TaintFlow(u *url.URL) {
+        host := u.Hostname() // There is taint flow from u to host.
+        ...
+    }
+    
+We need to add a tuple to the ``summaryModel``\(package, type, subtypes, name, signature, ext, input, output, kind, provenance) extensible predicate by updating a data extension file:
+
+.. code-block:: yaml
+
+   extensions:
+     - addsTo:
+         pack: codeql/go-all
+         extensible: summaryModel
+       data:
+         - ["net/url", "URL", True, "Hostname", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+
+Since we are adding flow through a method, we need to add tuples to the ``summaryModel`` extensible predicate.
+Each tuple defines flow from one argument to the return value.
+The first row defines flow from the qualifier of the method call (``u`` in the example) to the return value (``host`` in the example).
+
+The first five values identify the function (in this case a method) to be modeled as a summary.
+
+- The first value ``net/url`` is the package name.
+- The second value ``URL`` is the receiver type.
+- The third value ``True`` is a flag that indicates whether or not the sink also applies to subtypes. This includes when the subtype embeds the given type, so that the method or field is promoted to be a method or field of the subtype. For interface methods it also includes types which implement the interface type.
+- The fourth value ``Hostname`` is the method name.
+- The fifth value ``""`` is the input type signature. For Go it should always be an empty string. It is needed for other languages where multiple functions may have the same name and they need to be distinguished by the number and types of the arguments.
+
+The sixth value should be left empty and is out of scope for this documentation.
+The remaining values are used to define the ``access path``, the ``kind``, and the ``provenance`` (origin) of the summary.
+
+- The seventh value is the access path to the input (where data flows from). ``Argument[receiver]`` is the access path to the receiver (``u`` in the example).
+- The eighth value ``ReturnValue`` is the access path to the output (where data flows to), in this case ``ReturnValue``, which means that the input flows to the return value. When there are multiple return values, use ``ReturnValue[i]`` to refer to the ``i`` th return value (starting from 0).
+- The ninth value ``taint`` is the kind of the flow. ``taint`` means that taint is propagated through the call.
+- The tenth value ``manual`` is the provenance of the summary, which is used to identify the origin of the summary.
+
+Example: Accessing the ``Body`` field of an HTTP request
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+This example shows how we can model a field read as a source of tainted data.
+
+.. code-block:: go
+
+   func TaintFlow(w http.ResponseWriter, r *http.Request) {
+       body := r.Body // The Body field of an HTTP request is a source of tainted data.
+       ...
+   }
+
+We need to add a tuple to the ``sourceModel``\(package, type, subtypes, name, signature, ext, output, kind, provenance) extensible predicate by updating a data extension file.
+
+.. code-block:: yaml
+
+  extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sourceModel
+    data:
+      - ["net/http", "Request", True, "Body", "", "", "", "remote", "manual"]
+
+Since we are adding a new source, we need to add a tuple to the ``sourceModel`` extensible predicate.
+The first five values identify the field to be modeled as a source.
+
+- The first value ``net/http`` is the package name.
+- The second value ``Request`` is the name of the type that the field is associated with.
+- The third value ``True`` is a flag that indicates whether or not the sink also applies to subtypes. For fields this means when the field is accessed as a promoted field in another type.
+- The fourth value ``Body`` is the field name.
+- The fifth value ``""`` is the input type signature. For Go it should always be an empty string. It is needed for other languages where multiple functions may have the same name and they need to be distinguished by the number and types of the arguments.
+
+The sixth value should be left empty and is out of scope for this documentation.
+The remaining values are used to define the ``access path``, the ``kind``, and the ``provenance`` (origin) of the source.
+
+- The seventh value ``""`` is left blank. Leaving the access path of a source model blank indicates that it is a field access.
+- The eighth value ``remote`` is the source kind. This indicates that the source is a remote source of untrusted data.
+- The ninth value ``manual`` is the provenance of the source, which is used to identify the origin of the source.
+
+Package versions
+~~~~~~~~~~~~~~~~
+
+When the major version number is greater than 1 it is included in the package import path. It usually looks like ``/v2`` after the module import path. This is called the major version suffix. We normally want our models to apply to all versions of a package. Rather than having to repeat models with the package column changed to include all available versions, we can just use the package name without the major version suffix and this will be matched to any version. So models with ``github.com/couchbase/gocb`` in the package column will match packages imported from ``github.com/couchbase/gocb`` and ``github.com/couchbase/gocb/v2`` (or any other version).
+
+Note that packages hosted at ``gopkg.in`` use a slightly different syntax: the major version suffix looks like ``.v2``, and it is present even for version 1. This is also supported. So models with ``gopkg.in/yaml`` in the package column will match packages imported from ``gopkg.in/yaml.v1``, ``gopkg.in/yaml.v2`` and ``gopkg.in/yaml.v3``.
+
+To write models that only apply to ``github.com/couchbase/gocb/v2``, it is sufficient to include the major version suffix (``/v2``) in the package column. To write models that only apply to ``github.com/couchbase/gocb``, you may prefix the package column with ``fixed-version:``. For example, here are two models for a method that has changed name from v1 to v2.
+
+.. code-block:: yaml
+  
+    extensions:
+    - addsTo:
+        pack: codeql/go-all
+        extensible: sinkModel
+      data:
+        - ["fixed-version:github.com/couchbase/gocb", "Cluster", True, "ExecuteAnalyticsQuery", "", "", "Argument[0]", "nosql-injection", "manual"]
+        - ["github.com/couchbase/gocb/v2", "Cluster", True, "AnalyticsQuery", "", "", "Argument[0]", "nosql-injection", "manual"]
+
+Package grouping
+~~~~~~~~~~~~~~~~
+
+Since Go uses URLs for package identifiers, it is possible for packages to be imported with different paths. For example, the ``glog`` package can be imported using both the ``github.com/golang/glog`` and ``gopkg.in/glog`` paths.
+
+To handle this, the CodeQL Go library uses a mapping from the package path to a group name for the package. This mapping can be specified using the ``packageGrouping`` extensible predicate, and then the models for the APIs in the package
+will use the the prefix ``group:`` followed by the group name in place of the package path.
+
+.. code-block:: yaml
+
+   extensions:
+     - addsTo:
+         pack: codeql/go
+         extensible: packageGrouping
+       data:
+         - ["glog", "github.com/golang/glog"]
+         - ["glog", "gopkg.in/glog"]
+    - addsTo:
+        pack: codeql/go
+        extensible: sinkModel
+      data:
+        - ["group:glog", "", False, "Info", "", "", "Argument[0]", "log-injection", "manual"]
+
+.. _threat-models-go:
+
+Threat models
+-------------
+
+.. include:: ../reusables/threat-model-description.rst
diff --git a/docs/codeql/ql-language-reference/modules.rst b/docs/codeql/ql-language-reference/modules.rst
index 75b61667246..d0cbdd39e36 100644
--- a/docs/codeql/ql-language-reference/modules.rst
+++ b/docs/codeql/ql-language-reference/modules.rst
@@ -431,10 +431,7 @@ The above query therefore evalutes to:
 BigInt
 ======
 
-The built-in ``QlBuiltins`` module provides an **experimental** type ``BigInt`` of arbitrary-precision integers.
-
-This type is not available in the CodeQL CLI by default, but you can enable it by passing the ``--allow-experimental=bigint``
-option to the CodeQL CLI. Consequently, BigInts are currently disallowed in query results and dbscheme columns.
+The built-in ``QlBuiltins`` module provides a type ``BigInt`` of arbitrary-range integers.
 
 Unlike ``int`` and ``float``, there is no automatic conversion between ``BigInt`` and other numeric types.
 Instead, big integers can be constructed using the ``.toBigInt()`` methods of ``int`` and ``string``.
@@ -451,3 +448,5 @@ The other built-in operations are:
     ``rank``, ``unique``, ``any``.
 *   other: ``.pow(int)``, ``.abs()``, ``.gcd(BigInt)``, ``.minimum(BigInt)``,
     ``.maximum(BigInt)``.
+
+Note: big integers are currently disallowed in query results and dbscheme columns.
diff --git a/docs/codeql/ql-language-reference/ql-language-specification.rst b/docs/codeql/ql-language-reference/ql-language-specification.rst
index 60e5ece7330..4c8fd30076a 100644
--- a/docs/codeql/ql-language-reference/ql-language-specification.rst
+++ b/docs/codeql/ql-language-reference/ql-language-specification.rst
@@ -445,7 +445,7 @@ An integer value is of type ``int``. Each value is a 32-bit two's complement int
 
 A string is a finite sequence of 16-bit characters. The characters are interpreted as Unicode code points.
 
-A :ref:`big integer <bigint>` value is of type ``QlBuiltins::BigInt``. Each value is a signed arbitrary-precision integer.
+A :ref:`big integer <bigint>` value is of type ``QlBuiltins::BigInt``. Each value is a signed arbitrary-range integer.
 
 The database includes a number of opaque entity values. Each such value has a type that is one of the database types, and an identifying integer. An entity value is written as the name of its database type followed by its identifying integer in parentheses. For example, ``@tree(12)``, ``@person(16)``, and ``@location(38132)`` are entity values. The identifying integers are left opaque to programmers in this specification, so an implementation of QL is free to use some other set of countable labels to identify its entities.
 
diff --git a/docs/codeql/ql-language-reference/types.rst b/docs/codeql/ql-language-reference/types.rst
index e14f542dcf8..d2d79fe8409 100644
--- a/docs/codeql/ql-language-reference/types.rst
+++ b/docs/codeql/ql-language-reference/types.rst
@@ -52,7 +52,7 @@ independent of the database that you are querying.
 QL has a range of built-in operations defined on primitive types. These are available by using dispatch on expressions of the appropriate type. For example, ``1.toString()`` is the string representation of the integer constant ``1``. For a full list of built-in operations available in QL, see the
 section on `built-ins <https://codeql.github.com/docs/ql-language-reference/ql-language-specification/#built-ins>`__ in the QL language specification.
 
-Additionally, there is an experimental arbitrary-precision integer primitive type at :ref:`QlBuiltins::BigInt <bigint>`. This type is not available in the CodeQL CLI by default, but you can enable it by passing the ``--allow-experimental=bigint`` option to the CodeQL CLI.
+Additionally, there is an arbitrary-range integer primitive type at :ref:`QlBuiltins::BigInt <bigint>`.
 
 .. index:: class
 .. _classes:
diff --git a/go/documentation/library-coverage/coverage.csv b/go/documentation/library-coverage/coverage.csv
index 364e17aa94b..cf5a8b715b0 100644
--- a/go/documentation/library-coverage/coverage.csv
+++ b/go/documentation/library-coverage/coverage.csv
@@ -1,121 +1,142 @@
-package,sink,source,summary,sink:command-injection,sink:credentials-key,sink:jwt,sink:path-injection,sink:regex-use[0],sink:regex-use[1],sink:regex-use[c],sink:request-forgery,sink:request-forgery[TCP Addr + Port],sink:url-redirection,sink:url-redirection[0],sink:url-redirection[receiver],sink:xpath-injection,source:environment,source:file,source:remote,summary:taint,summary:value
-,,,8,,,,,,,,,,,,,,,,,3,5
-archive/tar,,,5,,,,,,,,,,,,,,,,,5,
-archive/zip,,,6,,,,,,,,,,,,,,,,,6,
-bufio,,,17,,,,,,,,,,,,,,,,,17,
-bytes,,,43,,,,,,,,,,,,,,,,,43,
-clevergo.tech/clevergo,1,,,,,,,,,,,,,,1,,,,,,
-compress/bzip2,,,1,,,,,,,,,,,,,,,,,1,
-compress/flate,,,4,,,,,,,,,,,,,,,,,4,
-compress/gzip,,,3,,,,,,,,,,,,,,,,,3,
-compress/lzw,,,1,,,,,,,,,,,,,,,,,1,
-compress/zlib,,,4,,,,,,,,,,,,,,,,,4,
-container/heap,,,5,,,,,,,,,,,,,,,,,5,
-container/list,,,20,,,,,,,,,,,,,,,,,20,
-container/ring,,,5,,,,,,,,,,,,,,,,,5,
-context,,,5,,,,,,,,,,,,,,,,,5,
-crypto,,,10,,,,,,,,,,,,,,,,,10,
-database/sql,,,11,,,,,,,,,,,,,,,,,11,
-encoding,,,77,,,,,,,,,,,,,,,,,77,
-errors,,,3,,,,,,,,,,,,,,,,,3,
-expvar,,,6,,,,,,,,,,,,,,,,,6,
-fmt,,,16,,,,,,,,,,,,,,,,,16,
-github.com/ChrisTrenkamp/goxpath,3,,,,,,,,,,,,,,,3,,,,,
-github.com/antchfx/htmlquery,4,,,,,,,,,,,,,,,4,,,,,
-github.com/antchfx/jsonquery,4,,,,,,,,,,,,,,,4,,,,,
-github.com/antchfx/xmlquery,8,,,,,,,,,,,,,,,8,,,,,
-github.com/antchfx/xpath,4,,,,,,,,,,,,,,,4,,,,,
-github.com/appleboy/gin-jwt,1,,,,1,,,,,,,,,,,,,,,,
-github.com/astaxie/beego,7,21,21,,,,5,,,,,,2,,,,,,21,21,
-github.com/beego/beego,14,42,42,,,,10,,,,,,4,,,,,,42,42,
-github.com/caarlos0/env,,5,2,,,,,,,,,,,,,,5,,,1,1
-github.com/clevergo/clevergo,1,,,,,,,,,,,,,,1,,,,,,
-github.com/codeskyblue/go-sh,4,,,4,,,,,,,,,,,,,,,,,
-github.com/couchbase/gocb,,,18,,,,,,,,,,,,,,,,,18,
-github.com/couchbaselabs/gocb,,,18,,,,,,,,,,,,,,,,,18,
-github.com/crankycoder/xmlpath,2,,,,,,,,,,,,,,,2,,,,,
-github.com/cristalhq/jwt,1,,,,1,,,,,,,,,,,,,,,,
-github.com/dgrijalva/jwt-go,3,,9,,2,1,,,,,,,,,,,,,,9,
-github.com/elazarl/goproxy,,2,2,,,,,,,,,,,,,,,,2,2,
-github.com/emicklei/go-restful,,7,,,,,,,,,,,,,,,,,7,,
-github.com/evanphx/json-patch,,,12,,,,,,,,,,,,,,,,,12,
-github.com/form3tech-oss/jwt-go,2,,,,2,,,,,,,,,,,,,,,,
-github.com/gin-gonic/gin,3,46,2,,,,3,,,,,,,,,,,,46,2,
-github.com/go-chi/chi,,3,,,,,,,,,,,,,,,,,3,,
-github.com/go-chi/jwtauth,1,,,,1,,,,,,,,,,,,,,,,
-github.com/go-jose/go-jose,3,,4,,2,1,,,,,,,,,,,,,,4,
-github.com/go-kit/kit/auth/jwt,1,,,,1,,,,,,,,,,,,,,,,
-github.com/go-pg/pg/orm,,,6,,,,,,,,,,,,,,,,,6,
-github.com/go-xmlpath/xmlpath,2,,,,,,,,,,,,,,,2,,,,,
-github.com/gobuffalo/envy,,7,,,,,,,,,,,,,,,7,,,,
-github.com/gobwas/ws,,2,,,,,,,,,,,,,,,,,2,,
-github.com/gofiber/fiber,5,,,,,,4,,,,,,,,1,,,,,,
-github.com/gogf/gf-jwt,1,,,,1,,,,,,,,,,,,,,,,
-github.com/going/toolkit/xmlpath,2,,,,,,,,,,,,,,,2,,,,,
-github.com/golang-jwt/jwt,3,,11,,2,1,,,,,,,,,,,,,,11,
-github.com/golang/protobuf/proto,,,4,,,,,,,,,,,,,,,,,4,
-github.com/gorilla/mux,,1,,,,,,,,,,,,,,,,,1,,
-github.com/gorilla/websocket,,3,,,,,,,,,,,,,,,,,3,,
-github.com/hashicorp/go-envparse,,1,,,,,,,,,,,,,,,1,,,,
-github.com/jbowtie/gokogiri/xml,4,,,,,,,,,,,,,,,4,,,,,
-github.com/jbowtie/gokogiri/xpath,1,,,,,,,,,,,,,,,1,,,,,
-github.com/joho/godotenv,,4,,,,,,,,,,,,,,,4,,,,
-github.com/json-iterator/go,,,4,,,,,,,,,,,,,,,,,4,
-github.com/kataras/iris/context,6,,,,,,6,,,,,,,,,,,,,,
-github.com/kataras/iris/middleware/jwt,2,,,,2,,,,,,,,,,,,,,,,
-github.com/kataras/iris/server/web/context,6,,,,,,6,,,,,,,,,,,,,,
-github.com/kataras/jwt,5,,,,5,,,,,,,,,,,,,,,,
-github.com/kelseyhightower/envconfig,,6,,,,,,,,,,,,,,,6,,,,
-github.com/labstack/echo,3,12,2,,,,2,,,,,,1,,,,,,12,2,
-github.com/lestrrat-go/jwx,2,,,,2,,,,,,,,,,,,,,,,
-github.com/lestrrat-go/libxml2/parser,3,,,,,,,,,,,,,,,3,,,,,
-github.com/lestrrat/go-jwx/jwk,1,,,,1,,,,,,,,,,,,,,,,
-github.com/masterzen/xmlpath,2,,,,,,,,,,,,,,,2,,,,,
-github.com/moovweb/gokogiri/xml,4,,,,,,,,,,,,,,,4,,,,,
-github.com/moovweb/gokogiri/xpath,1,,,,,,,,,,,,,,,1,,,,,
-github.com/ory/fosite/token/jwt,2,,,,2,,,,,,,,,,,,,,,,
-github.com/revel/revel,2,23,10,,,,1,,,,,,1,,,,,,23,10,
-github.com/robfig/revel,2,23,10,,,,1,,,,,,1,,,,,,23,10,
-github.com/santhosh-tekuri/xpathparser,2,,,,,,,,,,,,,,,2,,,,,
-github.com/sendgrid/sendgrid-go/helpers/mail,,,1,,,,,,,,,,,,,,,,,1,
-github.com/spf13/afero,34,,,,,,34,,,,,,,,,,,,,,
-github.com/square/go-jose,3,,4,,2,1,,,,,,,,,,,,,,4,
-github.com/valyala/fasthttp,35,50,5,,,,8,,,,17,8,2,,,,,,50,5,
-go.uber.org/zap,,,11,,,,,,,,,,,,,,,,,11,
-golang.org/x/crypto/ssh,4,,,4,,,,,,,,,,,,,,,,,
-golang.org/x/net/context,,,5,,,,,,,,,,,,,,,,,5,
-golang.org/x/net/html,,,16,,,,,,,,,,,,,,,,,16,
-golang.org/x/net/websocket,,2,,,,,,,,,,,,,,,,,2,,
-google.golang.org/protobuf/internal/encoding/text,,,1,,,,,,,,,,,,,,,,,1,
-google.golang.org/protobuf/internal/impl,,,2,,,,,,,,,,,,,,,,,2,
-google.golang.org/protobuf/proto,,,8,,,,,,,,,,,,,,,,,8,
-google.golang.org/protobuf/reflect/protoreflect,,,1,,,,,,,,,,,,,,,,,1,
-gopkg.in/couchbase/gocb,,,18,,,,,,,,,,,,,,,,,18,
-gopkg.in/go-jose/go-jose,3,,4,,2,1,,,,,,,,,,,,,,4,
-gopkg.in/go-xmlpath/xmlpath,2,,,,,,,,,,,,,,,2,,,,,
-gopkg.in/macaron,1,12,1,,,,,,,,,,,,1,,,,12,1,
-gopkg.in/square/go-jose,3,,4,,2,1,,,,,,,,,,,,,,4,
-gopkg.in/xmlpath,2,,,,,,,,,,,,,,,2,,,,,
-gopkg.in/yaml,,,9,,,,,,,,,,,,,,,,,9,
-html,,,8,,,,,,,,,,,,,,,,,8,
-io,5,4,34,,,,5,,,,,,,,,,,4,,34,
-k8s.io/api/core,,,10,,,,,,,,,,,,,,,,,10,
-k8s.io/apimachinery/pkg/runtime,,,47,,,,,,,,,,,,,,,,,47,
-launchpad.net/xmlpath,2,,,,,,,,,,,,,,,2,,,,,
-log,,,3,,,,,,,,,,,,,,,,,3,
-math/big,,,1,,,,,,,,,,,,,,,,,1,
-mime,,,14,,,,,,,,,,,,,,,,,14,
-net,2,16,100,,,,1,,,,,,,1,,,,,16,100,
-nhooyr.io/websocket,,2,,,,,,,,,,,,,,,,,2,,
-os,29,10,6,3,,,26,,,,,,,,,,7,3,,6,
-path,,,18,,,,,,,,,,,,,,,,,18,
-reflect,,,37,,,,,,,,,,,,,,,,,37,
-regexp,10,,20,,,,,3,3,4,,,,,,,,,,20,
-sort,,,1,,,,,,,,,,,,,,,,,1,
-strconv,,,9,,,,,,,,,,,,,,,,,9,
-strings,,,34,,,,,,,,,,,,,,,,,34,
-sync,,,34,,,,,,,,,,,,,,,,,34,
-syscall,5,2,8,5,,,,,,,,,,,,,2,,,8,
-text/scanner,,,3,,,,,,,,,,,,,,,,,3,
-text/tabwriter,,,1,,,,,,,,,,,,,,,,,1,
-text/template,,,6,,,,,,,,,,,,,,,,,6,
+package,sink,source,summary,sink:command-injection,sink:credentials-key,sink:jwt,sink:log-injection,sink:nosql-injection,sink:path-injection,sink:regex-use[0],sink:regex-use[1],sink:regex-use[c],sink:request-forgery,sink:request-forgery[TCP Addr + Port],sink:sql-injection,sink:url-redirection,sink:url-redirection[0],sink:url-redirection[receiver],sink:xpath-injection,source:environment,source:file,source:remote,source:stdin,summary:taint,summary:value
+,,,8,,,,,,,,,,,,,,,,,,,,,3,5
+archive/tar,,,5,,,,,,,,,,,,,,,,,,,,,5,
+archive/zip,,,6,,,,,,,,,,,,,,,,,,,,,6,
+bufio,,,17,,,,,,,,,,,,,,,,,,,,,17,
+bytes,,,43,,,,,,,,,,,,,,,,,,,,,43,
+clevergo.tech/clevergo,1,,,,,,,,,,,,,,,,,1,,,,,,,
+compress/bzip2,,,1,,,,,,,,,,,,,,,,,,,,,1,
+compress/flate,,,4,,,,,,,,,,,,,,,,,,,,,4,
+compress/gzip,,,3,,,,,,,,,,,,,,,,,,,,,3,
+compress/lzw,,,1,,,,,,,,,,,,,,,,,,,,,1,
+compress/zlib,,,4,,,,,,,,,,,,,,,,,,,,,4,
+container/heap,,,5,,,,,,,,,,,,,,,,,,,,,5,
+container/list,,,20,,,,,,,,,,,,,,,,,,,,,20,
+container/ring,,,5,,,,,,,,,,,,,,,,,,,,,5,
+context,,,5,,,,,,,,,,,,,,,,,,,,,5,
+crypto,,,10,,,,,,,,,,,,,,,,,,,,,10,
+database/sql,30,,11,,,,,,,,,,,,30,,,,,,,,,11,
+encoding,,,77,,,,,,,,,,,,,,,,,,,,,77,
+errors,,,3,,,,,,,,,,,,,,,,,,,,,3,
+expvar,,,6,,,,,,,,,,,,,,,,,,,,,6,
+fmt,3,,16,,,,3,,,,,,,,,,,,,,,,,16,
+github.com/ChrisTrenkamp/goxpath,3,,,,,,,,,,,,,,,,,,3,,,,,,
+github.com/Masterminds/squirrel,32,,,,,,,,,,,,,,32,,,,,,,,,,
+github.com/Sirupsen/logrus,145,,,,,,145,,,,,,,,,,,,,,,,,,
+github.com/antchfx/htmlquery,4,,,,,,,,,,,,,,,,,,4,,,,,,
+github.com/antchfx/jsonquery,4,,,,,,,,,,,,,,,,,,4,,,,,,
+github.com/antchfx/xmlquery,8,,,,,,,,,,,,,,,,,,8,,,,,,
+github.com/antchfx/xpath,4,,,,,,,,,,,,,,,,,,4,,,,,,
+github.com/appleboy/gin-jwt,1,,,,1,,,,,,,,,,,,,,,,,,,,
+github.com/astaxie/beego,71,21,21,,,,34,,5,,,,,,30,2,,,,,,21,,21,
+github.com/beego/beego,142,42,42,,,,68,,10,,,,,,60,4,,,,,,42,,42,
+github.com/caarlos0/env,,5,2,,,,,,,,,,,,,,,,,5,,,,1,1
+github.com/clevergo/clevergo,1,,,,,,,,,,,,,,,,,1,,,,,,,
+github.com/codeskyblue/go-sh,4,,,4,,,,,,,,,,,,,,,,,,,,,
+github.com/couchbase/gocb,8,,18,,,,,8,,,,,,,,,,,,,,,,18,
+github.com/couchbaselabs/gocb,8,,18,,,,,8,,,,,,,,,,,,,,,,18,
+github.com/crankycoder/xmlpath,2,,,,,,,,,,,,,,,,,,2,,,,,,
+github.com/cristalhq/jwt,1,,,,1,,,,,,,,,,,,,,,,,,,,
+github.com/davecgh/go-spew/spew,9,,,,,,9,,,,,,,,,,,,,,,,,,
+github.com/dgrijalva/jwt-go,3,,9,,2,1,,,,,,,,,,,,,,,,,,9,
+github.com/elazarl/goproxy,2,2,2,,,,2,,,,,,,,,,,,,,,2,,2,
+github.com/emicklei/go-restful,,7,,,,,,,,,,,,,,,,,,,,7,,,
+github.com/evanphx/json-patch,,,12,,,,,,,,,,,,,,,,,,,,,12,
+github.com/form3tech-oss/jwt-go,2,,,,2,,,,,,,,,,,,,,,,,,,,
+github.com/gin-gonic/gin,3,46,2,,,,,,3,,,,,,,,,,,,,46,,2,
+github.com/go-chi/chi,,3,,,,,,,,,,,,,,,,,,,,3,,,
+github.com/go-chi/jwtauth,1,,,,1,,,,,,,,,,,,,,,,,,,,
+github.com/go-gorm/gorm,13,,,,,,,,,,,,,,13,,,,,,,,,,
+github.com/go-jose/go-jose,3,,4,,2,1,,,,,,,,,,,,,,,,,,4,
+github.com/go-kit/kit/auth/jwt,1,,,,1,,,,,,,,,,,,,,,,,,,,
+github.com/go-pg/pg/orm,,,6,,,,,,,,,,,,,,,,,,,,,6,
+github.com/go-xmlpath/xmlpath,2,,,,,,,,,,,,,,,,,,2,,,,,,
+github.com/go-xorm/xorm,34,,,,,,,,,,,,,,34,,,,,,,,,,
+github.com/gobuffalo/envy,,7,,,,,,,,,,,,,,,,,,7,,,,,
+github.com/gobwas/ws,,2,,,,,,,,,,,,,,,,,,,,2,,,
+github.com/gofiber/fiber,5,,,,,,,,4,,,,,,,,,1,,,,,,,
+github.com/gogf/gf-jwt,1,,,,1,,,,,,,,,,,,,,,,,,,,
+github.com/gogf/gf/database/gdb,51,,,,,,,,,,,,,,51,,,,,,,,,,
+github.com/going/toolkit/xmlpath,2,,,,,,,,,,,,,,,,,,2,,,,,,
+github.com/golang-jwt/jwt,3,,11,,2,1,,,,,,,,,,,,,,,,,,11,
+github.com/golang/glog,90,,,,,,90,,,,,,,,,,,,,,,,,,
+github.com/golang/protobuf/proto,,,4,,,,,,,,,,,,,,,,,,,,,4,
+github.com/gorilla/mux,,1,,,,,,,,,,,,,,,,,,,,1,,,
+github.com/gorilla/websocket,,3,,,,,,,,,,,,,,,,,,,,3,,,
+github.com/hashicorp/go-envparse,,1,,,,,,,,,,,,,,,,,,1,,,,,
+github.com/jbowtie/gokogiri/xml,4,,,,,,,,,,,,,,,,,,4,,,,,,
+github.com/jbowtie/gokogiri/xpath,1,,,,,,,,,,,,,,,,,,1,,,,,,
+github.com/jinzhu/gorm,13,,,,,,,,,,,,,,13,,,,,,,,,,
+github.com/jmoiron/sqlx,12,,,,,,,,,,,,,,12,,,,,,,,,,
+github.com/joho/godotenv,,4,,,,,,,,,,,,,,,,,,4,,,,,
+github.com/json-iterator/go,,,4,,,,,,,,,,,,,,,,,,,,,4,
+github.com/kataras/iris/context,6,,,,,,,,6,,,,,,,,,,,,,,,,
+github.com/kataras/iris/middleware/jwt,2,,,,2,,,,,,,,,,,,,,,,,,,,
+github.com/kataras/iris/server/web/context,6,,,,,,,,6,,,,,,,,,,,,,,,,
+github.com/kataras/jwt,5,,,,5,,,,,,,,,,,,,,,,,,,,
+github.com/kelseyhightower/envconfig,,6,,,,,,,,,,,,,,,,,,6,,,,,
+github.com/labstack/echo,3,12,2,,,,,,2,,,,,,,1,,,,,,12,,2,
+github.com/lann/squirrel,32,,,,,,,,,,,,,,32,,,,,,,,,,
+github.com/lestrrat-go/jwx,2,,,,2,,,,,,,,,,,,,,,,,,,,
+github.com/lestrrat-go/libxml2/parser,3,,,,,,,,,,,,,,,,,,3,,,,,,
+github.com/lestrrat/go-jwx/jwk,1,,,,1,,,,,,,,,,,,,,,,,,,,
+github.com/masterzen/xmlpath,2,,,,,,,,,,,,,,,,,,2,,,,,,
+github.com/moovweb/gokogiri/xml,4,,,,,,,,,,,,,,,,,,4,,,,,,
+github.com/moovweb/gokogiri/xpath,1,,,,,,,,,,,,,,,,,,1,,,,,,
+github.com/ory/fosite/token/jwt,2,,,,2,,,,,,,,,,,,,,,,,,,,
+github.com/raindog308/gorqlite,24,,,,,,,,,,,,,,24,,,,,,,,,,
+github.com/revel/revel,2,23,10,,,,,,1,,,,,,,1,,,,,,23,,10,
+github.com/robfig/revel,2,23,10,,,,,,1,,,,,,,1,,,,,,23,,10,
+github.com/rqlite/gorqlite,24,,,,,,,,,,,,,,24,,,,,,,,,,
+github.com/santhosh-tekuri/xpathparser,2,,,,,,,,,,,,,,,,,,2,,,,,,
+github.com/sendgrid/sendgrid-go/helpers/mail,,,1,,,,,,,,,,,,,,,,,,,,,1,
+github.com/sirupsen/logrus,145,,,,,,145,,,,,,,,,,,,,,,,,,
+github.com/spf13/afero,34,,,,,,,,34,,,,,,,,,,,,,,,,
+github.com/square/go-jose,3,,4,,2,1,,,,,,,,,,,,,,,,,,4,
+github.com/uptrace/bun,63,,,,,,,,,,,,,,63,,,,,,,,,,
+github.com/valyala/fasthttp,35,50,5,,,,,,8,,,,17,8,,2,,,,,,50,,5,
+go.mongodb.org/mongo-driver/mongo,14,,,,,,,14,,,,,,,,,,,,,,,,,
+go.uber.org/zap,33,,11,,,,33,,,,,,,,,,,,,,,,,11,
+golang.org/x/crypto/ssh,4,,,4,,,,,,,,,,,,,,,,,,,,,
+golang.org/x/net/context,,,5,,,,,,,,,,,,,,,,,,,,,5,
+golang.org/x/net/html,,,16,,,,,,,,,,,,,,,,,,,,,16,
+golang.org/x/net/websocket,,2,,,,,,,,,,,,,,,,,,,,2,,,
+google.golang.org/protobuf/internal/encoding/text,,,1,,,,,,,,,,,,,,,,,,,,,1,
+google.golang.org/protobuf/internal/impl,,,2,,,,,,,,,,,,,,,,,,,,,2,
+google.golang.org/protobuf/proto,,,8,,,,,,,,,,,,,,,,,,,,,8,
+google.golang.org/protobuf/reflect/protoreflect,,,1,,,,,,,,,,,,,,,,,,,,,1,
+gopkg.in/Masterminds/squirrel,32,,,,,,,,,,,,,,32,,,,,,,,,,
+gopkg.in/couchbase/gocb,8,,18,,,,,8,,,,,,,,,,,,,,,,18,
+gopkg.in/glog,90,,,,,,90,,,,,,,,,,,,,,,,,,
+gopkg.in/go-jose/go-jose,3,,4,,2,1,,,,,,,,,,,,,,,,,,4,
+gopkg.in/go-xmlpath/xmlpath,2,,,,,,,,,,,,,,,,,,2,,,,,,
+gopkg.in/macaron,1,12,1,,,,,,,,,,,,,,,1,,,,12,,1,
+gopkg.in/square/go-jose,3,,4,,2,1,,,,,,,,,,,,,,,,,,4,
+gopkg.in/xmlpath,2,,,,,,,,,,,,,,,,,,2,,,,,,
+gopkg.in/yaml,,,9,,,,,,,,,,,,,,,,,,,,,9,
+gorm.io/gorm,13,,,,,,,,,,,,,,13,,,,,,,,,,
+html,,,8,,,,,,,,,,,,,,,,,,,,,8,
+io,5,4,34,,,,,,5,,,,,,,,,,,,4,,,34,
+k8s.io/api/core,,,10,,,,,,,,,,,,,,,,,,,,,10,
+k8s.io/apimachinery/pkg/runtime,,,47,,,,,,,,,,,,,,,,,,,,,47,
+k8s.io/klog,90,,,,,,90,,,,,,,,,,,,,,,,,,
+launchpad.net/xmlpath,2,,,,,,,,,,,,,,,,,,2,,,,,,
+log,20,,3,,,,20,,,,,,,,,,,,,,,,,3,
+math/big,,,1,,,,,,,,,,,,,,,,,,,,,1,
+mime,,,14,,,,,,,,,,,,,,,,,,,,,14,
+net,2,16,100,,,,,,1,,,,,,,,1,,,,,16,,100,
+nhooyr.io/websocket,,2,,,,,,,,,,,,,,,,,,,,2,,,
+os,29,11,6,3,,,,,26,,,,,,,,,,,7,3,,1,6,
+path,,,18,,,,,,,,,,,,,,,,,,,,,18,
+reflect,,,37,,,,,,,,,,,,,,,,,,,,,37,
+regexp,10,,20,,,,,,,3,3,4,,,,,,,,,,,,20,
+slices,,,17,,,,,,,,,,,,,,,,,,,,,,17
+sort,,,1,,,,,,,,,,,,,,,,,,,,,1,
+strconv,,,9,,,,,,,,,,,,,,,,,,,,,9,
+strings,,,34,,,,,,,,,,,,,,,,,,,,,34,
+sync,,,34,,,,,,,,,,,,,,,,,,,,,34,
+syscall,5,2,8,5,,,,,,,,,,,,,,,,2,,,,8,
+text/scanner,,,3,,,,,,,,,,,,,,,,,,,,,3,
+text/tabwriter,,,1,,,,,,,,,,,,,,,,,,,,,1,
+text/template,,,6,,,,,,,,,,,,,,,,,,,,,6,
+xorm.io/xorm,34,,,,,,,,,,,,,,34,,,,,,,,,,
diff --git a/go/documentation/library-coverage/coverage.rst b/go/documentation/library-coverage/coverage.rst
index 848d989d2d5..48f24355a33 100644
--- a/go/documentation/library-coverage/coverage.rst
+++ b/go/documentation/library-coverage/coverage.rst
@@ -9,27 +9,27 @@ Go framework & library support
    Framework / library,Package,Flow sources,Taint & value steps,Sinks (total)
    `Afero <https://github.com/spf13/afero>`_,``github.com/spf13/afero*``,,,34
    `CleverGo <https://github.com/clevergo/clevergo>`_,"``clevergo.tech/clevergo*``, ``github.com/clevergo/clevergo*``",,,2
-   `Couchbase official client(gocb) <https://github.com/couchbase/gocb>`_,"``github.com/couchbase/gocb*``, ``gopkg.in/couchbase/gocb*``",,36,
-   `Couchbase unofficial client <http://www.github.com/couchbase/go-couchbase>`_,``github.com/couchbaselabs/gocb*``,,18,
+   `Couchbase official client(gocb) <https://github.com/couchbase/gocb>`_,"``github.com/couchbase/gocb*``, ``gopkg.in/couchbase/gocb*``",,36,16
+   `Couchbase unofficial client <http://www.github.com/couchbase/go-couchbase>`_,``github.com/couchbaselabs/gocb*``,,18,8
    `Echo <https://echo.labstack.com/>`_,``github.com/labstack/echo*``,12,2,3
    `Fiber <https://github.com/gofiber/fiber>`_,``github.com/gofiber/fiber*``,,,5
    `Fosite <https://github.com/ory/fosite>`_,``github.com/ory/fosite*``,,,2
    `Gin <https://github.com/gin-gonic/gin>`_,``github.com/gin-gonic/gin*``,46,2,3
-   `Glog <https://github.com/golang/glog>`_,"``github.com/golang/glog*``, ``gopkg.in/glog*``, ``k8s.io/klog*``",,,
+   `Glog <https://github.com/golang/glog>`_,"``github.com/golang/glog*``, ``gopkg.in/glog*``, ``k8s.io/klog*``",,,270
    `Go JOSE <https://github.com/go-jose/go-jose>`_,"``github.com/go-jose/go-jose*``, ``github.com/square/go-jose*``, ``gopkg.in/square/go-jose*``, ``gopkg.in/go-jose/go-jose*``",,16,12
    `Go kit <https://gokit.io/>`_,``github.com/go-kit/kit*``,,,1
-   `Go-spew <https://github.com/davecgh/go-spew>`_,``github.com/davecgh/go-spew/spew*``,,,
+   `Go-spew <https://github.com/davecgh/go-spew>`_,``github.com/davecgh/go-spew/spew*``,,,9
    `Gokogiri <https://github.com/moovweb/gokogiri>`_,"``github.com/jbowtie/gokogiri*``, ``github.com/moovweb/gokogiri*``",,,10
    `Iris <https://www.iris-go.com/>`_,``github.com/kataras/iris*``,,,14
    `Kubernetes <https://kubernetes.io/>`_,"``k8s.io/api*``, ``k8s.io/apimachinery*``",,57,
-   `Logrus <https://github.com/sirupsen/logrus>`_,"``github.com/Sirupsen/logrus*``, ``github.com/sirupsen/logrus*``",,,
+   `Logrus <https://github.com/sirupsen/logrus>`_,"``github.com/Sirupsen/logrus*``, ``github.com/sirupsen/logrus*``",,,290
    `Macaron <https://gopkg.in/macaron.v1>`_,``gopkg.in/macaron*``,12,1,1
    `Revel <http://revel.github.io/>`_,"``github.com/revel/revel*``, ``github.com/robfig/revel*``",46,20,4
    `SendGrid <https://github.com/sendgrid/sendgrid-go>`_,``github.com/sendgrid/sendgrid-go*``,,1,
-   `Standard library <https://pkg.go.dev/std>`_,"````, ``archive/*``, ``bufio``, ``bytes``, ``cmp``, ``compress/*``, ``container/*``, ``context``, ``crypto``, ``crypto/*``, ``database/*``, ``debug/*``, ``embed``, ``encoding``, ``encoding/*``, ``errors``, ``expvar``, ``flag``, ``fmt``, ``go/*``, ``hash``, ``hash/*``, ``html``, ``html/*``, ``image``, ``image/*``, ``index/*``, ``io``, ``io/*``, ``log``, ``log/*``, ``maps``, ``math``, ``math/*``, ``mime``, ``mime/*``, ``net``, ``net/*``, ``os``, ``os/*``, ``path``, ``path/*``, ``plugin``, ``reflect``, ``reflect/*``, ``regexp``, ``regexp/*``, ``slices``, ``sort``, ``strconv``, ``strings``, ``sync``, ``sync/*``, ``syscall``, ``syscall/*``, ``testing``, ``testing/*``, ``text/*``, ``time``, ``time/*``, ``unicode``, ``unicode/*``, ``unsafe``",32,587,51
+   `Standard library <https://pkg.go.dev/std>`_,"````, ``archive/*``, ``bufio``, ``bytes``, ``cmp``, ``compress/*``, ``container/*``, ``context``, ``crypto``, ``crypto/*``, ``database/*``, ``debug/*``, ``embed``, ``encoding``, ``encoding/*``, ``errors``, ``expvar``, ``flag``, ``fmt``, ``go/*``, ``hash``, ``hash/*``, ``html``, ``html/*``, ``image``, ``image/*``, ``index/*``, ``io``, ``io/*``, ``log``, ``log/*``, ``maps``, ``math``, ``math/*``, ``mime``, ``mime/*``, ``net``, ``net/*``, ``os``, ``os/*``, ``path``, ``path/*``, ``plugin``, ``reflect``, ``reflect/*``, ``regexp``, ``regexp/*``, ``slices``, ``sort``, ``strconv``, ``strings``, ``sync``, ``sync/*``, ``syscall``, ``syscall/*``, ``testing``, ``testing/*``, ``text/*``, ``time``, ``time/*``, ``unicode``, ``unicode/*``, ``unsafe``",33,604,104
    `XPath <https://github.com/antchfx/xpath>`_,``github.com/antchfx/xpath*``,,,4
    `appleboy/gin-jwt <https://github.com/appleboy/gin-jwt>`_,``github.com/appleboy/gin-jwt*``,,,1
-   `beego <https://beego.me/>`_,"``github.com/astaxie/beego*``, ``github.com/beego/beego*``",63,63,21
+   `beego <https://beego.me/>`_,"``github.com/astaxie/beego*``, ``github.com/beego/beego*``",63,63,213
    `chi <https://go-chi.io/>`_,``github.com/go-chi/chi*``,3,,
    `cristalhq/jwt <https://github.com/cristalhq/jwt>`_,``github.com/cristalhq/jwt*``,,,1
    `fasthttp <https://github.com/valyala/fasthttp>`_,``github.com/valyala/fasthttp*``,50,5,35
@@ -39,7 +39,7 @@ Go framework & library support
    `go-sh <https://github.com/codeskyblue/go-sh>`_,``github.com/codeskyblue/go-sh*``,,,4
    `golang.org/x/crypto/ssh <https://pkg.go.dev/golang.org/x/crypto/ssh>`_,``golang.org/x/crypto/ssh*``,,,4
    `golang.org/x/net <https://pkg.go.dev/golang.org/x/net>`_,``golang.org/x/net*``,2,21,
-   `goproxy <https://github.com/elazarl/goproxy>`_,``github.com/elazarl/goproxy*``,2,2,
+   `goproxy <https://github.com/elazarl/goproxy>`_,``github.com/elazarl/goproxy*``,2,2,2
    `gorilla/mux <https://github.com/gorilla/mux>`_,``github.com/gorilla/mux*``,1,,
    `gorilla/websocket <https://github.com/gorilla/websocket>`_,``github.com/gorilla/websocket*``,3,,
    `goxpath <https://github.com/ChrisTrenkamp/goxpath/wiki>`_,``github.com/ChrisTrenkamp/goxpath*``,,,3
@@ -59,7 +59,7 @@ Go framework & library support
    `xmlquery <https://github.com/antchfx/xmlquery>`_,``github.com/antchfx/xmlquery*``,,,8
    `xpathparser <https://github.com/santhosh-tekuri/xpathparser>`_,``github.com/santhosh-tekuri/xpathparser*``,,,2
    `yaml <https://gopkg.in/yaml.v3>`_,``gopkg.in/yaml*``,,9,
-   `zap <https://go.uber.org/zap>`_,``go.uber.org/zap*``,,11,
-   Others,"``github.com/caarlos0/env``, ``github.com/gobuffalo/envy``, ``github.com/hashicorp/go-envparse``, ``github.com/joho/godotenv``, ``github.com/kelseyhightower/envconfig``",23,2,
-   Totals,,306,911,268
+   `zap <https://go.uber.org/zap>`_,``go.uber.org/zap*``,,11,33
+   Others,"``github.com/Masterminds/squirrel``, ``github.com/caarlos0/env``, ``github.com/go-gorm/gorm``, ``github.com/go-xorm/xorm``, ``github.com/gobuffalo/envy``, ``github.com/gogf/gf/database/gdb``, ``github.com/hashicorp/go-envparse``, ``github.com/jinzhu/gorm``, ``github.com/jmoiron/sqlx``, ``github.com/joho/godotenv``, ``github.com/kelseyhightower/envconfig``, ``github.com/lann/squirrel``, ``github.com/raindog308/gorqlite``, ``github.com/rqlite/gorqlite``, ``github.com/uptrace/bun``, ``go.mongodb.org/mongo-driver/mongo``, ``gopkg.in/Masterminds/squirrel``, ``gorm.io/gorm``, ``xorm.io/xorm``",23,2,391
+   Totals,,307,928,1532
 
diff --git a/go/ql/lib/change-notes/2024-11-17-fix-missing-promoted-fields-and-methods-name-clash.md b/go/ql/lib/change-notes/2024-11-17-fix-missing-promoted-fields-and-methods-name-clash.md
new file mode 100644
index 00000000000..8b1ee9b60b2
--- /dev/null
+++ b/go/ql/lib/change-notes/2024-11-17-fix-missing-promoted-fields-and-methods-name-clash.md
@@ -0,0 +1,4 @@
+---
+category: fix
+---
+* Fixed a bug which meant that promoted fields and methods were missing when the embedded parent was not promoted due to a name clash.
diff --git a/go/ql/lib/change-notes/2024-11-20-heuristic-logging-sinks.md b/go/ql/lib/change-notes/2024-11-20-heuristic-logging-sinks.md
new file mode 100644
index 00000000000..46f5988b379
--- /dev/null
+++ b/go/ql/lib/change-notes/2024-11-20-heuristic-logging-sinks.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* A call to a method whose name starts with "Debug", "Error", "Fatal", "Info", "Log", "Output", "Panic", "Print", "Trace", "Warn" or "With" defined on an interface whose name ends in "logger" or "Logger" is now considered a LoggerCall. In particular, it is a sink for `go/clear-text-logging` and `go/log-injection`. This may lead to some more alerts in those queries.
diff --git a/go/ql/lib/change-notes/2024-12-03-remove-dataflow-config-class-api.md b/go/ql/lib/change-notes/2024-12-03-remove-dataflow-config-class-api.md
new file mode 100644
index 00000000000..d09ec528c99
--- /dev/null
+++ b/go/ql/lib/change-notes/2024-12-03-remove-dataflow-config-class-api.md
@@ -0,0 +1,4 @@
+---
+category: breaking
+---
+* Deleted the old deprecated data flow API that was based on extending a configuration class. See https://github.blog/changelog/2023-08-14-new-dataflow-api-for-writing-custom-codeql-queries for instructions on migrating your queries to use the new API.
diff --git a/go/ql/lib/ext/database.sql.driver.model.yml b/go/ql/lib/ext/database.sql.driver.model.yml
index c2d780bb7c8..10cfba9388a 100644
--- a/go/ql/lib/ext/database.sql.driver.model.yml
+++ b/go/ql/lib/ext/database.sql.driver.model.yml
@@ -1,4 +1,14 @@
 extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["database/sql/driver", "Execer", True, "Exec", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["database/sql/driver", "ExecerContext", True, "ExecContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["database/sql/driver", "Conn", True, "Prepare", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["database/sql/driver", "ConnPrepareContext", True, "PrepareContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["database/sql/driver", "Queryer", True, "Query", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["database/sql/driver", "QueryerContext", True, "QueryContext", "", "", "Argument[1]", "sql-injection", "manual"]
   - addsTo:
       pack: codeql/go-all
       extensible: summaryModel
diff --git a/go/ql/lib/ext/database.sql.model.yml b/go/ql/lib/ext/database.sql.model.yml
index e1083f6e49a..5854ced527d 100644
--- a/go/ql/lib/ext/database.sql.model.yml
+++ b/go/ql/lib/ext/database.sql.model.yml
@@ -1,4 +1,32 @@
 extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["database/sql", "Conn", True, "Exec", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["database/sql", "Conn", True, "ExecContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["database/sql", "Conn", True, "Prepare", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["database/sql", "Conn", True, "PrepareContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["database/sql", "Conn", True, "Query", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["database/sql", "Conn", True, "QueryContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["database/sql", "Conn", True, "QueryRow", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["database/sql", "Conn", True, "QueryRowContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["database/sql", "DB", True, "Exec", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["database/sql", "DB", True, "ExecContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["database/sql", "DB", True, "Prepare", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["database/sql", "DB", True, "PrepareContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["database/sql", "DB", True, "Query", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["database/sql", "DB", True, "QueryContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["database/sql", "DB", True, "QueryRow", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["database/sql", "DB", True, "QueryRowContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["database/sql", "Tx", True, "Exec", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["database/sql", "Tx", True, "ExecContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["database/sql", "Tx", True, "Prepare", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["database/sql", "Tx", True, "PrepareContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["database/sql", "Tx", True, "Query", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["database/sql", "Tx", True, "QueryContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["database/sql", "Tx", True, "QueryRow", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["database/sql", "Tx", True, "QueryRowContext", "", "", "Argument[1]", "sql-injection", "manual"]
   - addsTo:
       pack: codeql/go-all
       extensible: summaryModel
diff --git a/go/ql/lib/ext/fmt.model.yml b/go/ql/lib/ext/fmt.model.yml
index cad64ce0fdf..2baac68da3a 100644
--- a/go/ql/lib/ext/fmt.model.yml
+++ b/go/ql/lib/ext/fmt.model.yml
@@ -1,4 +1,11 @@
 extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["fmt", "", False, "Print", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["fmt", "", False, "Printf",  "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["fmt", "", False, "Println", "", "", "Argument[0]", "log-injection", "manual"]
   - addsTo:
       pack: codeql/go-all
       extensible: summaryModel
diff --git a/go/ql/lib/ext/github.com.beego.beego.client.orm.model.yml b/go/ql/lib/ext/github.com.beego.beego.client.orm.model.yml
new file mode 100644
index 00000000000..08c0572b894
--- /dev/null
+++ b/go/ql/lib/ext/github.com.beego.beego.client.orm.model.yml
@@ -0,0 +1,42 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: packageGrouping
+    data:
+      - ["beego-orm", "github.com/beego/beego/client/orm"]
+      - ["beego-orm", "github.com/astaxie/beego/orm"]
+      - ["beego-orm", "github.com/beego/beego/orm"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["group:beego-orm", "Condition", True, "Raw", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["group:beego-orm", "DB", True, "Exec", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:beego-orm", "DB", True, "ExecContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["group:beego-orm", "DB", True, "Prepare", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:beego-orm", "DB", True, "PrepareContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["group:beego-orm", "DB", True, "Query", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:beego-orm", "DB", True, "QueryContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["group:beego-orm", "DB", True, "QueryRow", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:beego-orm", "DB", True, "QueryRowContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["group:beego-orm", "Ormer", True, "Raw", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:beego-orm", "QueryBuilder", True, "And", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:beego-orm", "QueryBuilder", True, "Delete", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:beego-orm", "QueryBuilder", True, "From", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:beego-orm", "QueryBuilder", True, "GroupBy", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:beego-orm", "QueryBuilder", True, "Having", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:beego-orm", "QueryBuilder", True, "In", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:beego-orm", "QueryBuilder", True, "InnerJoin", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:beego-orm", "QueryBuilder", True, "InsertInto", "", "", "Argument[0..1]", "sql-injection", "manual"]
+      - ["group:beego-orm", "QueryBuilder", True, "LeftJoin", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:beego-orm", "QueryBuilder", True, "On", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:beego-orm", "QueryBuilder", True, "Or", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:beego-orm", "QueryBuilder", True, "OrderBy", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:beego-orm", "QueryBuilder", True, "RightJoin", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:beego-orm", "QueryBuilder", True, "Select", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:beego-orm", "QueryBuilder", True, "Set", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:beego-orm", "QueryBuilder", True, "Subquery", "", "", "Argument[0..1]", "sql-injection", "manual"]
+      - ["group:beego-orm", "QueryBuilder", True, "Update", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:beego-orm", "QueryBuilder", True, "Values", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:beego-orm", "QueryBuilder", True, "Where", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:beego-orm", "QuerySeter", True, "FilterRaw", "", "", "Argument[1]", "sql-injection", "manual"]
diff --git a/go/ql/lib/ext/github.com.beego.beego.core.logs.model.yml b/go/ql/lib/ext/github.com.beego.beego.core.logs.model.yml
new file mode 100644
index 00000000000..b55c3be507d
--- /dev/null
+++ b/go/ql/lib/ext/github.com.beego.beego.core.logs.model.yml
@@ -0,0 +1,34 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: packageGrouping
+    data:
+      - ["beego-logs", "github.com/astaxie/beego/logs"]
+      - ["beego-logs", "github.com/beego/beego/logs"]
+      - ["beego-logs", "github.com/beego/beego/core/logs"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["group:beego-logs", "", False, "Alert", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:beego-logs", "", False, "Critical", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:beego-logs", "", False, "Debug", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:beego-logs", "", False, "Emergency", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:beego-logs", "", False, "Error", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:beego-logs", "", False, "Info", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:beego-logs", "", False, "Informational", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:beego-logs", "", False, "Notice", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:beego-logs", "", False, "Trace", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:beego-logs", "", False, "Warn", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:beego-logs", "", False, "Warning", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:beego-logs", "BeeLogger", True, "Alert", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:beego-logs", "BeeLogger", True, "Critical", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:beego-logs", "BeeLogger", True, "Debug", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:beego-logs", "BeeLogger", True, "Emergency", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:beego-logs", "BeeLogger", True, "Error", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:beego-logs", "BeeLogger", True, "Info", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:beego-logs", "BeeLogger", True, "Informational", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:beego-logs", "BeeLogger", True, "Notice", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:beego-logs", "BeeLogger", True, "Trace", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:beego-logs", "BeeLogger", True, "Warn", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:beego-logs", "BeeLogger", True, "Warning", "", "", "Argument[0..1]", "log-injection", "manual"]
diff --git a/go/ql/lib/ext/github.com.beego.beego.core.utils.model.yml b/go/ql/lib/ext/github.com.beego.beego.core.utils.model.yml
index 4eb0688e37e..63c05b92040 100644
--- a/go/ql/lib/ext/github.com.beego.beego.core.utils.model.yml
+++ b/go/ql/lib/ext/github.com.beego.beego.core.utils.model.yml
@@ -6,6 +6,11 @@ extensions:
       - ["beego-utils", "github.com/astaxie/beego/utils"]
       - ["beego-utils", "github.com/beego/beego/utils"]
       - ["beego-utils", "github.com/beego/beego/core/utils"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["group:beego-utils", "", False, "Display", "", "", "Argument[0]", "log-injection", "manual"]
   - addsTo:
       pack: codeql/go-all
       extensible: summaryModel
diff --git a/go/ql/lib/ext/github.com.beego.beego.server.web.model.yml b/go/ql/lib/ext/github.com.beego.beego.server.web.model.yml
index 963000fffcc..0c539522c5a 100644
--- a/go/ql/lib/ext/github.com.beego.beego.server.web.model.yml
+++ b/go/ql/lib/ext/github.com.beego.beego.server.web.model.yml
@@ -10,6 +10,18 @@ extensions:
       pack: codeql/go-all
       extensible: sinkModel
     data:
+      # log-injection
+      - ["group:beego", "", False, "Alert", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:beego", "", False, "Critical", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:beego", "", False, "Debug", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:beego", "", False, "Emergency", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:beego", "", False, "Error", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:beego", "", False, "Info", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:beego", "", False, "Informational", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:beego", "", False, "Notice", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:beego", "", False, "Trace", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:beego", "", False, "Warn", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:beego", "", False, "Warning", "", "", "Argument[0..1]", "log-injection", "manual"]
       # path-injection
       - ["group:beego", "", False, "Walk", "", "", "Argument[1]", "path-injection", "manual"]
       - ["group:beego", "Controller", True, "SaveToFile", "", "", "Argument[1]", "path-injection", "manual"]
diff --git a/go/ql/lib/ext/github.com.couchbase.gocb.model.yml b/go/ql/lib/ext/github.com.couchbase.gocb.model.yml
index ff0a4c22c8d..d17b53dd6da 100644
--- a/go/ql/lib/ext/github.com.couchbase.gocb.model.yml
+++ b/go/ql/lib/ext/github.com.couchbase.gocb.model.yml
@@ -3,28 +3,43 @@ extensions:
       pack: codeql/go-all
       extensible: packageGrouping
     data:
-      - ["gocb", "github.com/couchbase/gocb"]
-      - ["gocb", "gopkg.in/couchbase/gocb"]
-      - ["gocb", "github.com/couchbaselabs/gocb"]
+      - ["gocb1", "fixed-version:github.com/couchbase/gocb"]
+      - ["gocb1", "fixed-version:gopkg.in/couchbase/gocb.v1"]
+      - ["gocb1", "fixed-version:github.com/couchbaselabs/gocb"]
+      - ["gocb2", "github.com/couchbase/gocb/v2"]
+      - ["gocb2", "gopkg.in/couchbase/gocb.v2"]
+      - ["gocb2", "github.com/couchbaselabs/gocb/v2"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["group:gocb1", "Bucket", True, "ExecuteN1qlQuery", "", "", "Argument[0]", "nosql-injection", "manual"]
+      - ["group:gocb1", "Bucket", True, "ExecuteAnalyticsQuery", "", "", "Argument[0]", "nosql-injection", "manual"]
+      - ["group:gocb1", "Cluster", True, "ExecuteN1qlQuery", "", "", "Argument[0]", "nosql-injection", "manual"]
+      - ["group:gocb1", "Cluster", True, "ExecuteAnalyticsQuery", "", "", "Argument[0]", "nosql-injection", "manual"]
+      - ["group:gocb2", "Cluster", True, "AnalyticsQuery", "", "", "Argument[0]", "nosql-injection", "manual"]
+      - ["group:gocb2", "Cluster", True, "Query", "", "", "Argument[0]", "nosql-injection", "manual"]
+      - ["group:gocb2", "Scope", True, "AnalyticsQuery", "", "", "Argument[0]", "nosql-injection", "manual"]
+      - ["group:gocb2", "Scope", True, "Query", "", "", "Argument[0]", "nosql-injection", "manual"]
   - addsTo:
       pack: codeql/go-all
       extensible: summaryModel
     data:
-      - ["group:gocb", "", False, "NewAnalyticsQuery", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["group:gocb", "", False, "NewN1qlQuery", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["group:gocb", "AnalyticsQuery", True, "ContextId", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
-      - ["group:gocb", "AnalyticsQuery", True, "Deferred", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
-      - ["group:gocb", "AnalyticsQuery", True, "Pretty", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
-      - ["group:gocb", "AnalyticsQuery", True, "Priority", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
-      - ["group:gocb", "AnalyticsQuery", True, "RawParam", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
-      - ["group:gocb", "AnalyticsQuery", True, "ServerSideTimeout", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
-      - ["group:gocb", "N1qlQuery", True, "AdHoc", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
-      - ["group:gocb", "N1qlQuery", True, "Consistency", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
-      - ["group:gocb", "N1qlQuery", True, "ConsistentWith", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
-      - ["group:gocb", "N1qlQuery", True, "Custom", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
-      - ["group:gocb", "N1qlQuery", True, "PipelineBatch", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
-      - ["group:gocb", "N1qlQuery", True, "PipelineCap", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
-      - ["group:gocb", "N1qlQuery", True, "Profile", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
-      - ["group:gocb", "N1qlQuery", True, "ReadOnly", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
-      - ["group:gocb", "N1qlQuery", True, "ScanCap", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
-      - ["group:gocb", "N1qlQuery", True, "Timeout", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["group:gocb1", "", False, "NewAnalyticsQuery", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["group:gocb1", "", False, "NewN1qlQuery", "", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["group:gocb1", "AnalyticsQuery", True, "ContextId", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["group:gocb1", "AnalyticsQuery", True, "Deferred", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["group:gocb1", "AnalyticsQuery", True, "Pretty", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["group:gocb1", "AnalyticsQuery", True, "Priority", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["group:gocb1", "AnalyticsQuery", True, "RawParam", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["group:gocb1", "AnalyticsQuery", True, "ServerSideTimeout", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["group:gocb1", "N1qlQuery", True, "AdHoc", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["group:gocb1", "N1qlQuery", True, "Consistency", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["group:gocb1", "N1qlQuery", True, "ConsistentWith", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["group:gocb1", "N1qlQuery", True, "Custom", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["group:gocb1", "N1qlQuery", True, "PipelineBatch", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["group:gocb1", "N1qlQuery", True, "PipelineCap", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["group:gocb1", "N1qlQuery", True, "Profile", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["group:gocb1", "N1qlQuery", True, "ReadOnly", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["group:gocb1", "N1qlQuery", True, "ScanCap", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
+      - ["group:gocb1", "N1qlQuery", True, "Timeout", "", "", "Argument[receiver]", "ReturnValue", "taint", "manual"]
diff --git a/go/ql/lib/ext/github.com.davecgh.go-spew.spew.model.yml b/go/ql/lib/ext/github.com.davecgh.go-spew.spew.model.yml
new file mode 100644
index 00000000000..4b4996926e3
--- /dev/null
+++ b/go/ql/lib/ext/github.com.davecgh.go-spew.spew.model.yml
@@ -0,0 +1,14 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["github.com/davecgh/go-spew/spew", "", False, "Dump", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["github.com/davecgh/go-spew/spew", "", False, "Errorf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["github.com/davecgh/go-spew/spew", "", False, "Fdump", "", "", "Argument[1]", "log-injection", "manual"]
+      - ["github.com/davecgh/go-spew/spew", "", False, "Fprint", "", "", "Argument[1]", "log-injection", "manual"]
+      - ["github.com/davecgh/go-spew/spew", "", False, "Fprintf", "", "", "Argument[1..2]", "log-injection", "manual"]
+      - ["github.com/davecgh/go-spew/spew", "", False, "Fprintln", "", "", "Argument[1]", "log-injection", "manual"]
+      - ["github.com/davecgh/go-spew/spew", "", False, "Print", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["github.com/davecgh/go-spew/spew", "", False, "Printf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["github.com/davecgh/go-spew/spew", "", False, "Println", "", "", "Argument[0]", "log-injection", "manual"]
diff --git a/go/ql/lib/ext/github.com.elazarl.goproxy.model.yml b/go/ql/lib/ext/github.com.elazarl.goproxy.model.yml
index 20e4a26f1cd..9dc8284ea58 100644
--- a/go/ql/lib/ext/github.com.elazarl.goproxy.model.yml
+++ b/go/ql/lib/ext/github.com.elazarl.goproxy.model.yml
@@ -1,4 +1,10 @@
 extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["github.com/elazarl/goproxy", "ProxyCtx", True, "Logf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["github.com/elazarl/goproxy", "ProxyCtx", True, "Warnf", "", "", "Argument[0..1]", "log-injection", "manual"]
   - addsTo:
       pack: codeql/go-all
       extensible: summaryModel
diff --git a/go/ql/lib/ext/github.com.gogf.gf.database.gdb.model.yml b/go/ql/lib/ext/github.com.gogf.gf.database.gdb.model.yml
new file mode 100644
index 00000000000..030656c6eb8
--- /dev/null
+++ b/go/ql/lib/ext/github.com.gogf.gf.database.gdb.model.yml
@@ -0,0 +1,57 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      # These models are for v1. Some of them hold for v2, but we should model v2 properly.
+      - ["github.com/gogf/gf/database/gdb", "Core", True, "DoCommit", "", "", "Argument[2]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "Core", True, "DoExec", "", "", "Argument[2]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "Core", True, "DoGetAll", "", "", "Argument[2]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "Core", True, "DoQuery", "", "", "Argument[2]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "Core", True, "DoPrepare", "", "", "Argument[2]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "Core", True, "Exec", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "Core", True, "GetAll", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "Core", True, "GetArray", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "Core", True, "GetCount", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "Core", True, "GetOne", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "Core", True, "GetScan", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "Core", True, "GetStruct", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "Core", True, "GetStructs", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "Core", True, "GetValue", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "Core", True, "Prepare", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "Core", True, "Query", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "Core", True, "Raw", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "DB", True, "DoCommit", "", "", "Argument[2]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "DB", True, "DoExec", "", "", "Argument[2]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "DB", True, "DoGetAll", "", "", "Argument[2]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "DB", True, "DoQuery", "", "", "Argument[2]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "DB", True, "DoPrepare", "", "", "Argument[2]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "DB", True, "Exec", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "DB", True, "GetAll", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "DB", True, "GetArray", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "DB", True, "GetCount", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "DB", True, "GetOne", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "DB", True, "GetScan", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "DB", True, "GetStruct", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "DB", True, "GetStructs", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "DB", True, "GetValue", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "DB", True, "Prepare", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "DB", True, "Query", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "DB", True, "Raw", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "Tx", True, "DoCommit", "", "", "Argument[2]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "Tx", True, "DoExec", "", "", "Argument[2]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "Tx", True, "DoGetAll", "", "", "Argument[2]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "Tx", True, "DoQuery", "", "", "Argument[2]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "Tx", True, "DoPrepare", "", "", "Argument[2]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "Tx", True, "Exec", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "Tx", True, "GetAll", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "Tx", True, "GetArray", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "Tx", True, "GetCount", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "Tx", True, "GetOne", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "Tx", True, "GetScan", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "Tx", True, "GetStruct", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "Tx", True, "GetStructs", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "Tx", True, "GetValue", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "Tx", True, "Prepare", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "Tx", True, "Query", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/gogf/gf/database/gdb", "Tx", True, "Raw", "", "", "Argument[0]", "sql-injection", "manual"]
diff --git a/go/ql/lib/ext/github.com.golang.glog.model.yml b/go/ql/lib/ext/github.com.golang.glog.model.yml
new file mode 100644
index 00000000000..275450f2c44
--- /dev/null
+++ b/go/ql/lib/ext/github.com.golang.glog.model.yml
@@ -0,0 +1,102 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: packageGrouping
+    data:
+      - ["glog", "github.com/golang/glog"]
+      - ["glog", "gopkg.in/glog"]
+      - ["glog", "k8s.io/klog"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["group:glog", "", False, "Error", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:glog", "", False, "ErrorContext", "", "", "Argument[1]", "log-injection", "manual"]
+      - ["group:glog", "", False, "ErrorContextDepth", "", "", "Argument[2]", "log-injection", "manual"]
+      - ["group:glog", "", False, "ErrorContextDepthf", "", "", "Argument[2..3]", "log-injection", "manual"]
+      - ["group:glog", "", False, "ErrorContextf", "", "", "Argument[1..2]", "log-injection", "manual"]
+      - ["group:glog", "", False, "ErrorDepth", "", "", "Argument[1]", "log-injection", "manual"]
+      - ["group:glog", "", False, "ErrorDepthf", "", "", "Argument[1..2]", "log-injection", "manual"]
+      - ["group:glog", "", False, "Errorf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:glog", "", False, "Errorln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:glog", "", False, "Exit", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:glog", "", False, "ExitContext", "", "", "Argument[1]", "log-injection", "manual"]
+      - ["group:glog", "", False, "ExitContextDepth", "", "", "Argument[2]", "log-injection", "manual"]
+      - ["group:glog", "", False, "ExitContextDepthf", "", "", "Argument[2..3]", "log-injection", "manual"]
+      - ["group:glog", "", False, "ExitContextf", "", "", "Argument[1..2]", "log-injection", "manual"]
+      - ["group:glog", "", False, "ExitDepth", "", "", "Argument[1]", "log-injection", "manual"]
+      - ["group:glog", "", False, "ExitDepthf", "", "", "Argument[1..2]", "log-injection", "manual"]
+      - ["group:glog", "", False, "Exitf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:glog", "", False, "Exitln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:glog", "", False, "Fatal", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:glog", "", False, "FatalContext", "", "", "Argument[1]", "log-injection", "manual"]
+      - ["group:glog", "", False, "FatalContextDepth", "", "", "Argument[2]", "log-injection", "manual"]
+      - ["group:glog", "", False, "FatalContextDepthf", "", "", "Argument[2..3]", "log-injection", "manual"]
+      - ["group:glog", "", False, "FatalContextf", "", "", "Argument[1..2]", "log-injection", "manual"]
+      - ["group:glog", "", False, "FatalDepth", "", "", "Argument[1]", "log-injection", "manual"]
+      - ["group:glog", "", False, "FatalDepthf", "", "", "Argument[1..2]", "log-injection", "manual"]
+      - ["group:glog", "", False, "Fatalf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:glog", "", False, "Fatalln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:glog", "", False, "Info", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:glog", "", False, "InfoContext", "", "", "Argument[1]", "log-injection", "manual"]
+      - ["group:glog", "", False, "InfoContextDepth", "", "", "Argument[2]", "log-injection", "manual"]
+      - ["group:glog", "", False, "InfoContextDepthf", "", "", "Argument[2..3]", "log-injection", "manual"]
+      - ["group:glog", "", False, "InfoContextf", "", "", "Argument[1..2]", "log-injection", "manual"]
+      - ["group:glog", "", False, "InfoDepth", "", "", "Argument[1]", "log-injection", "manual"]
+      - ["group:glog", "", False, "InfoDepthf", "", "", "Argument[1..2]", "log-injection", "manual"]
+      - ["group:glog", "", False, "Infof", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:glog", "", False, "Infoln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:glog", "", False, "Warning", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:glog", "", False, "WarningContext", "", "", "Argument[1]", "log-injection", "manual"]
+      - ["group:glog", "", False, "WarningContextDepth", "", "", "Argument[2]", "log-injection", "manual"]
+      - ["group:glog", "", False, "WarningContextDepthf", "", "", "Argument[2..3]", "log-injection", "manual"]
+      - ["group:glog", "", False, "WarningContextf", "", "", "Argument[1..2]", "log-injection", "manual"]
+      - ["group:glog", "", False, "WarningDepth", "", "", "Argument[1]", "log-injection", "manual"]
+      - ["group:glog", "", False, "WarningDepthf", "", "", "Argument[1..2]", "log-injection", "manual"]
+      - ["group:glog", "", False, "Warningf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:glog", "", False, "Warningln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "Error", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "ErrorContext", "", "", "Argument[1]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "ErrorContextDepth", "", "", "Argument[2]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "ErrorContextDepthf", "", "", "Argument[2..3]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "ErrorContextf", "", "", "Argument[1..2]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "ErrorDepth", "", "", "Argument[1]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "ErrorDepthf", "", "", "Argument[1..2]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "Errorf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "Errorln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "Exit", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "ExitContext", "", "", "Argument[1]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "ExitContextDepth", "", "", "Argument[2]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "ExitContextDepthf", "", "", "Argument[2..3]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "ExitContextf", "", "", "Argument[1..2]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "ExitDepth", "", "", "Argument[1]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "ExitDepthf", "", "", "Argument[1..2]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "Exitf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "Exitln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "Fatal", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "FatalContext", "", "", "Argument[1]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "FatalContextDepth", "", "", "Argument[2]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "FatalContextDepthf", "", "", "Argument[2..3]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "FatalContextf", "", "", "Argument[1..2]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "FatalDepth", "", "", "Argument[1]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "FatalDepthf", "", "", "Argument[1..2]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "Fatalf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "Fatalln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "Info", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "InfoContext", "", "", "Argument[1]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "InfoContextDepth", "", "", "Argument[2]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "InfoContextDepthf", "", "", "Argument[2..3]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "InfoContextf", "", "", "Argument[1..2]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "InfoDepth", "", "", "Argument[1]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "InfoDepthf", "", "", "Argument[1..2]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "Infof", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "Infoln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "Warning", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "WarningContext", "", "", "Argument[1]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "WarningContextDepth", "", "", "Argument[2]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "WarningContextDepthf", "", "", "Argument[2..3]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "WarningContextf", "", "", "Argument[1..2]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "WarningDepth", "", "", "Argument[1]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "WarningDepthf", "", "", "Argument[1..2]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "Warningf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:glog", "Verbose", True, "Warningln", "", "", "Argument[0]", "log-injection", "manual"]
diff --git a/go/ql/lib/ext/github.com.jmoiron.sqlx.model.yml b/go/ql/lib/ext/github.com.jmoiron.sqlx.model.yml
new file mode 100644
index 00000000000..8c9d19b4b85
--- /dev/null
+++ b/go/ql/lib/ext/github.com.jmoiron.sqlx.model.yml
@@ -0,0 +1,17 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["github.com/jmoiron/sqlx", "DB", True, "Get", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["github.com/jmoiron/sqlx", "DB", True, "MustExec", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/jmoiron/sqlx", "DB", True, "NamedExec", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/jmoiron/sqlx", "DB", True, "NamedQuery", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/jmoiron/sqlx", "DB", True, "Queryx", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/jmoiron/sqlx", "DB", True, "Select", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["github.com/jmoiron/sqlx", "Tx", True, "Get", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["github.com/jmoiron/sqlx", "Tx", True, "MustExec", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/jmoiron/sqlx", "Tx", True, "NamedExec", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/jmoiron/sqlx", "Tx", True, "NamedQuery", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/jmoiron/sqlx", "Tx", True, "Queryx", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/jmoiron/sqlx", "Tx", True, "Select", "", "", "Argument[1]", "sql-injection", "manual"]
diff --git a/go/ql/lib/ext/github.com.mastermind.squirrel.model.yml b/go/ql/lib/ext/github.com.mastermind.squirrel.model.yml
new file mode 100644
index 00000000000..6f3c5830e45
--- /dev/null
+++ b/go/ql/lib/ext/github.com.mastermind.squirrel.model.yml
@@ -0,0 +1,51 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: packageGrouping
+    data:
+      - ["squirrel", "github.com/Masterminds/squirrel"]
+      - ["squirrel", "gopkg.in/Masterminds/squirrel"]
+      - ["squirrel", "github.com/lann/squirrel"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["group:squirrel", "", False, "Delete", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:squirrel", "", False, "Expr", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:squirrel", "", False, "Insert", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:squirrel", "", False, "Select", "", "", "Argument[0]", "sql-injection", "manual"] # TODO: when sources can have access paths, use .ArrayElement
+      - ["group:squirrel", "", False, "Update", "", "", "Argument[0]", "sql-injection", "manual"] # TODO: when sources can have access paths, use .ArrayElement
+
+      - ["group:squirrel", "DeleteBuilder", True, "From", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:squirrel", "DeleteBuilder", True, "OrderBy", "", "", "Argument[0]", "sql-injection", "manual"] # TODO: when sources can have access paths, use .ArrayElement
+      - ["group:squirrel", "DeleteBuilder", True, "Prefix", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:squirrel", "DeleteBuilder", True, "Suffix", "", "", "Argument[0]", "sql-injection", "manual"]
+      # DeleteBuilder.Where has to be modeled in QL to avoid FPs when a non-string argument is used
+
+      - ["group:squirrel", "InsertBuilder", True, "Columns", "", "", "Argument[0]", "sql-injection", "manual"] # TODO: when sources can have access paths, use .ArrayElement
+      - ["group:squirrel", "InsertBuilder", True, "Into", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:squirrel", "InsertBuilder", True, "Options", "", "", "Argument[0]", "sql-injection", "manual"] # TODO: when sources can have access paths, use .ArrayElement
+      - ["group:squirrel", "InsertBuilder", True, "Prefix", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:squirrel", "InsertBuilder", True, "Suffix", "", "", "Argument[0]", "sql-injection", "manual"]
+
+      - ["group:squirrel", "SelectBuilder", True, "CrossJoin", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:squirrel", "SelectBuilder", True, "Column", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:squirrel", "SelectBuilder", True, "Columns", "", "", "Argument[0]", "sql-injection", "manual"] # TODO: when sources can have access paths, use .ArrayElement
+      - ["group:squirrel", "SelectBuilder", True, "From", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:squirrel", "SelectBuilder", True, "GroupBy", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:squirrel", "SelectBuilder", True, "InnerJoin", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:squirrel", "SelectBuilder", True, "LeftJoin", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:squirrel", "SelectBuilder", True, "Options", "", "", "Argument[0]", "sql-injection", "manual"] # TODO: when sources can have access paths, use .ArrayElement
+      - ["group:squirrel", "SelectBuilder", True, "OrderBy", "", "", "Argument[0]", "sql-injection", "manual"] # TODO: when sources can have access paths, use .ArrayElement
+      - ["group:squirrel", "SelectBuilder", True, "Prefix", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:squirrel", "SelectBuilder", True, "RightJoin", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:squirrel", "SelectBuilder", True, "Suffix", "", "", "Argument[0]", "sql-injection", "manual"]
+      # SelectBuilder.Where has to be modeled in QL to avoid FPs when a non-string argument is used
+
+      - ["group:squirrel", "UpdateBuilder", True, "From", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:squirrel", "UpdateBuilder", True, "OrderBy", "", "", "Argument[0]", "sql-injection", "manual"] # TODO: when sources can have access paths, use .ArrayElement
+      - ["group:squirrel", "UpdateBuilder", True, "Prefix", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:squirrel", "UpdateBuilder", True, "Set", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:squirrel", "UpdateBuilder", True, "Suffix", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:squirrel", "UpdateBuilder", True, "Table", "", "", "Argument[0]", "sql-injection", "manual"]
+      # UpdateBuilder.Where has to be modeled in QL to avoid FPs when a non-string argument is used
diff --git a/go/ql/lib/ext/github.com.rqlite.gorqlite.model.yml b/go/ql/lib/ext/github.com.rqlite.gorqlite.model.yml
new file mode 100644
index 00000000000..62e24f2c920
--- /dev/null
+++ b/go/ql/lib/ext/github.com.rqlite.gorqlite.model.yml
@@ -0,0 +1,35 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: packageGrouping
+    data:
+      - ["gorqlite", "github.com/rqlite/gorqlite"]
+      - ["gorqlite", "github.com/raindog308/gorqlite"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["group:gorqlite", "Connection", True, "Query", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:gorqlite", "Connection", True, "QueryContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["group:gorqlite", "Connection", True, "QueryOne", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:gorqlite", "Connection", True, "QueryOneContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["group:gorqlite", "Connection", True, "QueryOneParameterized", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:gorqlite", "Connection", True, "QueryOneParameterizedContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["group:gorqlite", "Connection", True, "QueryParameterized", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:gorqlite", "Connection", True, "QueryParameterizedContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["group:gorqlite", "Connection", True, "Queue", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:gorqlite", "Connection", True, "QueueContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["group:gorqlite", "Connection", True, "QueueOne", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:gorqlite", "Connection", True, "QueueOneContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["group:gorqlite", "Connection", True, "QueueOneParameterized", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:gorqlite", "Connection", True, "QueueOneParameterizedContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["group:gorqlite", "Connection", True, "QueueParameterized", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:gorqlite", "Connection", True, "QueueParameterizedContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["group:gorqlite", "Connection", True, "Write", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:gorqlite", "Connection", True, "WriteContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["group:gorqlite", "Connection", True, "WriteOne", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:gorqlite", "Connection", True, "WriteOneContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["group:gorqlite", "Connection", True, "WriteOneParameterized", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:gorqlite", "Connection", True, "WriteOneParameterizedContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["group:gorqlite", "Connection", True, "WriteParameterized", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:gorqlite", "Connection", True, "WriteParameterizedContext", "", "", "Argument[1]", "sql-injection", "manual"]
diff --git a/go/ql/lib/ext/github.com.sirupsen.logrus.model.yml b/go/ql/lib/ext/github.com.sirupsen.logrus.model.yml
new file mode 100644
index 00000000000..06f9a54622b
--- /dev/null
+++ b/go/ql/lib/ext/github.com.sirupsen.logrus.model.yml
@@ -0,0 +1,159 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: packageGrouping
+    data:
+      - ["logrus", "github.com/sirupsen/logrus"]
+      - ["logrus", "github.com/Sirupsen/logrus"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["group:logrus", "", False, "Debug", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "DebugFn", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "Debugf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "Debugln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "Error", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "ErrorFn", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "Errorf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "Errorln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "Fatal", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "FatalFn", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "Fatalf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "Fatalln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "Info", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "InfoFn", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "Infof", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "Infoln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "Panic", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "PanicFn", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "Panicf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "Panicln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "Print", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "PrintFn", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "Printf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "Println", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "Trace", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "TraceFn", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "Tracef", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "Traceln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "Warn", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "WarnFn", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "Warnf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "Warnln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "Warning", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "WarningFn", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "Warningf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "Warningln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "WithError", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "WithField", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "WithFields", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "", False, "WithTime", "", "", "Argument[0]", "log-injection", "manual"]
+
+      - ["group:logrus", "Entry", True, "Debug", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Entry", True, "Debugf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "Entry", True, "Debugln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Entry", True, "Error", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Entry", True, "Errorf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "Entry", True, "Errorln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Entry", True, "Fatal", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Entry", True, "Fatalf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "Entry", True, "Fatalln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Entry", True, "Info", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Entry", True, "Infof", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "Entry", True, "Infoln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Entry", True, "Log", "", "", "Argument[1]", "log-injection", "manual"]
+      - ["group:logrus", "Entry", True, "Logf", "", "", "Argument[1..2]", "log-injection", "manual"]
+      - ["group:logrus", "Entry", True, "Logln", "", "", "Argument[1]", "log-injection", "manual"]
+      - ["group:logrus", "Entry", True, "Panic", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Entry", True, "Panicf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "Entry", True, "Panicln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Entry", True, "Print", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Entry", True, "Printf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "Entry", True, "Println", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Entry", True, "Trace", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Entry", True, "Tracef", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "Entry", True, "Traceln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Entry", True, "Warn", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Entry", True, "Warnf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "Entry", True, "Warnln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Entry", True, "Warning", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Entry", True, "Warningf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "Entry", True, "Warningln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Entry", True, "WithError", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Entry", True, "WithField", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "Entry", True, "WithFields", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Entry", True, "WithTime", "", "", "Argument[0]", "log-injection", "manual"]
+
+      - ["group:logrus", "FieldLogger", True, "Debug", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "FieldLogger", True, "Debugf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "FieldLogger", True, "Debugln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "FieldLogger", True, "Error", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "FieldLogger", True, "Errorf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "FieldLogger", True, "Errorln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "FieldLogger", True, "Fatal", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "FieldLogger", True, "Fatalf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "FieldLogger", True, "Fatalln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "FieldLogger", True, "Info", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "FieldLogger", True, "Infof", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "FieldLogger", True, "Infoln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "FieldLogger", True, "Panic", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "FieldLogger", True, "Panicf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "FieldLogger", True, "Panicln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "FieldLogger", True, "Print", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "FieldLogger", True, "Printf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "FieldLogger", True, "Println", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "FieldLogger", True, "Warn", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "FieldLogger", True, "Warnf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "FieldLogger", True, "Warnln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "FieldLogger", True, "Warning", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "FieldLogger", True, "Warningf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "FieldLogger", True, "Warningln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "FieldLogger", True, "WithError", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "FieldLogger", True, "WithField", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "FieldLogger", True, "WithFields", "", "", "Argument[0]", "log-injection", "manual"]
+
+      - ["group:logrus", "Logger", True, "Debug", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "DebugFn", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "Debugf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "Debugln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "Error", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "ErrorFn", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "Errorf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "Errorln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "Fatal", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "FatalFn", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "Fatalf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "Fatalln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "Info", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "InfoFn", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "Infof", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "Infoln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "Log", "", "", "Argument[1]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "LogFn", "", "", "Argument[1]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "Logf", "", "", "Argument[1..2]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "Logln", "", "", "Argument[1]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "Panic", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "PanicFn", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "Panicf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "Panicln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "Print", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "PrintFn", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "Printf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "Println", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "Trace", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "TraceFn", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "Tracef", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "Traceln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "Warn", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "WarnFn", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "Warnf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "Warnln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "Warning", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "WarningFn", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "Warningf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "Warningln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "WithError", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "WithField", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "WithFields", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["group:logrus", "Logger", True, "WithTime", "", "", "Argument[0]", "log-injection", "manual"]
diff --git a/go/ql/lib/ext/github.com.uptrace.bun.model.yml b/go/ql/lib/ext/github.com.uptrace.bun.model.yml
new file mode 100644
index 00000000000..a08adb07973
--- /dev/null
+++ b/go/ql/lib/ext/github.com.uptrace.bun.model.yml
@@ -0,0 +1,68 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["github.com/uptrace/bun", "", False, "NewRawQuery", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "AddColumnQuery", True, "ColumnExpr", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "AddColumnQuery", True, "ModelTableExpr", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "AddColumnQuery", True, "TableExpr", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "Conn", True, "Exec", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "Conn", True, "ExecContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "Conn", True, "NewRaw", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "Conn", True, "Prepare", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "Conn", True, "Query", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "Conn", True, "QueryRow", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "Conn", True, "PrepareContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "Conn", True, "QueryContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "Conn", True, "QueryRowContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "Conn", True, "Raw", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "CreateIndexQuery", True, "ColumnExpr", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "CreateIndexQuery", True, "ModelTableExpr", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "CreateIndexQuery", True, "TableExpr", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "CreateIndexQuery", True, "Where", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "CreateIndexQuery", True, "WhereOr", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "CreateTableQuery", True, "ColumnExpr", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "CreateTableQuery", True, "ModelTableExpr", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "CreateTableQuery", True, "TableExpr", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "DB", True, "Exec", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "DB", True, "ExecContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "DB", True, "NewRaw", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "DB", True, "Prepare", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "DB", True, "Query", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "DB", True, "QueryRow", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "DB", True, "PrepareContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "DB", True, "QueryContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "DB", True, "QueryRowContext", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "DB", True, "Raw", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "DeleteQuery", True, "TableExpr", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "DeleteQuery", True, "Where", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "DeleteQuery", True, "WhereOr", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "DropColumnQuery", True, "ColumnExpr", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "DropColumnQuery", True, "ModelTableExpr", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "DropColumnQuery", True, "TableExpr", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "DropTableQuery", True, "ModelTableExpr", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "DropTableQuery", True, "TableExpr", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "InsertQuery", True, "ColumnExpr", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "InsertQuery", True, "ModelTableExpr", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "InsertQuery", True, "TableExpr", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "InsertQuery", True, "Where", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "InsertQuery", True, "WhereOr", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "MergeQuery", True, "ModelTableExpr", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "MergeQuery", True, "TableExpr", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "RawQuery", True, "NewRaw", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "SelectQuery", True, "ColumnExpr", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "SelectQuery", True, "DistinctOn", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "SelectQuery", True, "For", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "SelectQuery", True, "GroupExpr", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "SelectQuery", True, "Having", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "SelectQuery", True, "ModelTableExpr", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "SelectQuery", True, "OrderExpr", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "SelectQuery", True, "TableExpr", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "SelectQuery", True, "Where", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "SelectQuery", True, "WhereOr", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "TruncateTableQuery", True, "TableExpr", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "UpdateQuery", True, "ModelTableExpr", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "UpdateQuery", True, "TableExpr", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "UpdateQuery", True, "Where", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["github.com/uptrace/bun", "UpdateQuery", True, "WhereOr", "", "", "Argument[0]", "sql-injection", "manual"]
diff --git a/go/ql/lib/ext/go.mongodb.org.mongo-driver.mongo.model.yml b/go/ql/lib/ext/go.mongodb.org.mongo-driver.mongo.model.yml
new file mode 100644
index 00000000000..6c2d4afdeae
--- /dev/null
+++ b/go/ql/lib/ext/go.mongodb.org.mongo-driver.mongo.model.yml
@@ -0,0 +1,19 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["go.mongodb.org/mongo-driver/mongo", "Collection", True, "Aggregate", "", "", "Argument[1]", "nosql-injection", "manual"]
+      - ["go.mongodb.org/mongo-driver/mongo", "Collection", True, "CountDocuments", "", "", "Argument[1]", "nosql-injection", "manual"]
+      - ["go.mongodb.org/mongo-driver/mongo", "Collection", True, "DeleteMany", "", "", "Argument[1]", "nosql-injection", "manual"]
+      - ["go.mongodb.org/mongo-driver/mongo", "Collection", True, "DeleteOne", "", "", "Argument[1]", "nosql-injection", "manual"]
+      - ["go.mongodb.org/mongo-driver/mongo", "Collection", True, "Distinct", "", "", "Argument[2]", "nosql-injection", "manual"]
+      - ["go.mongodb.org/mongo-driver/mongo", "Collection", True, "Find", "", "", "Argument[1]", "nosql-injection", "manual"]
+      - ["go.mongodb.org/mongo-driver/mongo", "Collection", True, "FindOne", "", "", "Argument[1]", "nosql-injection", "manual"]
+      - ["go.mongodb.org/mongo-driver/mongo", "Collection", True, "FindOneAndDelete", "", "", "Argument[1]", "nosql-injection", "manual"]
+      - ["go.mongodb.org/mongo-driver/mongo", "Collection", True, "FindOneAndReplace", "", "", "Argument[1]", "nosql-injection", "manual"]
+      - ["go.mongodb.org/mongo-driver/mongo", "Collection", True, "FindOneAndUpdate", "", "", "Argument[1]", "nosql-injection", "manual"]
+      - ["go.mongodb.org/mongo-driver/mongo", "Collection", True, "ReplaceOne", "", "", "Argument[1]", "nosql-injection", "manual"]
+      - ["go.mongodb.org/mongo-driver/mongo", "Collection", True, "UpdateMany", "", "", "Argument[1]", "nosql-injection", "manual"]
+      - ["go.mongodb.org/mongo-driver/mongo", "Collection", True, "UpdateOne", "", "", "Argument[1]", "nosql-injection", "manual"]
+      - ["go.mongodb.org/mongo-driver/mongo", "Collection", True, "Watch", "", "", "Argument[1]", "nosql-injection", "manual"]
diff --git a/go/ql/lib/ext/go.uber.org.zap.model.yml b/go/ql/lib/ext/go.uber.org.zap.model.yml
index 2ca7f7e8a80..e9fc971e5fa 100644
--- a/go/ql/lib/ext/go.uber.org.zap.model.yml
+++ b/go/ql/lib/ext/go.uber.org.zap.model.yml
@@ -1,4 +1,41 @@
 extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["go.uber.org/zap", "Logger", True, "DPanic", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["go.uber.org/zap", "Logger", True, "Debug", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["go.uber.org/zap", "Logger", True, "Error", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["go.uber.org/zap", "Logger", True, "Fatal", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["go.uber.org/zap", "Logger", True, "Info", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["go.uber.org/zap", "Logger", True, "Named", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["go.uber.org/zap", "Logger", True, "Panic", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["go.uber.org/zap", "Logger", True, "Warn", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["go.uber.org/zap", "Logger", True, "With", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["go.uber.org/zap", "Logger", True, "WithOptions", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["go.uber.org/zap", "SugaredLogger", True, "DPanic", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["go.uber.org/zap", "SugaredLogger", True, "DPanicf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["go.uber.org/zap", "SugaredLogger", True, "DPanicw", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["go.uber.org/zap", "SugaredLogger", True, "Debug", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["go.uber.org/zap", "SugaredLogger", True, "Debugf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["go.uber.org/zap", "SugaredLogger", True, "Debugw", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["go.uber.org/zap", "SugaredLogger", True, "Error", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["go.uber.org/zap", "SugaredLogger", True, "Errorf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["go.uber.org/zap", "SugaredLogger", True, "Errorw", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["go.uber.org/zap", "SugaredLogger", True, "Fatal", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["go.uber.org/zap", "SugaredLogger", True, "Fatalf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["go.uber.org/zap", "SugaredLogger", True, "Fatalw", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["go.uber.org/zap", "SugaredLogger", True, "Info", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["go.uber.org/zap", "SugaredLogger", True, "Infof", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["go.uber.org/zap", "SugaredLogger", True, "Infow", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["go.uber.org/zap", "SugaredLogger", True, "Named", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["go.uber.org/zap", "SugaredLogger", True, "Panic", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["go.uber.org/zap", "SugaredLogger", True, "Panicf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["go.uber.org/zap", "SugaredLogger", True, "Panicw", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["go.uber.org/zap", "SugaredLogger", True, "Warn", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["go.uber.org/zap", "SugaredLogger", True, "Warnf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["go.uber.org/zap", "SugaredLogger", True, "Warnw", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["go.uber.org/zap", "SugaredLogger", True, "With", "", "", "Argument[0]", "log-injection", "manual"]
   - addsTo:
       pack: codeql/go-all
       extensible: summaryModel
diff --git a/go/ql/lib/ext/gorm.io.gorm.model.yml b/go/ql/lib/ext/gorm.io.gorm.model.yml
new file mode 100644
index 00000000000..bfcf1fa66a7
--- /dev/null
+++ b/go/ql/lib/ext/gorm.io.gorm.model.yml
@@ -0,0 +1,25 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: packageGrouping
+    data:
+      - ["gorm", "gorm.io/gorm"]
+      - ["gorm", "github.com/jinzhu/gorm"]
+      - ["gorm", "github.com/go-gorm/gorm"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["group:gorm", "DB", True, "Where", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:gorm", "DB", True, "Raw", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:gorm", "DB", True, "Order", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:gorm", "DB", True, "Not", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:gorm", "DB", True, "Or", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:gorm", "DB", True, "Select", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:gorm", "DB", True, "Table", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:gorm", "DB", True, "Group", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:gorm", "DB", True, "Having", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:gorm", "DB", True, "Joins", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:gorm", "DB", True, "Exec", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:gorm", "DB", True, "Distinct", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:gorm", "DB", True, "Pluck", "", "", "Argument[0]", "sql-injection", "manual"]
diff --git a/go/ql/lib/ext/log.model.yml b/go/ql/lib/ext/log.model.yml
index 7f52a173307..4d1df7cf082 100644
--- a/go/ql/lib/ext/log.model.yml
+++ b/go/ql/lib/ext/log.model.yml
@@ -1,4 +1,28 @@
 extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["log", "", False, "Fatal", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["log", "", False, "Fatalf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["log", "", False, "Fatalln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["log", "", False, "Output", "", "", "Argument[1]", "log-injection", "manual"]
+      - ["log", "", False, "Panic", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["log", "", False, "Panicf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["log", "", False, "Panicln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["log", "", False, "Print", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["log", "", False, "Printf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["log", "", False, "Println", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["log", "Logger", True, "Fatal", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["log", "Logger", True, "Fatalf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["log", "Logger", True, "Fatalln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["log", "Logger", True, "Output", "", "", "Argument[1]", "log-injection", "manual"]
+      - ["log", "Logger", True, "Panic", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["log", "Logger", True, "Panicf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["log", "Logger", True, "Panicln", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["log", "Logger", True, "Print", "", "", "Argument[0]", "log-injection", "manual"]
+      - ["log", "Logger", True, "Printf", "", "", "Argument[0..1]", "log-injection", "manual"]
+      - ["log", "Logger", True, "Println", "", "", "Argument[0]", "log-injection", "manual"]
   - addsTo:
       pack: codeql/go-all
       extensible: summaryModel
diff --git a/go/ql/lib/ext/os.model.yml b/go/ql/lib/ext/os.model.yml
index 3d87eefe43f..2c1c64db93a 100644
--- a/go/ql/lib/ext/os.model.yml
+++ b/go/ql/lib/ext/os.model.yml
@@ -53,6 +53,7 @@ extensions:
       - ["os", "", False, "Open", "", "", "ReturnValue[0]", "file", "manual"]
       - ["os", "", False, "OpenFile", "", "", "ReturnValue[0]", "file", "manual"]
       - ["os", "", False, "ReadFile", "", "", "ReturnValue[0]", "file", "manual"]
+      - ["os", "", False, "Stdin", "", "", "", "stdin", "manual"]
       - ["os", "", False, "UserCacheDir", "", "", "ReturnValue[0]", "environment", "manual"]
       - ["os", "", False, "UserConfigDir", "", "", "ReturnValue[0]", "environment", "manual"]
       - ["os", "", False, "UserHomeDir", "", "", "ReturnValue[0]", "environment", "manual"]
diff --git a/go/ql/lib/ext/slices.model.yml b/go/ql/lib/ext/slices.model.yml
new file mode 100644
index 00000000000..2023aeb3db2
--- /dev/null
+++ b/go/ql/lib/ext/slices.model.yml
@@ -0,0 +1,31 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: summaryModel
+    data:
+      # All should be modeled when we have a way to model iterators
+      # AppendSec should be modeled when we have a way to model iterators
+      # Backward should be modeled when we have a way to model iterators
+      # Chunk should be modeled when we have a way to model iterators
+      - ["slices", "", False, "Clip", "", "", "Argument[0].ArrayElement", "ReturnValue.ArrayElement", "value", "manual"]
+      - ["slices", "", False, "Clone", "", "", "Argument[0].ArrayElement", "ReturnValue.ArrayElement", "value", "manual"]
+      # Collect should be modeled when we have a way to model iterators
+      - ["slices", "", False, "Compact", "", "", "Argument[0].ArrayElement", "ReturnValue.ArrayElement", "value", "manual"]
+      - ["slices", "", False, "CompactFunc", "", "", "Argument[0].ArrayElement", "ReturnValue.ArrayElement", "value", "manual"]
+      - ["slices", "", False, "Concat", "", "", "Argument[0].ArrayElement.ArrayElement", "ReturnValue.ArrayElement", "value", "manual"]
+      - ["slices", "", False, "Delete", "", "", "Argument[0].ArrayElement", "ReturnValue.ArrayElement", "value", "manual"]
+      - ["slices", "", False, "DeleteFunc", "", "", "Argument[0].ArrayElement", "ReturnValue.ArrayElement", "value", "manual"]
+      - ["slices", "", False, "Grow", "", "", "Argument[0].ArrayElement", "ReturnValue.ArrayElement", "value", "manual"]
+      - ["slices", "", False, "Insert", "", "", "Argument[0].ArrayElement", "ReturnValue.ArrayElement", "value", "manual"]
+      - ["slices", "", False, "Insert", "", "", "Argument[2].ArrayElement", "ReturnValue.ArrayElement", "value", "manual"]
+      - ["slices", "", False, "Max", "", "", "Argument[0].ArrayElement", "ReturnValue", "value", "manual"]
+      - ["slices", "", False, "MaxFunc", "", "", "Argument[0].ArrayElement", "ReturnValue", "value", "manual"]
+      - ["slices", "", False, "Min", "", "", "Argument[0].ArrayElement", "ReturnValue", "value", "manual"]
+      - ["slices", "", False, "MinFunc", "", "", "Argument[0].ArrayElement", "ReturnValue", "value", "manual"]
+      - ["slices", "", False, "Repeat", "", "", "Argument[0].ArrayElement", "ReturnValue.ArrayElement", "value", "manual"]
+      - ["slices", "", False, "Replace", "", "", "Argument[0].ArrayElement", "ReturnValue.ArrayElement", "value", "manual"]
+      - ["slices", "", False, "Replace", "", "", "Argument[3].ArrayElement", "ReturnValue.ArrayElement", "value", "manual"]
+      # Sorted should be modeled when we have a way to model iterators
+      # SortedFunc should be modeled when we have a way to model iterators
+      # SortedStableFunc should be modeled when we have a way to model iterators
+      # Values should be modeled when we have a way to model iterators
diff --git a/go/ql/lib/ext/xorm.io.xorm.model.yml b/go/ql/lib/ext/xorm.io.xorm.model.yml
new file mode 100644
index 00000000000..5cf1ac4f5d7
--- /dev/null
+++ b/go/ql/lib/ext/xorm.io.xorm.model.yml
@@ -0,0 +1,49 @@
+extensions:
+  - addsTo:
+      pack: codeql/go-all
+      extensible: packageGrouping
+    data:
+      - ["xorm", "xorm.io/xorm"]
+      - ["xorm", "github.com/go-xorm/xorm"]
+  - addsTo:
+      pack: codeql/go-all
+      extensible: sinkModel
+    data:
+      - ["group:xorm", "Engine", True, "Alias", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:xorm", "Engine", True, "And", "", "", "Argument[0]", "sql-injection", "manual"]
+      # Engine.Exec has to be modeled in QL to select only the first syntactic argument
+      - ["group:xorm", "Engine", True, "GroupBy", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:xorm", "Engine", True, "Having", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:xorm", "Engine", True, "In", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:xorm", "Engine", True, "Join", "", "", "Argument[0..2]", "sql-injection", "manual"]
+      - ["group:xorm", "Engine", True, "NotIn", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:xorm", "Engine", True, "Or", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:xorm", "Engine", True, "OrderBy", "", "", "Argument[0]", "sql-injection", "manual"]
+      # Engine.Query, Engine.QueryInterface and Engine.QueryString have to be modeled in QL to select only the first syntactic argument
+      - ["group:xorm", "Engine", True, "Select", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:xorm", "Engine", True, "SetExpr", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:xorm", "Engine", True, "SQL", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:xorm", "Engine", True, "Sum", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["group:xorm", "Engine", True, "Sums", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["group:xorm", "Engine", True, "SumInt", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["group:xorm", "Engine", True, "SumsInt", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["group:xorm", "Engine", True, "Where", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:xorm", "Session", True, "Alias", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:xorm", "Session", True, "And", "", "", "Argument[0]", "sql-injection", "manual"]
+      # Session.Exec has to be modeled in QL to select only the first syntactic argument
+      - ["group:xorm", "Session", True, "GroupBy", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:xorm", "Session", True, "Having", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:xorm", "Session", True, "In", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:xorm", "Session", True, "Join", "", "", "Argument[0..2]", "sql-injection", "manual"]
+      - ["group:xorm", "Session", True, "NotIn", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:xorm", "Session", True, "Or", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:xorm", "Session", True, "OrderBy", "", "", "Argument[0]", "sql-injection", "manual"]
+      # Session.Query, Session.QueryInterface and Session.QueryString have to be modeled in QL to select only the first syntactic argument
+      - ["group:xorm", "Session", True, "Select", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:xorm", "Session", True, "SetExpr", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:xorm", "Session", True, "SQL", "", "", "Argument[0]", "sql-injection", "manual"]
+      - ["group:xorm", "Session", True, "Sum", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["group:xorm", "Session", True, "Sums", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["group:xorm", "Session", True, "SumInt", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["group:xorm", "Session", True, "SumsInt", "", "", "Argument[1]", "sql-injection", "manual"]
+      - ["group:xorm", "Session", True, "Where", "", "", "Argument[0]", "sql-injection", "manual"]
diff --git a/go/ql/lib/go.qll b/go/ql/lib/go.qll
index fb59790dcc5..8d3955e4dad 100644
--- a/go/ql/lib/go.qll
+++ b/go/ql/lib/go.qll
@@ -25,11 +25,9 @@ import semmle.go.controlflow.BasicBlocks
 import semmle.go.controlflow.ControlFlowGraph
 import semmle.go.controlflow.IR
 import semmle.go.dataflow.DataFlow
-import semmle.go.dataflow.DataFlow2
 import semmle.go.dataflow.GlobalValueNumbering
 import semmle.go.dataflow.SSA
 import semmle.go.dataflow.TaintTracking
-import semmle.go.dataflow.TaintTracking2
 import semmle.go.frameworks.Afero
 import semmle.go.frameworks.AwsLambda
 import semmle.go.frameworks.Beego
diff --git a/go/ql/lib/semmle/go/Concepts.qll b/go/ql/lib/semmle/go/Concepts.qll
index c15d3683b40..3f0cd0f8885 100644
--- a/go/ql/lib/semmle/go/Concepts.qll
+++ b/go/ql/lib/semmle/go/Concepts.qll
@@ -373,6 +373,48 @@ module LoggerCall {
   }
 }
 
+private class DefaultLoggerCall extends LoggerCall::Range, DataFlow::CallNode {
+  DataFlow::ArgumentNode messageComponent;
+
+  DefaultLoggerCall() {
+    sinkNode(messageComponent, "log-injection") and
+    this = messageComponent.getCall()
+  }
+
+  override DataFlow::Node getAMessageComponent() {
+    not messageComponent instanceof DataFlow::ImplicitVarargsSlice and
+    result = messageComponent
+    or
+    messageComponent instanceof DataFlow::ImplicitVarargsSlice and
+    result = this.getAnImplicitVarargsArgument()
+  }
+}
+
+/**
+ * A call to an interface that looks like a logger. It is common to use a
+ * locally-defined interface for logging to make it easy to changing logging
+ * library.
+ */
+private class HeuristicLoggerCall extends LoggerCall::Range, DataFlow::CallNode {
+  HeuristicLoggerCall() {
+    exists(Method m, string tp, string logFunctionPrefix, string name |
+      m = this.getTarget() and
+      m.hasQualifiedName(_, tp, name) and
+      m.getReceiverBaseType().getUnderlyingType() instanceof InterfaceType
+    |
+      tp.regexpMatch(".*[lL]ogger") and
+      logFunctionPrefix =
+        [
+          "Debug", "Error", "Fatal", "Info", "Log", "Output", "Panic", "Print", "Trace", "Warn",
+          "With"
+        ] and
+      name.matches(logFunctionPrefix + "%")
+    )
+  }
+
+  override DataFlow::Node getAMessageComponent() { result = this.getASyntacticArgument() }
+}
+
 /**
  * A function that encodes data into a binary or textual format.
  *
diff --git a/go/ql/lib/semmle/go/Scopes.qll b/go/ql/lib/semmle/go/Scopes.qll
index f9b9e3a26b9..c3671c74b5c 100644
--- a/go/ql/lib/semmle/go/Scopes.qll
+++ b/go/ql/lib/semmle/go/Scopes.qll
@@ -472,7 +472,7 @@ class Function extends ValueEntity, @functionobject {
   /** Gets a parameter of this function. */
   Parameter getAParameter() { result = this.getParameter(_) }
 
-  /** Gets the `i`th reslt variable of this function. */
+  /** Gets the `i`th result variable of this function. */
   ResultVariable getResult(int i) { result.isResultOf(this.getFuncDecl(), i) }
 
   /** Gets a result variable of this function. */
diff --git a/go/ql/lib/semmle/go/Types.qll b/go/ql/lib/semmle/go/Types.qll
index 1b09ea466cc..1f1234aa1de 100644
--- a/go/ql/lib/semmle/go/Types.qll
+++ b/go/ql/lib/semmle/go/Types.qll
@@ -496,14 +496,15 @@ class StructType extends @structtype, CompositeType {
   Field getFieldOfEmbedded(Field embeddedParent, string name, int depth, boolean isEmbedded) {
     // embeddedParent is a field of 'this' at depth 'depth - 1'
     this.hasFieldCand(_, embeddedParent, depth - 1, true) and
-    // embeddedParent's type has the result field
-    exists(StructType embeddedType, Type fieldType |
-      fieldType = embeddedParent.getType().getUnderlyingType() and
-      pragma[only_bind_into](embeddedType) =
-        [fieldType, fieldType.(PointerType).getBaseType().getUnderlyingType()]
-    |
-      result = embeddedType.getOwnField(name, isEmbedded)
-    )
+    // embeddedParent's type has the result field. Note that it is invalid Go
+    // to have an embedded field with a named type whose underlying type is a
+    // pointer, so we don't have to have
+    // `lookThroughPointerType(embeddedParent.getType().getUnderlyingType())`.
+    result =
+      lookThroughPointerType(embeddedParent.getType())
+          .getUnderlyingType()
+          .(StructType)
+          .getOwnField(name, isEmbedded)
   }
 
   /**
@@ -523,8 +524,12 @@ class StructType extends @structtype, CompositeType {
   private predicate hasFieldCand(string name, Field f, int depth, boolean isEmbedded) {
     f = this.getOwnField(name, isEmbedded) and depth = 0
     or
-    not this.hasOwnField(_, name, _, _) and
-    f = this.getFieldOfEmbedded(_, name, depth, isEmbedded)
+    f = this.getFieldOfEmbedded(_, name, depth, isEmbedded) and
+    // If this is a cyclic field and this is not the first time we see this embedded field
+    // then don't include it as a field candidate to avoid non-termination.
+    not exists(Type t | lookThroughPointerType(t) = lookThroughPointerType(f.getType()) |
+      this.hasOwnField(_, name, t, _)
+    )
   }
 
   private predicate hasMethodCand(string name, Method m, int depth) {
@@ -541,15 +546,7 @@ class StructType extends @structtype, CompositeType {
   predicate hasField(string name, Type tp) {
     exists(int mindepth |
       mindepth = min(int depth | this.hasFieldCand(name, _, depth, _)) and
-      tp = unique(Field f | f = this.getFieldCand(name, mindepth, _)).getType()
-    )
-  }
-
-  private Field getFieldCand(string name, int depth, boolean isEmbedded) {
-    result = this.getOwnField(name, isEmbedded) and depth = 0
-    or
-    exists(Type embedded | this.hasEmbeddedField(embedded, depth - 1) |
-      result = embedded.getUnderlyingType().(StructType).getOwnField(name, isEmbedded)
+      tp = unique(Field f | this.hasFieldCand(name, f, mindepth, _)).getType()
     )
   }
 
@@ -564,9 +561,9 @@ class StructType extends @structtype, CompositeType {
    * The depth of a field `f` declared in this type is zero.
    */
   Field getFieldAtDepth(string name, int depth) {
-    depth = min(int depthCand | exists(this.getFieldCand(name, depthCand, _))) and
-    result = this.getFieldCand(name, depth, _) and
-    strictcount(this.getFieldCand(name, depth, _)) = 1
+    depth = min(int depthCand | this.hasFieldCand(name, _, depthCand, _)) and
+    this.hasFieldCand(name, result, depth, _) and
+    strictcount(Field f | this.hasFieldCand(name, f, depth, _)) = 1
   }
 
   Method getMethodAtDepth(string name, int depth) {
diff --git a/go/ql/lib/semmle/go/dataflow/DataFlow.qll b/go/ql/lib/semmle/go/dataflow/DataFlow.qll
index 9363bc93abd..c26adbfd2c2 100644
--- a/go/ql/lib/semmle/go/dataflow/DataFlow.qll
+++ b/go/ql/lib/semmle/go/dataflow/DataFlow.qll
@@ -25,7 +25,7 @@ module DataFlow {
   private import semmle.go.dataflow.internal.DataFlowImplSpecific
   private import codeql.dataflow.DataFlow
   import DataFlowMake<Location, GoDataFlow>
-  import semmle.go.dataflow.internal.DataFlowImpl1
+  import Public
   import Properties
 }
 
diff --git a/go/ql/lib/semmle/go/dataflow/DataFlow2.qll b/go/ql/lib/semmle/go/dataflow/DataFlow2.qll
deleted file mode 100644
index a2bae8bd939..00000000000
--- a/go/ql/lib/semmle/go/dataflow/DataFlow2.qll
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Provides a library for local (intra-procedural) and global (inter-procedural)
- * data flow analysis: deciding whether data can flow from a _source_ to a
- * _sink_.
- *
- * Unless configured otherwise, _flow_ means that the exact value of
- * the source may reach the sink. We do not track flow across pointer
- * dereferences or array indexing. To track these types of flow, where the
- * exact value may not be preserved, import
- * `semmle.code.go.dataflow.TaintTracking`.
- *
- * To use global (interprocedural) data flow, extend the class
- * `DataFlow::Configuration` as documented on that class. To use local
- * (intraprocedural) data flow, invoke `DataFlow::localFlow` or
- * `DataFlow::LocalFlowStep` with arguments of type `DataFlow::Node`.
- */
-
-import go
-
-/**
- * Provides a library for local (intra-procedural) and global (inter-procedural)
- * data flow analysis.
- */
-module DataFlow2 {
-  import semmle.go.dataflow.internal.DataFlowImpl2
-  import Properties
-}
diff --git a/go/ql/lib/semmle/go/dataflow/ExternalFlow.qll b/go/ql/lib/semmle/go/dataflow/ExternalFlow.qll
index a59c7294e80..5ae7b6a7f0d 100644
--- a/go/ql/lib/semmle/go/dataflow/ExternalFlow.qll
+++ b/go/ql/lib/semmle/go/dataflow/ExternalFlow.qll
@@ -38,7 +38,8 @@
  *    first 6 columns, and the `output` column specifies how data leaves the
  *    element selected by the first 6 columns. An `input` can be either "",
  *    "Argument[n]", or "Argument[n1..n2]":
- *    - "": Selects a write to the selected element in case this is a field.
+ *    - "": Selects a write to the selected element in case this is a field or
+ *      package-level variable.
  *    - "Argument[n]": Selects an argument in a call to the selected element.
  *      The arguments are zero-indexed, and `receiver` specifies the receiver.
  *    - "Argument[n1..n2]": Similar to "Argument[n]" but selects any argument
@@ -47,7 +48,7 @@
  *    An `output` can be either "", "Argument[n]", "Argument[n1..n2]", "Parameter",
  *    "Parameter[n]", "Parameter[n1..n2]", , "ReturnValue", "ReturnValue[n]", or
  *    "ReturnValue[n1..n2]":
- *    - "": Selects a read of a selected field.
+ *    - "": Selects a read of a selected field or package-level variable.
  *    - "Argument[n]": Selects the post-update value of an argument in a call to the
  *      selected element. That is, the value of the argument after the call returns.
  *      The arguments are zero-indexed, and `receiver` specifies the receiver.
diff --git a/go/ql/lib/semmle/go/dataflow/TaintTracking.qll b/go/ql/lib/semmle/go/dataflow/TaintTracking.qll
index d762e925ab5..c469574b3b9 100644
--- a/go/ql/lib/semmle/go/dataflow/TaintTracking.qll
+++ b/go/ql/lib/semmle/go/dataflow/TaintTracking.qll
@@ -10,11 +10,10 @@ import semmle.go.dataflow.DataFlow
  * global (inter-procedural) taint-tracking analyses.
  */
 module TaintTracking {
-  import semmle.go.dataflow.internal.tainttracking1.TaintTrackingParameter::Public
+  import semmle.go.dataflow.internal.TaintTrackingUtil
   private import semmle.go.dataflow.internal.DataFlowImplSpecific
   private import semmle.go.dataflow.internal.TaintTrackingImplSpecific
   private import semmle.go.Locations
   private import codeql.dataflow.TaintTracking
   import TaintFlowMake<Location, GoDataFlow, GoTaintTracking>
-  import semmle.go.dataflow.internal.tainttracking1.TaintTrackingImpl
 }
diff --git a/go/ql/lib/semmle/go/dataflow/TaintTracking2.qll b/go/ql/lib/semmle/go/dataflow/TaintTracking2.qll
deleted file mode 100644
index 6b1b2487e5b..00000000000
--- a/go/ql/lib/semmle/go/dataflow/TaintTracking2.qll
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) taint-tracking analyses.
- */
-
-/**
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) taint-tracking analyses.
- */
-module TaintTracking2 {
-  import semmle.go.dataflow.internal.tainttracking2.TaintTrackingImpl
-}
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl1.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl1.qll
deleted file mode 100644
index 17def0c431d..00000000000
--- a/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl1.qll
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides a `Configuration` class backwards-compatible interface to the data
- * flow library.
- */
-
-private import DataFlowImplCommon
-private import DataFlowImplSpecific::Private
-import DataFlowImplSpecific::Public
-private import DataFlowImpl
-import DataFlowImplCommonPublic
-deprecated import FlowStateString
-private import codeql.util.Unit
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural data flow analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the global data flow library must define its own unique extension
- * of this abstract class. To create a configuration, extend this class with
- * a subclass whose characteristic predicate is a unique singleton string.
- * For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends DataFlow::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isBarrier`.
- *   // Optionally override `isAdditionalFlowStep`.
- * }
- * ```
- * Conceptually, this defines a graph where the nodes are `DataFlow::Node`s and
- * the edges are those data-flow steps that preserve the value of the node
- * along with any additional edges defined by `isAdditionalFlowStep`.
- * Specifying nodes in `isBarrier` will remove those nodes from the graph, and
- * specifying nodes in `isBarrierIn` and/or `isBarrierOut` will remove in-going
- * and/or out-going edges from those nodes, respectively.
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but two classes extending
- * `DataFlow::Configuration` should never depend on each other. One of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`.
- */
-abstract deprecated class Configuration extends string {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant data flow source.
-   */
-  predicate isSource(Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant data flow source with the given initial
-   * `state`.
-   */
-  predicate isSource(Node source, FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink.
-   */
-  predicate isSink(Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink accepting `state`.
-   */
-  predicate isSink(Node sink, FlowState state) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited. This completely removes
-   * `node` from the data flow graph.
-   */
-  predicate isBarrier(Node node) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited when the flow state is
-   * `state`.
-   */
-  predicate isBarrier(Node node, FlowState state) { none() }
-
-  /** Holds if data flow into `node` is prohibited. */
-  predicate isBarrierIn(Node node) { none() }
-
-  /** Holds if data flow out of `node` is prohibited. */
-  predicate isBarrierOut(Node node) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   */
-  predicate isAdditionalFlowStep(Node node1, Node node2) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
-    none()
-  }
-
-  /**
-   * Holds if an arbitrary number of implicit read steps of content `c` may be
-   * taken at `node`.
-   */
-  predicate allowImplicitRead(Node node, ContentSet c) { none() }
-
-  /**
-   * Gets the virtual dispatch branching limit when calculating field flow.
-   * This can be overridden to a smaller value to improve performance (a
-   * value of 0 disables field flow), or a larger value to get more results.
-   */
-  int fieldFlowBranchLimit() { result = 2 }
-
-  /**
-   * Gets a data flow configuration feature to add restrictions to the set of
-   * valid flow paths.
-   *
-   * - `FeatureHasSourceCallContext`:
-   *    Assume that sources have some existing call context to disallow
-   *    conflicting return-flow directly following the source.
-   * - `FeatureHasSinkCallContext`:
-   *    Assume that sinks have some existing call context to disallow
-   *    conflicting argument-to-parameter flow directly preceding the sink.
-   * - `FeatureEqualSourceSinkCallContext`:
-   *    Implies both of the above and additionally ensures that the entire flow
-   *    path preserves the call context.
-   *
-   * These features are generally not relevant for typical end-to-end data flow
-   * queries, but should only be used for constructing paths that need to
-   * somehow be pluggable in another path context.
-   */
-  FlowFeature getAFeature() { none() }
-
-  /** Holds if sources should be grouped in the result of `hasFlowPath`. */
-  predicate sourceGrouping(Node source, string sourceGroup) { none() }
-
-  /** Holds if sinks should be grouped in the result of `hasFlowPath`. */
-  predicate sinkGrouping(Node sink, string sinkGroup) { none() }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   */
-  predicate hasFlow(Node source, Node sink) { hasFlow(source, sink, this) }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   *
-   * The corresponding paths are generated from the end-points and the graph
-   * included in the module `PathGraph`.
-   */
-  predicate hasFlowPath(PathNode source, PathNode sink) { hasFlowPath(source, sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowTo(Node sink) { hasFlowTo(sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowToExpr(DataFlowExpr sink) { this.hasFlowTo(exprNode(sink)) }
-
-  /**
-   * Holds if hidden nodes should be included in the data flow graph.
-   *
-   * This feature should only be used for debugging or when the data flow graph
-   * is not visualized (for example in a `path-problem` query).
-   */
-  predicate includeHiddenNodes() { none() }
-}
-
-/**
- * This class exists to prevent mutual recursion between the user-overridden
- * member predicates of `Configuration` and the rest of the data-flow library.
- * Good performance cannot be guaranteed in the presence of such recursion, so
- * it should be replaced by using more than one copy of the data flow library.
- */
-abstract deprecated private class ConfigurationRecursionPrevention extends Configuration {
-  bindingset[this]
-  ConfigurationRecursionPrevention() { any() }
-
-  override predicate hasFlow(Node source, Node sink) {
-    strictcount(Node n | this.isSource(n)) < 0
-    or
-    strictcount(Node n | this.isSource(n, _)) < 0
-    or
-    strictcount(Node n | this.isSink(n)) < 0
-    or
-    strictcount(Node n | this.isSink(n, _)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, _, n2, _)) < 0
-    or
-    super.hasFlow(source, sink)
-  }
-}
-
-deprecated private FlowState relevantState(Configuration config) {
-  config.isSource(_, result) or
-  config.isSink(_, result) or
-  config.isBarrier(_, result) or
-  config.isAdditionalFlowStep(_, result, _, _) or
-  config.isAdditionalFlowStep(_, _, _, result)
-}
-
-private newtype TConfigState =
-  deprecated TMkConfigState(Configuration config, FlowState state) {
-    state = relevantState(config) or state instanceof FlowStateEmpty
-  }
-
-deprecated private Configuration getConfig(TConfigState state) { state = TMkConfigState(result, _) }
-
-deprecated private FlowState getState(TConfigState state) { state = TMkConfigState(_, result) }
-
-deprecated private predicate singleConfiguration() { 1 = strictcount(Configuration c) }
-
-deprecated private module Config implements FullStateConfigSig {
-  class FlowState = TConfigState;
-
-  predicate isSource(Node source, FlowState state) {
-    getConfig(state).isSource(source, getState(state))
-    or
-    getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isSink(Node sink) { none() }
-
-  predicate isSink(Node sink, FlowState state) {
-    getConfig(state).isSink(sink, getState(state))
-    or
-    getConfig(state).isSink(sink) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isBarrier(Node node) { none() }
-
-  predicate isBarrier(Node node, FlowState state) {
-    getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node)
-  }
-
-  predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
-
-  predicate isBarrierOut(Node node) { any(Configuration config).isBarrierOut(node) }
-
-  predicate isBarrierIn(Node node, FlowState state) { none() }
-
-  predicate isBarrierOut(Node node, FlowState state) { none() }
-
-  predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
-    singleConfiguration() and
-    any(Configuration config).isAdditionalFlowStep(node1, node2) and
-    model = ""
-  }
-
-  predicate isAdditionalFlowStep(
-    Node node1, FlowState state1, Node node2, FlowState state2, string model
-  ) {
-    getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1) and
-    model = ""
-    or
-    not singleConfiguration() and
-    getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1 and
-    model = ""
-  }
-
-  predicate allowImplicitRead(Node node, ContentSet c) {
-    any(Configuration config).allowImplicitRead(node, c)
-  }
-
-  predicate neverSkip(Node node) { none() }
-
-  int fieldFlowBranchLimit() { result = min(any(Configuration config).fieldFlowBranchLimit()) }
-
-  int accessPathLimit() { result = 5 }
-
-  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
-
-  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
-
-  predicate observeDiffInformedIncrementalMode() { none() }
-}
-
-deprecated private import Impl<Config> as I
-
-/**
- * A `Node` augmented with a call context (except for sinks), an access path, and a configuration.
- * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
- */
-deprecated class PathNode instanceof I::PathNode {
-  /** Gets a textual representation of this element. */
-  final string toString() { result = super.toString() }
-
-  /**
-   * Gets a textual representation of this element, including a textual
-   * representation of the call context.
-   */
-  final string toStringWithContext() { result = super.toStringWithContext() }
-
-  /**
-   * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
-   * For more information, see
-   * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
-   */
-  final predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    super.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-
-  /** Gets the underlying `Node`. */
-  final Node getNode() { result = super.getNode() }
-
-  /** Gets the `FlowState` of this node. */
-  deprecated final FlowState getState() { result = getState(super.getState()) }
-
-  /** Gets the associated configuration. */
-  deprecated final Configuration getConfiguration() { result = getConfig(super.getState()) }
-
-  /** Gets a successor of this node, if any. */
-  final PathNode getASuccessor() { result = super.getASuccessor() }
-
-  /** Holds if this node is a source. */
-  final predicate isSource() { super.isSource() }
-
-  /** Holds if this node is a grouping of source nodes. */
-  final predicate isSourceGroup(string group) { super.isSourceGroup(group) }
-
-  /** Holds if this node is a grouping of sink nodes. */
-  final predicate isSinkGroup(string group) { super.isSinkGroup(group) }
-}
-
-deprecated module PathGraph = I::PathGraph;
-
-deprecated private predicate hasFlow(Node source, Node sink, Configuration config) {
-  exists(PathNode source0, PathNode sink0 |
-    hasFlowPath(source0, sink0, config) and
-    source0.getNode() = source and
-    sink0.getNode() = sink
-  )
-}
-
-deprecated private predicate hasFlowPath(PathNode source, PathNode sink, Configuration config) {
-  I::flowPath(source, sink) and source.getConfiguration() = config
-}
-
-deprecated private predicate hasFlowTo(Node sink, Configuration config) { hasFlow(_, sink, config) }
-
-deprecated predicate flowsTo = hasFlow/3;
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl2.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl2.qll
deleted file mode 100644
index 17def0c431d..00000000000
--- a/go/ql/lib/semmle/go/dataflow/internal/DataFlowImpl2.qll
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides a `Configuration` class backwards-compatible interface to the data
- * flow library.
- */
-
-private import DataFlowImplCommon
-private import DataFlowImplSpecific::Private
-import DataFlowImplSpecific::Public
-private import DataFlowImpl
-import DataFlowImplCommonPublic
-deprecated import FlowStateString
-private import codeql.util.Unit
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural data flow analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the global data flow library must define its own unique extension
- * of this abstract class. To create a configuration, extend this class with
- * a subclass whose characteristic predicate is a unique singleton string.
- * For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends DataFlow::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isBarrier`.
- *   // Optionally override `isAdditionalFlowStep`.
- * }
- * ```
- * Conceptually, this defines a graph where the nodes are `DataFlow::Node`s and
- * the edges are those data-flow steps that preserve the value of the node
- * along with any additional edges defined by `isAdditionalFlowStep`.
- * Specifying nodes in `isBarrier` will remove those nodes from the graph, and
- * specifying nodes in `isBarrierIn` and/or `isBarrierOut` will remove in-going
- * and/or out-going edges from those nodes, respectively.
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but two classes extending
- * `DataFlow::Configuration` should never depend on each other. One of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`.
- */
-abstract deprecated class Configuration extends string {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant data flow source.
-   */
-  predicate isSource(Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant data flow source with the given initial
-   * `state`.
-   */
-  predicate isSource(Node source, FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink.
-   */
-  predicate isSink(Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink accepting `state`.
-   */
-  predicate isSink(Node sink, FlowState state) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited. This completely removes
-   * `node` from the data flow graph.
-   */
-  predicate isBarrier(Node node) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited when the flow state is
-   * `state`.
-   */
-  predicate isBarrier(Node node, FlowState state) { none() }
-
-  /** Holds if data flow into `node` is prohibited. */
-  predicate isBarrierIn(Node node) { none() }
-
-  /** Holds if data flow out of `node` is prohibited. */
-  predicate isBarrierOut(Node node) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   */
-  predicate isAdditionalFlowStep(Node node1, Node node2) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
-    none()
-  }
-
-  /**
-   * Holds if an arbitrary number of implicit read steps of content `c` may be
-   * taken at `node`.
-   */
-  predicate allowImplicitRead(Node node, ContentSet c) { none() }
-
-  /**
-   * Gets the virtual dispatch branching limit when calculating field flow.
-   * This can be overridden to a smaller value to improve performance (a
-   * value of 0 disables field flow), or a larger value to get more results.
-   */
-  int fieldFlowBranchLimit() { result = 2 }
-
-  /**
-   * Gets a data flow configuration feature to add restrictions to the set of
-   * valid flow paths.
-   *
-   * - `FeatureHasSourceCallContext`:
-   *    Assume that sources have some existing call context to disallow
-   *    conflicting return-flow directly following the source.
-   * - `FeatureHasSinkCallContext`:
-   *    Assume that sinks have some existing call context to disallow
-   *    conflicting argument-to-parameter flow directly preceding the sink.
-   * - `FeatureEqualSourceSinkCallContext`:
-   *    Implies both of the above and additionally ensures that the entire flow
-   *    path preserves the call context.
-   *
-   * These features are generally not relevant for typical end-to-end data flow
-   * queries, but should only be used for constructing paths that need to
-   * somehow be pluggable in another path context.
-   */
-  FlowFeature getAFeature() { none() }
-
-  /** Holds if sources should be grouped in the result of `hasFlowPath`. */
-  predicate sourceGrouping(Node source, string sourceGroup) { none() }
-
-  /** Holds if sinks should be grouped in the result of `hasFlowPath`. */
-  predicate sinkGrouping(Node sink, string sinkGroup) { none() }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   */
-  predicate hasFlow(Node source, Node sink) { hasFlow(source, sink, this) }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   *
-   * The corresponding paths are generated from the end-points and the graph
-   * included in the module `PathGraph`.
-   */
-  predicate hasFlowPath(PathNode source, PathNode sink) { hasFlowPath(source, sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowTo(Node sink) { hasFlowTo(sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowToExpr(DataFlowExpr sink) { this.hasFlowTo(exprNode(sink)) }
-
-  /**
-   * Holds if hidden nodes should be included in the data flow graph.
-   *
-   * This feature should only be used for debugging or when the data flow graph
-   * is not visualized (for example in a `path-problem` query).
-   */
-  predicate includeHiddenNodes() { none() }
-}
-
-/**
- * This class exists to prevent mutual recursion between the user-overridden
- * member predicates of `Configuration` and the rest of the data-flow library.
- * Good performance cannot be guaranteed in the presence of such recursion, so
- * it should be replaced by using more than one copy of the data flow library.
- */
-abstract deprecated private class ConfigurationRecursionPrevention extends Configuration {
-  bindingset[this]
-  ConfigurationRecursionPrevention() { any() }
-
-  override predicate hasFlow(Node source, Node sink) {
-    strictcount(Node n | this.isSource(n)) < 0
-    or
-    strictcount(Node n | this.isSource(n, _)) < 0
-    or
-    strictcount(Node n | this.isSink(n)) < 0
-    or
-    strictcount(Node n | this.isSink(n, _)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, _, n2, _)) < 0
-    or
-    super.hasFlow(source, sink)
-  }
-}
-
-deprecated private FlowState relevantState(Configuration config) {
-  config.isSource(_, result) or
-  config.isSink(_, result) or
-  config.isBarrier(_, result) or
-  config.isAdditionalFlowStep(_, result, _, _) or
-  config.isAdditionalFlowStep(_, _, _, result)
-}
-
-private newtype TConfigState =
-  deprecated TMkConfigState(Configuration config, FlowState state) {
-    state = relevantState(config) or state instanceof FlowStateEmpty
-  }
-
-deprecated private Configuration getConfig(TConfigState state) { state = TMkConfigState(result, _) }
-
-deprecated private FlowState getState(TConfigState state) { state = TMkConfigState(_, result) }
-
-deprecated private predicate singleConfiguration() { 1 = strictcount(Configuration c) }
-
-deprecated private module Config implements FullStateConfigSig {
-  class FlowState = TConfigState;
-
-  predicate isSource(Node source, FlowState state) {
-    getConfig(state).isSource(source, getState(state))
-    or
-    getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isSink(Node sink) { none() }
-
-  predicate isSink(Node sink, FlowState state) {
-    getConfig(state).isSink(sink, getState(state))
-    or
-    getConfig(state).isSink(sink) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isBarrier(Node node) { none() }
-
-  predicate isBarrier(Node node, FlowState state) {
-    getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node)
-  }
-
-  predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
-
-  predicate isBarrierOut(Node node) { any(Configuration config).isBarrierOut(node) }
-
-  predicate isBarrierIn(Node node, FlowState state) { none() }
-
-  predicate isBarrierOut(Node node, FlowState state) { none() }
-
-  predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
-    singleConfiguration() and
-    any(Configuration config).isAdditionalFlowStep(node1, node2) and
-    model = ""
-  }
-
-  predicate isAdditionalFlowStep(
-    Node node1, FlowState state1, Node node2, FlowState state2, string model
-  ) {
-    getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1) and
-    model = ""
-    or
-    not singleConfiguration() and
-    getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1 and
-    model = ""
-  }
-
-  predicate allowImplicitRead(Node node, ContentSet c) {
-    any(Configuration config).allowImplicitRead(node, c)
-  }
-
-  predicate neverSkip(Node node) { none() }
-
-  int fieldFlowBranchLimit() { result = min(any(Configuration config).fieldFlowBranchLimit()) }
-
-  int accessPathLimit() { result = 5 }
-
-  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
-
-  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
-
-  predicate observeDiffInformedIncrementalMode() { none() }
-}
-
-deprecated private import Impl<Config> as I
-
-/**
- * A `Node` augmented with a call context (except for sinks), an access path, and a configuration.
- * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
- */
-deprecated class PathNode instanceof I::PathNode {
-  /** Gets a textual representation of this element. */
-  final string toString() { result = super.toString() }
-
-  /**
-   * Gets a textual representation of this element, including a textual
-   * representation of the call context.
-   */
-  final string toStringWithContext() { result = super.toStringWithContext() }
-
-  /**
-   * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
-   * For more information, see
-   * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
-   */
-  final predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    super.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-
-  /** Gets the underlying `Node`. */
-  final Node getNode() { result = super.getNode() }
-
-  /** Gets the `FlowState` of this node. */
-  deprecated final FlowState getState() { result = getState(super.getState()) }
-
-  /** Gets the associated configuration. */
-  deprecated final Configuration getConfiguration() { result = getConfig(super.getState()) }
-
-  /** Gets a successor of this node, if any. */
-  final PathNode getASuccessor() { result = super.getASuccessor() }
-
-  /** Holds if this node is a source. */
-  final predicate isSource() { super.isSource() }
-
-  /** Holds if this node is a grouping of source nodes. */
-  final predicate isSourceGroup(string group) { super.isSourceGroup(group) }
-
-  /** Holds if this node is a grouping of sink nodes. */
-  final predicate isSinkGroup(string group) { super.isSinkGroup(group) }
-}
-
-deprecated module PathGraph = I::PathGraph;
-
-deprecated private predicate hasFlow(Node source, Node sink, Configuration config) {
-  exists(PathNode source0, PathNode sink0 |
-    hasFlowPath(source0, sink0, config) and
-    source0.getNode() = source and
-    sink0.getNode() = sink
-  )
-}
-
-deprecated private predicate hasFlowPath(PathNode source, PathNode sink, Configuration config) {
-  I::flowPath(source, sink) and source.getConfiguration() = config
-}
-
-deprecated private predicate hasFlowTo(Node sink, Configuration config) { hasFlow(_, sink, config) }
-
-deprecated predicate flowsTo = hasFlow/3;
diff --git a/go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImpl.qll b/go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImpl.qll
index b82039a32fe..40c68ceb900 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImpl.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/FlowSummaryImpl.qll
@@ -399,6 +399,13 @@ module SourceSinkInterpretationInput implements
         c = "" and
         pragma[only_bind_into](e) = getElementWithQualifier(frn.getField(), frn.getBase())
       )
+      or
+      // A package-scope (or universe-scope) variable
+      exists(Variable v | not v instanceof Field |
+        c = "" and
+        n.(DataFlow::ReadNode).reads(v) and
+        pragma[only_bind_into](e).asEntity() = v
+      )
     )
   }
 
@@ -420,6 +427,17 @@ module SourceSinkInterpretationInput implements
       fw.writesField(base, f, node.asNode()) and
       pragma[only_bind_into](e) = getElementWithQualifier(f, base)
     )
+    or
+    // A package-scope (or universe-scope) variable
+    exists(Node n, SourceOrSinkElement e, DataFlow::Write w, Variable v |
+      n = node.asNode() and
+      e = mid.asElement() and
+      not v instanceof Field
+    |
+      c = "" and
+      w.writes(v, n) and
+      pragma[only_bind_into](e).asEntity() = v
+    )
   }
 }
 
diff --git a/go/ql/lib/semmle/go/dataflow/internal/tainttracking1/TaintTrackingImpl.qll b/go/ql/lib/semmle/go/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
deleted file mode 100644
index 75e7856fd26..00000000000
--- a/go/ql/lib/semmle/go/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides an implementation of global (interprocedural) taint tracking.
- * This file re-exports the local (intraprocedural) taint-tracking analysis
- * from `TaintTrackingParameter::Public` and adds a global analysis, mainly
- * exposed through the `Configuration` class. For some languages, this file
- * exists in several identical copies, allowing queries to use multiple
- * `Configuration` classes that depend on each other without introducing
- * mutual recursion among those configurations.
- */
-
-import TaintTrackingParameter::Public
-private import TaintTrackingParameter::Private
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural taint tracking analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the taint tracking library must define its own unique extension of
- * this abstract class.
- *
- * A taint-tracking configuration is a special data flow configuration
- * (`DataFlow::Configuration`) that allows for flow through nodes that do not
- * necessarily preserve values but are still relevant from a taint tracking
- * perspective. (For example, string concatenation, where one of the operands
- * is tainted.)
- *
- * To create a configuration, extend this class with a subclass whose
- * characteristic predicate is a unique singleton string. For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends TaintTracking::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isSanitizer`.
- *   // Optionally override `isSanitizerIn`.
- *   // Optionally override `isSanitizerOut`.
- *   // Optionally override `isSanitizerGuard`.
- *   // Optionally override `isAdditionalTaintStep`.
- * }
- * ```
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but it is unsupported to depend on
- * another `TaintTracking::Configuration` or a `DataFlow::Configuration` in the
- * overridden predicates that define sources, sinks, or additional steps.
- * Instead, the dependency should go to a `TaintTracking2::Configuration` or a
- * `DataFlow2::Configuration`, `DataFlow3::Configuration`, etc.
- */
-abstract deprecated class Configuration extends DataFlow::Configuration {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant taint source.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant taint source with the given initial
-   * `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink accepting `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
-
-  /** Holds if the node `node` is a taint sanitizer. */
-  predicate isSanitizer(DataFlow::Node node) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node) {
-    this.isSanitizer(node) or
-    defaultTaintSanitizer(node)
-  }
-
-  /**
-   * Holds if the node `node` is a taint sanitizer when the flow state is
-   * `state`.
-   */
-  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
-    this.isSanitizer(node, state)
-  }
-
-  /** Holds if taint propagation into `node` is prohibited. */
-  predicate isSanitizerIn(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierIn(DataFlow::Node node) { this.isSanitizerIn(node) }
-
-  /** Holds if taint propagation out of `node` is prohibited. */
-  predicate isSanitizerOut(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   */
-  predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) { none() }
-
-  final override predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
-    this.isAdditionalTaintStep(node1, node2) or
-    defaultAdditionalTaintStep(node1, node2, _)
-  }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalTaintStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    none()
-  }
-
-  final override predicate isAdditionalFlowStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    this.isAdditionalTaintStep(node1, state1, node2, state2)
-  }
-
-  override predicate allowImplicitRead(DataFlow::Node node, DataFlow::ContentSet c) {
-    (
-      this.isSink(node) or
-      this.isSink(node, _) or
-      this.isAdditionalTaintStep(node, _) or
-      this.isAdditionalTaintStep(node, _, _, _)
-    ) and
-    defaultImplicitTaintRead(node, c)
-  }
-
-  /**
-   * Holds if taint may flow from `source` to `sink` for this configuration.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate hasFlow(DataFlow::Node source, DataFlow::Node sink) {
-    super.hasFlow(source, sink)
-  }
-}
diff --git a/go/ql/lib/semmle/go/dataflow/internal/tainttracking1/TaintTrackingParameter.qll b/go/ql/lib/semmle/go/dataflow/internal/tainttracking1/TaintTrackingParameter.qll
deleted file mode 100644
index a5a45514a06..00000000000
--- a/go/ql/lib/semmle/go/dataflow/internal/tainttracking1/TaintTrackingParameter.qll
+++ /dev/null
@@ -1,6 +0,0 @@
-import semmle.go.dataflow.internal.TaintTrackingUtil as Public
-
-module Private {
-  import semmle.go.dataflow.DataFlow::DataFlow as DataFlow
-  import semmle.go.dataflow.internal.DataFlowImpl as DataFlowInternal
-}
diff --git a/go/ql/lib/semmle/go/dataflow/internal/tainttracking2/TaintTrackingImpl.qll b/go/ql/lib/semmle/go/dataflow/internal/tainttracking2/TaintTrackingImpl.qll
deleted file mode 100644
index 75e7856fd26..00000000000
--- a/go/ql/lib/semmle/go/dataflow/internal/tainttracking2/TaintTrackingImpl.qll
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides an implementation of global (interprocedural) taint tracking.
- * This file re-exports the local (intraprocedural) taint-tracking analysis
- * from `TaintTrackingParameter::Public` and adds a global analysis, mainly
- * exposed through the `Configuration` class. For some languages, this file
- * exists in several identical copies, allowing queries to use multiple
- * `Configuration` classes that depend on each other without introducing
- * mutual recursion among those configurations.
- */
-
-import TaintTrackingParameter::Public
-private import TaintTrackingParameter::Private
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural taint tracking analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the taint tracking library must define its own unique extension of
- * this abstract class.
- *
- * A taint-tracking configuration is a special data flow configuration
- * (`DataFlow::Configuration`) that allows for flow through nodes that do not
- * necessarily preserve values but are still relevant from a taint tracking
- * perspective. (For example, string concatenation, where one of the operands
- * is tainted.)
- *
- * To create a configuration, extend this class with a subclass whose
- * characteristic predicate is a unique singleton string. For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends TaintTracking::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isSanitizer`.
- *   // Optionally override `isSanitizerIn`.
- *   // Optionally override `isSanitizerOut`.
- *   // Optionally override `isSanitizerGuard`.
- *   // Optionally override `isAdditionalTaintStep`.
- * }
- * ```
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but it is unsupported to depend on
- * another `TaintTracking::Configuration` or a `DataFlow::Configuration` in the
- * overridden predicates that define sources, sinks, or additional steps.
- * Instead, the dependency should go to a `TaintTracking2::Configuration` or a
- * `DataFlow2::Configuration`, `DataFlow3::Configuration`, etc.
- */
-abstract deprecated class Configuration extends DataFlow::Configuration {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant taint source.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant taint source with the given initial
-   * `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink accepting `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
-
-  /** Holds if the node `node` is a taint sanitizer. */
-  predicate isSanitizer(DataFlow::Node node) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node) {
-    this.isSanitizer(node) or
-    defaultTaintSanitizer(node)
-  }
-
-  /**
-   * Holds if the node `node` is a taint sanitizer when the flow state is
-   * `state`.
-   */
-  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
-    this.isSanitizer(node, state)
-  }
-
-  /** Holds if taint propagation into `node` is prohibited. */
-  predicate isSanitizerIn(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierIn(DataFlow::Node node) { this.isSanitizerIn(node) }
-
-  /** Holds if taint propagation out of `node` is prohibited. */
-  predicate isSanitizerOut(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   */
-  predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) { none() }
-
-  final override predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
-    this.isAdditionalTaintStep(node1, node2) or
-    defaultAdditionalTaintStep(node1, node2, _)
-  }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalTaintStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    none()
-  }
-
-  final override predicate isAdditionalFlowStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    this.isAdditionalTaintStep(node1, state1, node2, state2)
-  }
-
-  override predicate allowImplicitRead(DataFlow::Node node, DataFlow::ContentSet c) {
-    (
-      this.isSink(node) or
-      this.isSink(node, _) or
-      this.isAdditionalTaintStep(node, _) or
-      this.isAdditionalTaintStep(node, _, _, _)
-    ) and
-    defaultImplicitTaintRead(node, c)
-  }
-
-  /**
-   * Holds if taint may flow from `source` to `sink` for this configuration.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate hasFlow(DataFlow::Node source, DataFlow::Node sink) {
-    super.hasFlow(source, sink)
-  }
-}
diff --git a/go/ql/lib/semmle/go/dataflow/internal/tainttracking2/TaintTrackingParameter.qll b/go/ql/lib/semmle/go/dataflow/internal/tainttracking2/TaintTrackingParameter.qll
deleted file mode 100644
index 1130c2e42e1..00000000000
--- a/go/ql/lib/semmle/go/dataflow/internal/tainttracking2/TaintTrackingParameter.qll
+++ /dev/null
@@ -1,5 +0,0 @@
-import semmle.go.dataflow.internal.TaintTrackingUtil as Public
-
-module Private {
-  import semmle.go.dataflow.DataFlow2::DataFlow2 as DataFlow
-}
diff --git a/go/ql/lib/semmle/go/frameworks/Beego.qll b/go/ql/lib/semmle/go/frameworks/Beego.qll
index 9f6ee598003..a9e296a1f97 100644
--- a/go/ql/lib/semmle/go/frameworks/Beego.qll
+++ b/go/ql/lib/semmle/go/frameworks/Beego.qll
@@ -33,13 +33,6 @@ module Beego {
     result = package(v2modulePath(), "server/web/context")
   }
 
-  /** Gets the path for the logs package of beego. */
-  string logsPackagePath() {
-    result = package(v1modulePath(), "logs")
-    or
-    result = package(v2modulePath(), "core/logs")
-  }
-
   /** Gets the path for the utils package of beego. */
   string utilsPackagePath() {
     result = package(v1modulePath(), "utils")
@@ -172,36 +165,6 @@ module Beego {
     override string getAContentType() { none() }
   }
 
-  private string getALogFunctionName() {
-    result =
-      [
-        "Alert", "Critical", "Debug", "Emergency", "Error", "Info", "Informational", "Notice",
-        "Trace", "Warn", "Warning"
-      ]
-  }
-
-  private class ToplevelBeegoLoggers extends LoggerCall::Range, DataFlow::CallNode {
-    ToplevelBeegoLoggers() {
-      this.getTarget().hasQualifiedName([packagePath(), logsPackagePath()], getALogFunctionName())
-    }
-
-    override DataFlow::Node getAMessageComponent() { result = this.getASyntacticArgument() }
-  }
-
-  private class BeegoLoggerMethods extends LoggerCall::Range, DataFlow::MethodCallNode {
-    BeegoLoggerMethods() {
-      this.getTarget().hasQualifiedName(logsPackagePath(), "BeeLogger", getALogFunctionName())
-    }
-
-    override DataFlow::Node getAMessageComponent() { result = this.getASyntacticArgument() }
-  }
-
-  private class UtilLoggers extends LoggerCall::Range, DataFlow::CallNode {
-    UtilLoggers() { this.getTarget().hasQualifiedName(utilsPackagePath(), "Display") }
-
-    override DataFlow::Node getAMessageComponent() { result = this.getASyntacticArgument() }
-  }
-
   private class HtmlQuoteSanitizer extends SharedXss::Sanitizer {
     HtmlQuoteSanitizer() {
       exists(DataFlow::CallNode c | c.getTarget().hasQualifiedName(packagePath(), "Htmlquote") |
diff --git a/go/ql/lib/semmle/go/frameworks/BeegoOrm.qll b/go/ql/lib/semmle/go/frameworks/BeegoOrm.qll
index c1de0cf4244..925b0f19fa3 100644
--- a/go/ql/lib/semmle/go/frameworks/BeegoOrm.qll
+++ b/go/ql/lib/semmle/go/frameworks/BeegoOrm.qll
@@ -14,57 +14,6 @@ module BeegoOrm {
   /** Gets the package name `github.com/astaxie/beego/orm`. */
   string packagePath() { result = package("github.com/astaxie/beego", "orm") }
 
-  private class DbSink extends SQL::QueryString::Range {
-    DbSink() {
-      exists(Method m, string methodName, int argNum |
-        m.hasQualifiedName(packagePath(), "DB", methodName) and
-        (
-          methodName = ["Exec", "Prepare", "Query", "QueryRow"] and
-          argNum = 0
-          or
-          methodName = ["ExecContext", "PrepareContext", "QueryContext", "QueryRowContext"] and
-          argNum = 1
-        )
-      |
-        this = m.getACall().getArgument(argNum)
-      )
-    }
-  }
-
-  private class QueryBuilderSink extends SQL::QueryString::Range {
-    // Note this class doesn't do any escaping, unlike the true ORM part of the package
-    QueryBuilderSink() {
-      exists(Method impl | impl.implements(packagePath(), "QueryBuilder", _) |
-        this = impl.getACall().getASyntacticArgument()
-      ) and
-      this.getType().getUnderlyingType() instanceof StringType
-    }
-  }
-
-  private class OrmerRawSink extends SQL::QueryString::Range {
-    OrmerRawSink() {
-      exists(Method impl | impl.implements(packagePath(), "Ormer", "Raw") |
-        this = impl.getACall().getArgument(0)
-      )
-    }
-  }
-
-  private class QuerySeterFilterRawSink extends SQL::QueryString::Range {
-    QuerySeterFilterRawSink() {
-      exists(Method impl | impl.implements(packagePath(), "QuerySeter", "FilterRaw") |
-        this = impl.getACall().getArgument(1)
-      )
-    }
-  }
-
-  private class ConditionRawSink extends SQL::QueryString::Range {
-    ConditionRawSink() {
-      exists(Method impl | impl.implements(packagePath(), "Condition", "Raw") |
-        this = impl.getACall().getArgument(1)
-      )
-    }
-  }
-
   private class OrmerSource extends StoredXss::Source {
     OrmerSource() {
       exists(Method impl |
diff --git a/go/ql/lib/semmle/go/frameworks/Couchbase.qll b/go/ql/lib/semmle/go/frameworks/Couchbase.qll
index 5eaa4d20c3a..b5bfbcb22a2 100644
--- a/go/ql/lib/semmle/go/frameworks/Couchbase.qll
+++ b/go/ql/lib/semmle/go/frameworks/Couchbase.qll
@@ -5,57 +5,23 @@
 import go
 
 /**
+ * DEPRECATED
+ *
  * Provides models of commonly used functions in the official Couchbase Go SDK library.
  */
-module Couchbase {
+deprecated module Couchbase {
   /**
+   * DEPRECATED
+   *
    * Gets a package path for the official Couchbase Go SDK library.
    *
    * Note that v1 and v2 have different APIs, but the names are disjoint so there is no need to
    * distinguish between them.
    */
-  string packagePath() {
+  deprecated string packagePath() {
     result =
       package([
           "gopkg.in/couchbase/gocb", "github.com/couchbase/gocb", "github.com/couchbaselabs/gocb"
         ], "")
   }
-
-  /**
-   * A query used in an API function acting on a `Bucket` or `Cluster` struct of v1 of
-   * the official Couchbase Go library, gocb.
-   */
-  private class CouchbaseV1Query extends NoSql::Query::Range {
-    CouchbaseV1Query() {
-      // func (b *Bucket) ExecuteAnalyticsQuery(q *AnalyticsQuery, params interface{}) (AnalyticsResults, error)
-      // func (b *Bucket) ExecuteN1qlQuery(q *N1qlQuery, params interface{}) (QueryResults, error)
-      // func (c *Cluster) ExecuteAnalyticsQuery(q *AnalyticsQuery, params interface{}) (AnalyticsResults, error)
-      // func (c *Cluster) ExecuteN1qlQuery(q *N1qlQuery, params interface{}) (QueryResults, error)
-      exists(Method meth, string structName, string methodName |
-        structName in ["Bucket", "Cluster"] and
-        methodName in ["ExecuteN1qlQuery", "ExecuteAnalyticsQuery"] and
-        meth.hasQualifiedName(packagePath(), structName, methodName) and
-        this = meth.getACall().getArgument(0)
-      )
-    }
-  }
-
-  /**
-   * A query used in an API function acting on a `Bucket` or `Cluster` struct of v1 of
-   * the official Couchbase Go library, gocb.
-   */
-  private class CouchbaseV2Query extends NoSql::Query::Range {
-    CouchbaseV2Query() {
-      // func (c *Cluster) AnalyticsQuery(statement string, opts *AnalyticsOptions) (*AnalyticsResult, error)
-      // func (c *Cluster) Query(statement string, opts *QueryOptions) (*QueryResult, error)
-      // func (s *Scope) AnalyticsQuery(statement string, opts *AnalyticsOptions) (*AnalyticsResult, error)
-      // func (s *Scope) Query(statement string, opts *QueryOptions) (*QueryResult, error)
-      exists(Method meth, string structName, string methodName |
-        structName in ["Cluster", "Scope"] and
-        methodName in ["AnalyticsQuery", "Query"] and
-        meth.hasQualifiedName(packagePath(), structName, methodName) and
-        this = meth.getACall().getArgument(0)
-      )
-    }
-  }
 }
diff --git a/go/ql/lib/semmle/go/frameworks/ElazarlGoproxy.qll b/go/ql/lib/semmle/go/frameworks/ElazarlGoproxy.qll
index 4d10c8af312..b1bf4571216 100644
--- a/go/ql/lib/semmle/go/frameworks/ElazarlGoproxy.qll
+++ b/go/ql/lib/semmle/go/frameworks/ElazarlGoproxy.qll
@@ -100,10 +100,4 @@ module ElazarlGoproxy {
 
     override int getFormatStringIndex() { result = 0 }
   }
-
-  private class ProxyLog extends LoggerCall::Range, DataFlow::MethodCallNode {
-    ProxyLog() { this.getTarget() instanceof ProxyLogFunction }
-
-    override DataFlow::Node getAMessageComponent() { result = this.getASyntacticArgument() }
-  }
 }
diff --git a/go/ql/lib/semmle/go/frameworks/Glog.qll b/go/ql/lib/semmle/go/frameworks/Glog.qll
index f9f5c9e3f11..146b8a4f814 100644
--- a/go/ql/lib/semmle/go/frameworks/Glog.qll
+++ b/go/ql/lib/semmle/go/frameworks/Glog.qll
@@ -40,14 +40,4 @@ module Glog {
 
     override int getFormatStringIndex() { result = super.getFirstPrintedArg() }
   }
-
-  private class GlogCall extends LoggerCall::Range, DataFlow::CallNode {
-    GlogFunction callee;
-
-    GlogCall() { this = callee.getACall() }
-
-    override DataFlow::Node getAMessageComponent() {
-      result = this.getSyntacticArgument(any(int i | i >= callee.getFirstPrintedArg()))
-    }
-  }
 }
diff --git a/go/ql/lib/semmle/go/frameworks/Logrus.qll b/go/ql/lib/semmle/go/frameworks/Logrus.qll
index f7de9a75dae..83278a4cd9e 100644
--- a/go/ql/lib/semmle/go/frameworks/Logrus.qll
+++ b/go/ql/lib/semmle/go/frameworks/Logrus.qll
@@ -28,12 +28,6 @@ module Logrus {
     }
   }
 
-  private class LogCall extends LoggerCall::Range, DataFlow::CallNode {
-    LogCall() { this = any(LogFunction f).getACall() }
-
-    override DataFlow::Node getAMessageComponent() { result = this.getASyntacticArgument() }
-  }
-
   private class StringFormatters extends StringOps::Formatting::Range instanceof LogFunction {
     int argOffset;
 
diff --git a/go/ql/lib/semmle/go/frameworks/NoSQL.qll b/go/ql/lib/semmle/go/frameworks/NoSQL.qll
index c2469fc02ac..36932149628 100644
--- a/go/ql/lib/semmle/go/frameworks/NoSQL.qll
+++ b/go/ql/lib/semmle/go/frameworks/NoSQL.qll
@@ -31,84 +31,6 @@ module NoSql {
         )
       }
     }
-
-    /**
-     * Holds if method `name` of struct `Collection` from package
-     * [go.mongodb.org/mongo-driver/mongo](https://pkg.go.dev/go.mongodb.org/mongo-driver/mongo)
-     * interprets parameter `n` as a query.
-     */
-    private predicate mongoDbCollectionMethod(string name, int n) {
-      // func (coll *Collection) CountDocuments(ctx context.Context, filter interface{},
-      //                                        opts ...*options.CountOptions) (int64, error)
-      name = "CountDocuments" and n = 1
-      or
-      // func (coll *Collection) DeleteMany(ctx context.Context, filter interface{},
-      //                                    opts ...*options.DeleteOptions) (*DeleteResult, error)
-      name = "DeleteMany" and n = 1
-      or
-      // func (coll *Collection) DeleteOne(ctx context.Context, filter interface{},
-      //                                   opts ...*options.DeleteOptions) (*DeleteResult, error)
-      name = "DeleteOne" and n = 1
-      or
-      // func (coll *Collection) Distinct(ctx context.Context, fieldName string, filter interface{},
-      //                                  ...) ([]interface{}, error)
-      name = "Distinct" and n = 2
-      or
-      // func (coll *Collection) Find(ctx context.Context, filter interface{},
-      //                              opts ...*options.FindOptions) (*Cursor, error)
-      name = "Find" and n = 1
-      or
-      // func (coll *Collection) FindOne(ctx context.Context, filter interface{},
-      //                                 opts ...*options.FindOneOptions) *SingleResult
-      name = "FindOne" and n = 1
-      or
-      // func (coll *Collection) FindOneAndDelete(ctx context.Context, filter interface{}, ...)
-      //                                         *SingleResult
-      name = "FindOneAndDelete" and n = 1
-      or
-      // func (coll *Collection) FindOneAndReplace(ctx context.Context, filter interface{},
-      //                                           replacement interface{}, ...) *SingleResult
-      name = "FindOneAndReplace" and n = 1
-      or
-      // func (coll *Collection) FindOneAndUpdate(ctx context.Context, filter interface{},
-      //                                          update interface{}, ...) *SingleResult
-      name = "FindOneAndUpdate" and n = 1
-      or
-      // func (coll *Collection) ReplaceOne(ctx context.Context, filter interface{},
-      //                                    replacement interface{}, ...) (*UpdateResult, error)
-      name = "ReplaceOne" and n = 1
-      or
-      // func (coll *Collection) UpdateMany(ctx context.Context, filter interface{},
-      //                                    update interface{}, ...) (*UpdateResult, error)
-      name = "UpdateMany" and n = 1
-      or
-      // func (coll *Collection) UpdateOne(ctx context.Context, filter interface{},
-      //                                   update interface{}, ...) (*UpdateResult, error)
-      name = "UpdateOne" and n = 1
-      or
-      // func (coll *Collection) Watch(ctx context.Context, pipeline interface{}, ...)
-      //                              (*ChangeStream, error)
-      name = "Watch" and n = 1
-      or
-      // func (coll *Collection) Aggregate(ctx context.Context, pipeline interface{},
-      //                                   opts ...*options.AggregateOptions) (*Cursor, error)
-      name = "Aggregate" and n = 1
-    }
-
-    /**
-     * A query used in an API function acting on a `Collection` struct of package
-     * [go.mongodb.org/mongo-driver/mongo](https://pkg.go.dev/go.mongodb.org/mongo-driver/mongo).
-     */
-    private class MongoDbCollectionQuery extends Range {
-      MongoDbCollectionQuery() {
-        exists(Method meth, string methodName, int n |
-          mongoDbCollectionMethod(methodName, n) and
-          meth.hasQualifiedName(package("go.mongodb.org/mongo-driver", "mongo"), "Collection",
-            methodName) and
-          this = meth.getACall().getArgument(n)
-        )
-      }
-    }
   }
 
   /**
diff --git a/go/ql/lib/semmle/go/frameworks/SQL.qll b/go/ql/lib/semmle/go/frameworks/SQL.qll
index 1a6e2280781..a0e80fde1c9 100644
--- a/go/ql/lib/semmle/go/frameworks/SQL.qll
+++ b/go/ql/lib/semmle/go/frameworks/SQL.qll
@@ -67,41 +67,34 @@ module SQL {
      */
     abstract class Range extends DataFlow::Node { }
 
+    private class DefaultQueryString extends Range {
+      DefaultQueryString() {
+        exists(DataFlow::ArgumentNode arg | sinkNode(arg, "sql-injection") |
+          not arg instanceof DataFlow::ImplicitVarargsSlice and
+          this = arg
+          or
+          arg instanceof DataFlow::ImplicitVarargsSlice and
+          this = arg.getCall().getAnImplicitVarargsArgument()
+        )
+      }
+    }
+
     /**
      * An argument to an API of the squirrel library that is directly interpreted as SQL without
      * taking syntactic structure into account.
      */
     private class SquirrelQueryString extends Range {
       SquirrelQueryString() {
-        exists(Function fn |
-          exists(string sq |
-            sq =
-              package([
-                  "github.com/Masterminds/squirrel", "gopkg.in/Masterminds/squirrel",
-                  "github.com/lann/squirrel"
-                ], "")
-          |
-            fn.hasQualifiedName(sq, ["Delete", "Expr", "Insert", "Select", "Update"])
-            or
-            exists(Method m, string builder | m = fn |
-              builder = ["DeleteBuilder", "InsertBuilder", "SelectBuilder", "UpdateBuilder"] and
-              m.hasQualifiedName(sq, builder,
-                ["Columns", "From", "Options", "OrderBy", "Prefix", "Suffix", "Where"])
-              or
-              builder = "InsertBuilder" and
-              m.hasQualifiedName(sq, builder, ["Replace", "Into"])
-              or
-              builder = "SelectBuilder" and
-              m.hasQualifiedName(sq, builder,
-                ["CrossJoin", "GroupBy", "InnerJoin", "LeftJoin", "RightJoin"])
-              or
-              builder = "UpdateBuilder" and
-              m.hasQualifiedName(sq, builder, ["Set", "Table"])
-            )
-          ) and
-          this = fn.getACall().getArgument(0)
+        exists(string sq, Method m, string builder |
+          FlowExtensions::packageGrouping("squirrel", sq) and
+          builder = ["DeleteBuilder", "SelectBuilder", "UpdateBuilder"]
         |
-          this.getType().getUnderlyingType() instanceof StringType or
+          m.hasQualifiedName(sq, builder, "Where") and
+          this = m.getACall().getArgument(0)
+        ) and
+        (
+          this.getType().getUnderlyingType() instanceof StringType
+          or
           this.getType().getUnderlyingType().(SliceType).getElementType() instanceof StringType
         )
       }
@@ -113,14 +106,6 @@ module SQL {
     /** A string that might identify package `go-pg/pg/orm` or a specific version of it. */
     private string gopgorm() { result = package("github.com/go-pg/pg", "orm") }
 
-    /** A string that might identify package `github.com/rqlite/gorqlite` or `github.com/raindog308/gorqlite` or a specific version of it. */
-    private string gorqlite() {
-      result = package(["github.com/rqlite/gorqlite", "github.com/raindog308/gorqlite"], "")
-    }
-
-    /** A string that might identify package `github.com/gogf/gf/database/gdb` or a specific version of it. */
-    private string gogf() { result = package("github.com/gogf/gf", "database/gdb") }
-
     /**
      * A string argument to an API of `go-pg/pg` that is directly interpreted as SQL without
      * taking syntactic structure into account.
@@ -185,94 +170,6 @@ module SQL {
         )
       }
     }
-
-    /**
-     * A string argument to an API of `github.com/rqlite/gorqlite`, or a specific version of it, that is directly interpreted as SQL without
-     * taking syntactic structure into account.
-     */
-    private class GorqliteQueryString extends Range {
-      GorqliteQueryString() {
-        // func (conn *Connection) Query(sqlStatements []string) (results []QueryResult, err error)
-        // func (conn *Connection) QueryOne(sqlStatement string) (qr QueryResult, err error)
-        // func (conn *Connection) Queue(sqlStatements []string) (seq int64, err error)
-        // func (conn *Connection) QueueOne(sqlStatement string) (seq int64, err error)
-        // func (conn *Connection) Write(sqlStatements []string) (results []WriteResult, err error)
-        // func (conn *Connection) WriteOne(sqlStatement string) (wr WriteResult, err error)
-        exists(Method m, string name | m.hasQualifiedName(gorqlite(), "Connection", name) |
-          name = ["Query", "QueryOne", "Queue", "QueueOne", "Write", "WriteOne"] and
-          this = m.getACall().getArgument(0)
-        )
-      }
-    }
-
-    /**
-     * A string argument to an API of `github.com/gogf/gf/database/gdb`, or a specific version of it, that is directly interpreted as SQL without
-     * taking syntactic structure into account.
-     */
-    private class GogfQueryString extends Range {
-      GogfQueryString() {
-        exists(Method m, string name | m.implements(gogf(), ["DB", "Core", "TX"], name) |
-          // func (c *Core) Exec(sql string, args ...interface{}) (result sql.Result, err error)
-          // func (c *Core) GetAll(sql string, args ...interface{}) (Result, error)
-          // func (c *Core) GetArray(sql string, args ...interface{}) ([]Value, error)
-          // func (c *Core) GetCount(sql string, args ...interface{}) (int, error)
-          // func (c *Core) GetOne(sql string, args ...interface{}) (Record, error)
-          // func (c *Core) GetValue(sql string, args ...interface{}) (Value, error)
-          // func (c *Core) Prepare(sql string, execOnMaster ...bool) (*Stmt, error)
-          // func (c *Core) Query(sql string, args ...interface{}) (rows *sql.Rows, err error)
-          // func (c *Core) Raw(rawSql string, args ...interface{}) *Model
-          name =
-            [
-              "Query", "Exec", "Prepare", "GetAll", "GetOne", "GetValue", "GetArray", "GetCount",
-              "Raw"
-            ] and
-          this = m.getACall().getArgument(0)
-          or
-          // func (c *Core) GetScan(pointer interface{}, sql string, args ...interface{}) error
-          // func (c *Core) GetStruct(pointer interface{}, sql string, args ...interface{}) error
-          // func (c *Core) GetStructs(pointer interface{}, sql string, args ...interface{}) error
-          name = ["GetScan", "GetStruct", "GetStructs"] and
-          this = m.getACall().getArgument(1)
-          or
-          // func (c *Core) DoCommit(ctx context.Context, link Link, sql string, args []interface{}) (newSql string, newArgs []interface{}, err error)
-          // func (c *Core) DoExec(ctx context.Context, link Link, sql string, args ...interface{}) (result sql.Result, err error)
-          // func (c *Core) DoGetAll(ctx context.Context, link Link, sql string, args ...interface{}) (result Result, err error)
-          // func (c *Core) DoPrepare(ctx context.Context, link Link, sql string) (*Stmt, error)
-          // func (c *Core) DoQuery(ctx context.Context, link Link, sql string, args ...interface{}) (rows *sql.Rows, err error)
-          name = ["DoGetAll", "DoQuery", "DoExec", "DoCommit", "DoPrepare"] and
-          this = m.getACall().getArgument(2)
-        )
-      }
-    }
-  }
-
-  /** A model for sinks of GORM. */
-  private class GormSink extends SQL::QueryString::Range {
-    GormSink() {
-      exists(Method meth, string package, string name |
-        meth.hasQualifiedName(package, "DB", name) and
-        this = meth.getACall().getSyntacticArgument(0) and
-        package = Gorm::packagePath() and
-        name in [
-            "Where", "Raw", "Order", "Not", "Or", "Select", "Table", "Group", "Having", "Joins",
-            "Exec", "Distinct", "Pluck"
-          ]
-      )
-    }
-  }
-
-  /** A model for sinks of github.com/jmoiron/sqlx. */
-  private class SqlxSink extends SQL::QueryString::Range {
-    SqlxSink() {
-      exists(Method meth, string name, int n |
-        meth.hasQualifiedName(package("github.com/jmoiron/sqlx", ""), ["DB", "Tx"], name) and
-        this = meth.getACall().getArgument(n)
-      |
-        name = ["Select", "Get"] and n = 1
-        or
-        name = ["MustExec", "Queryx", "NamedExec", "NamedQuery"] and n = 0
-      )
-    }
   }
 }
 
@@ -291,71 +188,25 @@ module Gorm {
  */
 module Xorm {
   /** Gets the package name for Xorm. */
-  string packagePath() { result = package(["xorm.io/xorm", "github.com/go-xorm/xorm"], "") }
+  string packagePath() { FlowExtensions::packageGrouping("xorm", result) }
 
   /** A model for sinks of XORM. */
   private class XormSink extends SQL::QueryString::Range {
     XormSink() {
-      exists(Method meth, string type, string name, int n |
+      exists(Method meth, string type, string name |
         meth.hasQualifiedName(Xorm::packagePath(), type, name) and
-        this = meth.getACall().getSyntacticArgument(n) and
-        type = ["Engine", "Session"]
+        type = ["Engine", "Session"] and
+        name = ["Exec", "Query", "QueryInterface", "QueryString"]
       |
-        name =
-          [
-            "Query", "Exec", "QueryString", "QueryInterface", "SQL", "Where", "And", "Or", "Alias",
-            "NotIn", "In", "Select", "SetExpr", "OrderBy", "Having", "GroupBy"
-          ] and
-        n = 0
-        or
-        name = ["SumInt", "Sum", "Sums", "SumsInt"] and n = 1
-        or
-        name = "Join" and n = [0, 1, 2]
+        this = meth.getACall().getSyntacticArgument(0)
       )
     }
   }
 }
 
 /**
+ * DEPRECATED
+ *
  * Provides classes for working with the [Bun](https://bun.uptrace.dev/) package.
  */
-module Bun {
-  /** Gets the package name for Bun package. */
-  private string packagePath() { result = package("github.com/uptrace/bun", "") }
-
-  /** A model for sinks of Bun. */
-  private class BunSink extends SQL::QueryString::Range {
-    BunSink() {
-      exists(Function f, string m, int arg | this = f.getACall().getArgument(arg) |
-        f.hasQualifiedName(packagePath(), m) and
-        m = "NewRawQuery" and
-        arg = 1
-      )
-      or
-      exists(Method f, string tp, string m, int arg | this = f.getACall().getArgument(arg) |
-        f.hasQualifiedName(packagePath(), tp, m) and
-        (
-          tp = ["DB", "Conn"] and
-          m = ["ExecContext", "PrepareContext", "QueryContext", "QueryRowContext"] and
-          arg = 1
-          or
-          tp = ["DB", "Conn"] and
-          m = ["Exec", "NewRaw", "Prepare", "Query", "QueryRow", "Raw"] and
-          arg = 0
-          or
-          tp.matches("%Query") and
-          m =
-            [
-              "ColumnExpr", "DistinctOn", "For", "GroupExpr", "Having", "ModelTableExpr",
-              "OrderExpr", "TableExpr", "Where", "WhereOr"
-            ] and
-          arg = 0
-          or
-          tp = "RawQuery" and
-          m = "NewRaw" and
-          arg = 0
-        )
-      )
-    }
-  }
-}
+deprecated module Bun { }
diff --git a/go/ql/lib/semmle/go/frameworks/Spew.qll b/go/ql/lib/semmle/go/frameworks/Spew.qll
index b12bd0fed81..f49a4aa4d89 100644
--- a/go/ql/lib/semmle/go/frameworks/Spew.qll
+++ b/go/ql/lib/semmle/go/frameworks/Spew.qll
@@ -33,16 +33,6 @@ module Spew {
     override int getFormatStringIndex() { result = super.getFirstPrintedArg() }
   }
 
-  private class SpewCall extends LoggerCall::Range, DataFlow::CallNode {
-    SpewFunction target;
-
-    SpewCall() { this = target.getACall() }
-
-    override DataFlow::Node getAMessageComponent() {
-      result = this.getSyntacticArgument(any(int i | i >= target.getFirstPrintedArg()))
-    }
-  }
-
   // These are expressed using TaintTracking::FunctionModel because varargs functions don't work with Models-as-Data sumamries yet.
   /** The `Sprint` function or one of its variants. */
   class Sprinter extends TaintTracking::FunctionModel {
diff --git a/go/ql/lib/semmle/go/frameworks/Zap.qll b/go/ql/lib/semmle/go/frameworks/Zap.qll
index 359f9aba410..0928d2b0595 100644
--- a/go/ql/lib/semmle/go/frameworks/Zap.qll
+++ b/go/ql/lib/semmle/go/frameworks/Zap.qll
@@ -34,18 +34,6 @@ module Zap {
     override int getFormatStringIndex() { result = 0 }
   }
 
-  /**
-   * A call to a logger function in Zap.
-   *
-   * Functions which add data to be included the next time a direct logging
-   * function is called are included.
-   */
-  private class ZapCall extends LoggerCall::Range, DataFlow::MethodCallNode {
-    ZapCall() { this = any(ZapFunction f).getACall() }
-
-    override DataFlow::Node getAMessageComponent() { result = this.getASyntacticArgument() }
-  }
-
   // These are expressed using TaintTracking::FunctionModel because varargs functions don't work with Models-as-Data sumamries yet.
   /** The function `Fields` that creates an `Option` that can be added to the logger out of `Field`s. */
   class FieldsFunction extends TaintTracking::FunctionModel {
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/DatabaseSql.qll b/go/ql/lib/semmle/go/frameworks/stdlib/DatabaseSql.qll
index 845225af5bd..f4132688796 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/DatabaseSql.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/DatabaseSql.qll
@@ -26,7 +26,7 @@ module DatabaseSql {
     override DataFlow::Node getAResult() { result = this.getResult(0) }
 
     override SQL::QueryString getAQueryString() {
-      result = this.getAnArgument()
+      result = this.getASyntacticArgument()
       or
       // attempt to resolve a `QueryString` for `Stmt`s using local data flow.
       t = "Stmt" and
@@ -34,24 +34,6 @@ module DatabaseSql {
     }
   }
 
-  /** A query string used in an API function of the `database/sql` package. */
-  private class QueryString extends SQL::QueryString::Range {
-    QueryString() {
-      exists(Method meth, string base, string t, string m, int n |
-        t = ["DB", "Tx", "Conn"] and
-        meth.hasQualifiedName("database/sql", t, m) and
-        this = meth.getACall().getArgument(n)
-      |
-        base = ["Exec", "Prepare", "Query", "QueryRow"] and
-        (
-          m = base and n = 0
-          or
-          m = base + "Context" and n = 1
-        )
-      )
-    }
-  }
-
   /** A query in the standard `database/sql/driver` package. */
   private class DriverQuery extends SQL::Query::Range, DataFlow::MethodCallNode {
     DriverQuery() {
@@ -78,36 +60,13 @@ module DatabaseSql {
     override DataFlow::Node getAResult() { result = this.getResult(0) }
 
     override SQL::QueryString getAQueryString() {
-      result = this.getAnArgument()
+      result = this.getASyntacticArgument()
       or
       this.getTarget().hasQualifiedName("database/sql/driver", "Stmt") and
       result = this.getReceiver().getAPredecessor*().(DataFlow::MethodCallNode).getAnArgument()
     }
   }
 
-  /** A query string used in an API function of the standard `database/sql/driver` package. */
-  private class DriverQueryString extends SQL::QueryString::Range {
-    DriverQueryString() {
-      exists(Method meth, int n |
-        (
-          meth.hasQualifiedName("database/sql/driver", "Execer", "Exec") and n = 0
-          or
-          meth.hasQualifiedName("database/sql/driver", "ExecerContext", "ExecContext") and n = 1
-          or
-          meth.hasQualifiedName("database/sql/driver", "Conn", "Prepare") and n = 0
-          or
-          meth.hasQualifiedName("database/sql/driver", "ConnPrepareContext", "PrepareContext") and
-          n = 1
-          or
-          meth.hasQualifiedName("database/sql/driver", "Queryer", "Query") and n = 0
-          or
-          meth.hasQualifiedName("database/sql/driver", "QueryerContext", "QueryContext") and n = 1
-        ) and
-        this = meth.getACall().getArgument(n)
-      )
-    }
-  }
-
   // These are expressed using TaintTracking::FunctionModel because varargs functions don't work with Models-as-Data sumamries yet.
   private class SqlMethodModels extends TaintTracking::FunctionModel, Method {
     FunctionInput inp;
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/Fmt.qll b/go/ql/lib/semmle/go/frameworks/stdlib/Fmt.qll
index 54794ea21c9..6adbd542e9b 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/Fmt.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/Fmt.qll
@@ -41,13 +41,6 @@ module Fmt {
     Printer() { this.hasQualifiedName("fmt", ["Print", "Printf", "Println"]) }
   }
 
-  /** A call to `Print` or similar. */
-  private class PrintCall extends LoggerCall::Range, DataFlow::CallNode {
-    PrintCall() { this.getTarget() instanceof Printer }
-
-    override DataFlow::Node getAMessageComponent() { result = this.getASyntacticArgument() }
-  }
-
   /** The `Fprint` function or one of its variants. */
   private class Fprinter extends TaintTracking::FunctionModel {
     Fprinter() {
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/Log.qll b/go/ql/lib/semmle/go/frameworks/stdlib/Log.qll
index 5b402fca1b7..ca74160bf0d 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/Log.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/Log.qll
@@ -32,16 +32,6 @@ module Log {
     override int getFormatStringIndex() { result = 0 }
   }
 
-  private class LogCall extends LoggerCall::Range, DataFlow::CallNode {
-    LogFunction target;
-
-    LogCall() { this = target.getACall() }
-
-    override DataFlow::Node getAMessageComponent() {
-      result = this.getSyntacticArgument(any(int i | i >= target.getFirstPrintedArg()))
-    }
-  }
-
   /** A fatal log function, which calls `os.Exit`. */
   private class FatalLogFunction extends Function {
     FatalLogFunction() { this.hasQualifiedName("log", ["Fatal", "Fatalf", "Fatalln"]) }
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/Os.qll b/go/ql/lib/semmle/go/frameworks/stdlib/Os.qll
index fb153451c59..72ea4cc6c57 100644
--- a/go/ql/lib/semmle/go/frameworks/stdlib/Os.qll
+++ b/go/ql/lib/semmle/go/frameworks/stdlib/Os.qll
@@ -43,12 +43,4 @@ module Os {
       input = inp and output = outp
     }
   }
-
-  private class Stdin extends SourceNode {
-    Stdin() {
-      exists(Variable osStdin | osStdin.hasQualifiedName("os", "Stdin") | this = osStdin.getARead())
-    }
-
-    override string getThreatModel() { result = "stdin" }
-  }
 }
diff --git a/go/ql/lib/semmle/go/security/CleartextLogging.qll b/go/ql/lib/semmle/go/security/CleartextLogging.qll
index 7c29f0ba130..2e0c9665c4b 100644
--- a/go/ql/lib/semmle/go/security/CleartextLogging.qll
+++ b/go/ql/lib/semmle/go/security/CleartextLogging.qll
@@ -16,49 +16,6 @@ import go
 module CleartextLogging {
   import CleartextLoggingCustomizations::CleartextLogging
 
-  /**
-   * DEPRECATED: Use `Flow` instead.
-   *
-   * A data-flow tracking configuration for clear-text logging of sensitive information.
-   *
-   * This configuration identifies flows from `Source`s, which are sources of
-   * sensitive data, to `Sink`s, which is an abstract class representing all
-   * the places sensitive data may be stored in cleartext. Additional sources or sinks can be
-   * added either by extending the relevant class, or by subclassing this configuration itself,
-   * and amending the sources and sinks.
-   */
-  deprecated class Configuration extends DataFlow::Configuration {
-    Configuration() { this = "CleartextLogging" }
-
-    override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-    override predicate isBarrier(DataFlow::Node node) {
-      node instanceof Barrier
-      or
-      exists(DataFlow::CallNode call | node = call.getResult() |
-        call.getTarget() = Builtin::error().getType().getMethod("Error")
-        or
-        call.getTarget().(Method).hasQualifiedName("fmt", "Stringer", "String")
-      )
-    }
-
-    override predicate isAdditionalFlowStep(DataFlow::Node src, DataFlow::Node trg) {
-      // A taint propagating data-flow edge through structs: a tainted write taints the entire struct.
-      exists(Write write |
-        write.writesField(trg.(DataFlow::PostUpdateNode).getPreUpdateNode(), _, src)
-      )
-      or
-      // taint steps that do not include flow through fields. Field reads would produce FPs due to
-      // the additional taint step above that taints whole structs from individual field writes.
-      TaintTracking::localTaintStep(src, trg) and
-      not TaintTracking::fieldReadStep(src, trg) and
-      // Also exclude protobuf field fetches, since they amount to single field reads.
-      not any(Protobuf::GetMethod gm).taintStep(src, trg)
-    }
-  }
-
   private module Config implements DataFlow::ConfigSig {
     predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/go/ql/lib/semmle/go/security/IncorrectIntegerConversionLib.qll b/go/ql/lib/semmle/go/security/IncorrectIntegerConversionLib.qll
index 68d874768ce..3c6cddc427f 100644
--- a/go/ql/lib/semmle/go/security/IncorrectIntegerConversionLib.qll
+++ b/go/ql/lib/semmle/go/security/IncorrectIntegerConversionLib.qll
@@ -53,132 +53,6 @@ int getIntTypeBitSize(File file, int architectureSpecificBitSize) {
   result = architectureSpecificBitSize
 }
 
-/**
- * Holds if converting from an integer types with size `sourceBitSize` to
- * one with size `sinkBitSize` can produce unexpected values, where 0 means
- * architecture-dependent.
- *
- * Architecture-dependent bit sizes can be 32 or 64. To catch flows that
- * only manifest on 64-bit architectures we consider an
- * architecture-dependent source bit size to be 64. To catch flows that
- * only happen on 32-bit architectures we consider an
- * architecture-dependent sink bit size to be 32. We exclude the case where
- * both source and sink have architecture-dependent bit sizes.
- */
-private predicate isIncorrectIntegerConversion(int sourceBitSize, int sinkBitSize) {
-  sourceBitSize in [16, 32, 64] and
-  sinkBitSize in [8, 16, 32] and
-  sourceBitSize > sinkBitSize
-  or
-  // Treat `sourceBitSize = 0` like `sourceBitSize = 64`, and exclude `sinkBitSize = 0`
-  sourceBitSize = 0 and
-  sinkBitSize in [8, 16, 32]
-  or
-  // Treat `sinkBitSize = 0` like `sinkBitSize = 32`, and exclude `sourceBitSize = 0`
-  sourceBitSize = 64 and
-  sinkBitSize = 0
-}
-
-/**
- * DEPRECATED: use `Flow` instead.
- *
- * A taint-tracking configuration for reasoning about when an integer
- * obtained from parsing a string flows to a type conversion to a smaller
- * integer types, which could cause unexpected values.
- */
-deprecated class ConversionWithoutBoundsCheckConfig extends TaintTracking::Configuration {
-  boolean sinkIsSigned;
-  int sourceBitSize;
-  int sinkBitSize;
-
-  ConversionWithoutBoundsCheckConfig() {
-    sinkIsSigned in [true, false] and
-    isIncorrectIntegerConversion(sourceBitSize, sinkBitSize) and
-    this = "ConversionWithoutBoundsCheckConfig" + sourceBitSize + sinkIsSigned + sinkBitSize
-  }
-
-  /** Gets the bit size of the source. */
-  int getSourceBitSize() { result = sourceBitSize }
-
-  override predicate isSource(DataFlow::Node source) {
-    exists(
-      DataFlow::CallNode c, IntegerParser::Range ip, int apparentBitSize, int effectiveBitSize
-    |
-      c.getTarget() = ip and source = c.getResult(0)
-    |
-      (
-        apparentBitSize = ip.getTargetBitSize()
-        or
-        // If we are reading a variable, check if it is
-        // `strconv.IntSize`, and use 0 if it is.
-        exists(DataFlow::Node rawBitSize | rawBitSize = ip.getTargetBitSizeInput().getNode(c) |
-          if rawBitSize = any(Strconv::IntSize intSize).getARead()
-          then apparentBitSize = 0
-          else apparentBitSize = rawBitSize.getIntValue()
-        )
-      ) and
-      (
-        if apparentBitSize = 0
-        then effectiveBitSize = getIntTypeBitSize(source.getFile(), 0)
-        else effectiveBitSize = apparentBitSize
-      ) and
-      // `effectiveBitSize` could be any value between 0 and 64, but we
-      // can round it up to the nearest size of an integer type without
-      // changing behavior.
-      sourceBitSize = min(int b | b in [0, 8, 16, 32, 64] and b >= effectiveBitSize)
-    )
-  }
-
-  /**
-   * Holds if `sink` is a typecast to an integer type with size `bitSize` (where
-   * 0 represents architecture-dependent) and the expression being typecast is
-   * not also in a right-shift expression. We allow this case because it is
-   * a common pattern to serialise `byte(v)`, `byte(v >> 8)`, and so on.
-   */
-  predicate isSinkWithBitSize(DataFlow::TypeCastNode sink, int bitSize) {
-    sink.asExpr() instanceof ConversionExpr and
-    exists(IntegerType integerType | sink.getResultType().getUnderlyingType() = integerType |
-      (
-        bitSize = integerType.getSize()
-        or
-        not exists(integerType.getSize()) and
-        bitSize = getIntTypeBitSize(sink.getFile(), 0)
-      ) and
-      if integerType instanceof SignedIntegerType then sinkIsSigned = true else sinkIsSigned = false
-    ) and
-    not exists(ShrExpr shrExpr |
-      shrExpr.getLeftOperand().getGlobalValueNumber() =
-        sink.getOperand().asExpr().getGlobalValueNumber() or
-      shrExpr.getLeftOperand().(AndExpr).getAnOperand().getGlobalValueNumber() =
-        sink.getOperand().asExpr().getGlobalValueNumber()
-    )
-  }
-
-  override predicate isSink(DataFlow::Node sink) {
-    // We use the argument of the type conversion as the configuration sink so that we
-    // can sanitize the result of the conversion to prevent flow on to further sinks
-    // without needing to use `isSanitizerOut`, which doesn't work with flow states
-    // (and therefore the legacy `TaintTracking::Configuration` class).
-    this.isSinkWithBitSize(sink.getASuccessor(), sinkBitSize)
-  }
-
-  override predicate isSanitizer(DataFlow::Node node) {
-    // To catch flows that only happen on 32-bit architectures we
-    // consider an architecture-dependent sink bit size to be 32.
-    exists(UpperBoundCheckGuard g, int bitSize |
-      if sinkBitSize != 0 then bitSize = sinkBitSize else bitSize = 32
-    |
-      node = DataFlow::BarrierGuard<upperBoundCheckGuard/3>::getABarrierNodeForGuard(g) and
-      if sinkIsSigned = true then g.isBoundFor(bitSize, 32) else g.isBoundFor(bitSize - 1, 32)
-    )
-    or
-    exists(int bitSize |
-      isIncorrectIntegerConversion(sourceBitSize, bitSize) and
-      this.isSinkWithBitSize(node, bitSize)
-    )
-  }
-}
-
 private int validBitSize() { result = [7, 8, 15, 16, 31, 32, 63, 64] }
 
 private newtype TArchitectureBitSize =
diff --git a/go/ql/lib/semmle/go/security/InsecureRandomness.qll b/go/ql/lib/semmle/go/security/InsecureRandomness.qll
index 675f0b4b9a2..83746f7b96e 100644
--- a/go/ql/lib/semmle/go/security/InsecureRandomness.qll
+++ b/go/ql/lib/semmle/go/security/InsecureRandomness.qll
@@ -16,25 +16,6 @@ import go
 module InsecureRandomness {
   import InsecureRandomnessCustomizations::InsecureRandomness
 
-  /**
-   * DEPRECATED: Use `Flow` instead.
-   *
-   * A taint-tracking configuration for reasoning about random values that are
-   * not cryptographically secure.
-   */
-  deprecated class Configuration extends TaintTracking::Configuration {
-    Configuration() { this = "InsecureRandomness" }
-
-    override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-    override predicate isSink(DataFlow::Node sink) { this.isSinkWithKind(sink, _) }
-
-    /** Holds if `sink` is a sink for this configuration with kind `kind`. */
-    predicate isSinkWithKind(Sink sink, string kind) { kind = sink.getKind() }
-
-    override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-  }
-
   /** Holds if `sink` is a sink for this configuration with kind `kind`. */
   predicate isSinkWithKind(Sink sink, string kind) { kind = sink.getKind() }
 
diff --git a/go/ql/lib/semmle/go/security/OpenUrlRedirect.qll b/go/ql/lib/semmle/go/security/OpenUrlRedirect.qll
index d3576f005b9..bfe47f260cd 100644
--- a/go/ql/lib/semmle/go/security/OpenUrlRedirect.qll
+++ b/go/ql/lib/semmle/go/security/OpenUrlRedirect.qll
@@ -17,51 +17,6 @@ import UrlConcatenation
 module OpenUrlRedirect {
   import OpenUrlRedirectCustomizations::OpenUrlRedirect
 
-  /**
-   * DEPRECATED: Use `Flow` instead.
-   *
-   * A data-flow configuration for reasoning about unvalidated URL redirections.
-   */
-  deprecated class Configuration extends DataFlow::Configuration {
-    Configuration() { this = "OpenUrlRedirect" }
-
-    override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-    override predicate isBarrier(DataFlow::Node node) { node instanceof Barrier }
-
-    override predicate isAdditionalFlowStep(DataFlow::Node pred, DataFlow::Node succ) {
-      // taint steps that do not include flow through fields
-      TaintTracking::localTaintStep(pred, succ) and not TaintTracking::fieldReadStep(pred, succ)
-      or
-      // explicit extra taint steps for this query
-      any(AdditionalStep s).hasTaintStep(pred, succ)
-      or
-      // propagate to a URL when its host is assigned to
-      exists(Write w, Field f, SsaWithFields v | f.hasQualifiedName("net/url", "URL", "Host") |
-        w.writesField(v.getAUse(), f, pred) and succ = v.getAUse()
-      )
-      or
-      // propagate out of most URL fields, but not `ForceQuery` and `Scheme`
-      exists(Field f, string fn |
-        f.hasQualifiedName("net/url", "URL", fn) and
-        not fn in ["ForceQuery", "Scheme"]
-      |
-        succ.(Read).readsField(pred, f)
-      )
-    }
-
-    override predicate isBarrierOut(DataFlow::Node node) {
-      // block propagation of this unsafe value when its host is overwritten
-      exists(Write w, Field f | f.hasQualifiedName("net/url", "URL", "Host") |
-        w.writesField(node.getASuccessor(), f, _)
-      )
-      or
-      hostnameSanitizingPrefixEdge(node, _)
-    }
-  }
-
   private module Config implements DataFlow::ConfigSig {
     predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/go/ql/lib/semmle/go/security/ReflectedXss.qll b/go/ql/lib/semmle/go/security/ReflectedXss.qll
index a605d78633d..1068c6fae3d 100644
--- a/go/ql/lib/semmle/go/security/ReflectedXss.qll
+++ b/go/ql/lib/semmle/go/security/ReflectedXss.qll
@@ -16,24 +16,6 @@ import go
 module ReflectedXss {
   import ReflectedXssCustomizations::ReflectedXss
 
-  /**
-   * DEPRECATED: Use `Flow` instead.
-   *
-   * A taint-tracking configuration for reasoning about XSS.
-   */
-  deprecated class Configuration extends TaintTracking::Configuration {
-    Configuration() { this = "ReflectedXss" }
-
-    override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-    override predicate isSanitizer(DataFlow::Node node) {
-      super.isSanitizer(node) or
-      node instanceof Sanitizer
-    }
-  }
-
   private module Config implements DataFlow::ConfigSig {
     predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/go/ql/lib/semmle/go/security/RequestForgery.qll b/go/ql/lib/semmle/go/security/RequestForgery.qll
index 5f7139a1b44..bdf26a1f18f 100644
--- a/go/ql/lib/semmle/go/security/RequestForgery.qll
+++ b/go/ql/lib/semmle/go/security/RequestForgery.qll
@@ -16,36 +16,6 @@ import go
 module RequestForgery {
   import RequestForgeryCustomizations::RequestForgery
 
-  /**
-   * DEPRECATED: Use `Flow` instead.
-   *
-   * A taint-tracking configuration for reasoning about request forgery.
-   */
-  deprecated class Configuration extends TaintTracking::Configuration {
-    Configuration() { this = "RequestForgery" }
-
-    override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-    override predicate isAdditionalTaintStep(DataFlow::Node pred, DataFlow::Node succ) {
-      // propagate to a URL when its host is assigned to
-      exists(Write w, Field f, SsaWithFields v | f.hasQualifiedName("net/url", "URL", "Host") |
-        w.writesField(v.getAUse(), f, pred) and succ = v.getAUse()
-      )
-    }
-
-    override predicate isSanitizer(DataFlow::Node node) {
-      super.isSanitizer(node) or
-      node instanceof Sanitizer
-    }
-
-    override predicate isSanitizerOut(DataFlow::Node node) {
-      super.isSanitizerOut(node) or
-      node instanceof SanitizerEdge
-    }
-  }
-
   private module Config implements DataFlow::ConfigSig {
     predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/go/ql/lib/semmle/go/security/SafeUrlFlow.qll b/go/ql/lib/semmle/go/security/SafeUrlFlow.qll
index f4d1a535bad..d74e2156a60 100644
--- a/go/ql/lib/semmle/go/security/SafeUrlFlow.qll
+++ b/go/ql/lib/semmle/go/security/SafeUrlFlow.qll
@@ -16,35 +16,6 @@ import go
 module SafeUrlFlow {
   import SafeUrlFlowCustomizations::SafeUrlFlow
 
-  /**
-   * DEPRECATED: Use `Flow` instead.
-   *
-   * A taint-tracking configuration for reasoning about safe URLs.
-   */
-  deprecated class Configuration extends TaintTracking::Configuration {
-    Configuration() { this = "SafeUrlFlow" }
-
-    override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-    override predicate isAdditionalTaintStep(DataFlow::Node pred, DataFlow::Node succ) {
-      // propagate to a URL when its host is assigned to
-      exists(Write w, Field f, SsaWithFields v | f.hasQualifiedName("net/url", "URL", "Host") |
-        w.writesField(v.getAUse(), f, pred) and succ = v.getAUse()
-      )
-    }
-
-    override predicate isSanitizerOut(DataFlow::Node node) {
-      // block propagation of this safe value when its host is overwritten
-      exists(Write w, Field f | f.hasQualifiedName("net/url", "URL", "Host") |
-        w.writesField(node.getASuccessor(), f, _)
-      )
-      or
-      node instanceof SanitizerEdge
-    }
-  }
-
   private module Config implements DataFlow::ConfigSig {
     predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/go/ql/lib/semmle/go/security/SqlInjection.qll b/go/ql/lib/semmle/go/security/SqlInjection.qll
index 366a05cf3df..e24b30f40d3 100644
--- a/go/ql/lib/semmle/go/security/SqlInjection.qll
+++ b/go/ql/lib/semmle/go/security/SqlInjection.qll
@@ -13,28 +13,6 @@ import go
 module SqlInjection {
   import SqlInjectionCustomizations::SqlInjection
 
-  /**
-   * DEPRECATED: Use `Flow` instead.
-   *
-   * A taint-tracking configuration for reasoning about SQL-injection vulnerabilities.
-   */
-  deprecated class Configuration extends TaintTracking::Configuration {
-    Configuration() { this = "SqlInjection" }
-
-    override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-    override predicate isAdditionalTaintStep(DataFlow::Node pred, DataFlow::Node succ) {
-      NoSql::isAdditionalMongoTaintStep(pred, succ)
-    }
-
-    override predicate isSanitizer(DataFlow::Node node) {
-      super.isSanitizer(node) or
-      node instanceof Sanitizer
-    }
-  }
-
   private module Config implements DataFlow::ConfigSig {
     predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/go/ql/lib/semmle/go/security/StoredCommand.qll b/go/ql/lib/semmle/go/security/StoredCommand.qll
index 4c21a292371..38555370cfc 100644
--- a/go/ql/lib/semmle/go/security/StoredCommand.qll
+++ b/go/ql/lib/semmle/go/security/StoredCommand.qll
@@ -16,28 +16,6 @@ import CommandInjectionCustomizations
  * injection vulnerabilities.
  */
 module StoredCommand {
-  /**
-   * DEPRECATED: Use `Flow` instead.
-   *
-   * A taint-tracking configuration for reasoning about command-injection vulnerabilities.
-   */
-  deprecated class Configuration extends TaintTracking::Configuration {
-    Configuration() { this = "StoredCommand" }
-
-    override predicate isSource(DataFlow::Node source) {
-      source instanceof StoredXss::Source and
-      // exclude file names, since those are not generally an issue
-      not source instanceof StoredXss::FileNameSource
-    }
-
-    override predicate isSink(DataFlow::Node sink) { sink instanceof CommandInjection::Sink }
-
-    override predicate isSanitizer(DataFlow::Node node) {
-      super.isSanitizer(node) or
-      node instanceof CommandInjection::Sanitizer
-    }
-  }
-
   private module Config implements DataFlow::ConfigSig {
     predicate isSource(DataFlow::Node source) {
       source instanceof StoredXss::Source and
diff --git a/go/ql/lib/semmle/go/security/StoredXss.qll b/go/ql/lib/semmle/go/security/StoredXss.qll
index 37e4b048910..2bf6bf24804 100644
--- a/go/ql/lib/semmle/go/security/StoredXss.qll
+++ b/go/ql/lib/semmle/go/security/StoredXss.qll
@@ -16,24 +16,6 @@ import go
 module StoredXss {
   import StoredXssCustomizations::StoredXss
 
-  /**
-   * DEPRECATED: Use `Flow` instead.
-   *
-   * A taint-tracking configuration for reasoning about XSS.
-   */
-  deprecated class Configuration extends TaintTracking::Configuration {
-    Configuration() { this = "StoredXss" }
-
-    override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-    override predicate isSanitizer(DataFlow::Node node) {
-      super.isSanitizer(node) or
-      node instanceof Sanitizer
-    }
-  }
-
   private module Config implements DataFlow::ConfigSig {
     predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/go/ql/lib/semmle/go/security/StringBreak.qll b/go/ql/lib/semmle/go/security/StringBreak.qll
index fed3b9b1443..02b4c5b3313 100644
--- a/go/ql/lib/semmle/go/security/StringBreak.qll
+++ b/go/ql/lib/semmle/go/security/StringBreak.qll
@@ -13,27 +13,6 @@ import go
 module StringBreak {
   import StringBreakCustomizations::StringBreak
 
-  /**
-   * DEPRECATED: Use `Flow` instead.
-   *
-   * A taint-tracking configuration for reasoning about unsafe-quoting vulnerabilities,
-   * parameterized with the type of quote being tracked.
-   */
-  deprecated class Configuration extends TaintTracking::Configuration {
-    Quote quote;
-
-    Configuration() { this = "StringBreak" + quote }
-
-    /** Gets the type of quote being tracked by this configuration. */
-    Quote getQuote() { result = quote }
-
-    override predicate isSource(DataFlow::Node nd) { nd instanceof Source }
-
-    override predicate isSink(DataFlow::Node nd) { quote = nd.(Sink).getQuote() }
-
-    override predicate isSanitizer(DataFlow::Node nd) { quote = nd.(Sanitizer).getQuote() }
-  }
-
   private module Config implements DataFlow::StateConfigSig {
     /** The flow state that we track is the type of quote used. */
     class FlowState = Quote;
diff --git a/go/ql/lib/semmle/go/security/TaintedPath.qll b/go/ql/lib/semmle/go/security/TaintedPath.qll
index 26009554c24..674cda1157c 100644
--- a/go/ql/lib/semmle/go/security/TaintedPath.qll
+++ b/go/ql/lib/semmle/go/security/TaintedPath.qll
@@ -11,24 +11,6 @@ import go
 module TaintedPath {
   import TaintedPathCustomizations::TaintedPath
 
-  /**
-   * DEPRECATED: Use `Flow` instead.
-   *
-   * A taint-tracking configuration for reasoning about path-traversal vulnerabilities.
-   */
-  deprecated class Configuration extends TaintTracking::Configuration {
-    Configuration() { this = "TaintedPath" }
-
-    override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-    override predicate isSanitizer(DataFlow::Node node) {
-      super.isSanitizer(node) or
-      node instanceof Sanitizer
-    }
-  }
-
   private module Config implements DataFlow::ConfigSig {
     predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/go/ql/lib/semmle/go/security/UnsafeUnzipSymlink.qll b/go/ql/lib/semmle/go/security/UnsafeUnzipSymlink.qll
index 2b969ffc4d9..1d18ac5f639 100644
--- a/go/ql/lib/semmle/go/security/UnsafeUnzipSymlink.qll
+++ b/go/ql/lib/semmle/go/security/UnsafeUnzipSymlink.qll
@@ -13,24 +13,6 @@ import go
 module UnsafeUnzipSymlink {
   import UnsafeUnzipSymlinkCustomizations::UnsafeUnzipSymlink
 
-  /**
-   * DEPRECATED: Use copies of `EvalSymlinksConfig` and `EvalSymlinksFlow` instead.
-   *
-   * A taint-flow configuration tracking archive header fields flowing to a `path/filepath.EvalSymlinks` call.
-   */
-  deprecated class EvalSymlinksConfiguration extends TaintTracking2::Configuration {
-    EvalSymlinksConfiguration() { this = "Archive header field symlinks resolved" }
-
-    override predicate isSource(DataFlow::Node source) { source instanceof FilenameWithSymlinks }
-
-    override predicate isSink(DataFlow::Node sink) { sink instanceof EvalSymlinksSink }
-
-    override predicate isSanitizer(DataFlow::Node node) {
-      super.isSanitizer(node) or
-      node instanceof EvalSymlinksInvalidator
-    }
-  }
-
   // Archive header field symlinks resolved
   private module EvalSymlinksConfig implements DataFlow::ConfigSig {
     predicate isSource(DataFlow::Node source) { source instanceof FilenameWithSymlinks }
@@ -53,28 +35,6 @@ module UnsafeUnzipSymlink {
     EvalSymlinksFlow::flow(getASimilarReadNode(node), _)
   }
 
-  /**
-   * DEPRECATED: Use `Flow` instead.
-   *
-   * A taint-flow configuration tracking archive header fields flowing to an `os.Symlink` call,
-   * which never flow to a `path/filepath.EvalSymlinks` call.
-   */
-  deprecated class SymlinkConfiguration extends TaintTracking::Configuration {
-    SymlinkConfiguration() { this = "Unsafe unzipping of symlinks" }
-
-    override predicate isSource(DataFlow::Node source) {
-      source instanceof FilenameWithSymlinks and
-      not symlinksEvald(source)
-    }
-
-    override predicate isSink(DataFlow::Node sink) { sink instanceof SymlinkSink }
-
-    override predicate isSanitizer(DataFlow::Node node) {
-      super.isSanitizer(node) or
-      node instanceof SymlinkSanitizer
-    }
-  }
-
   private module Config implements DataFlow::ConfigSig {
     predicate isSource(DataFlow::Node source) {
       source instanceof FilenameWithSymlinks and
diff --git a/go/ql/lib/semmle/go/security/XPathInjection.qll b/go/ql/lib/semmle/go/security/XPathInjection.qll
index 2e374dfbf24..61bd00977da 100644
--- a/go/ql/lib/semmle/go/security/XPathInjection.qll
+++ b/go/ql/lib/semmle/go/security/XPathInjection.qll
@@ -13,24 +13,6 @@ import go
 module XPathInjection {
   import XPathInjectionCustomizations::XPathInjection
 
-  /**
-   * DEPRECATED: Use `Flow` instead.
-   *
-   * A taint-tracking configuration for reasoning about untrusted user input used in an XPath expression.
-   */
-  deprecated class Configuration extends TaintTracking::Configuration {
-    Configuration() { this = "XPathInjection" }
-
-    override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-    override predicate isSanitizer(DataFlow::Node node) {
-      super.isSanitizer(node) or
-      node instanceof Sanitizer
-    }
-  }
-
   private module Config implements DataFlow::ConfigSig {
     predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/go/ql/lib/semmle/go/security/ZipSlip.qll b/go/ql/lib/semmle/go/security/ZipSlip.qll
index 4a7ba231f0f..f16daf84c3d 100644
--- a/go/ql/lib/semmle/go/security/ZipSlip.qll
+++ b/go/ql/lib/semmle/go/security/ZipSlip.qll
@@ -11,24 +11,6 @@ import go
 module ZipSlip {
   import ZipSlipCustomizations::ZipSlip
 
-  /**
-   * DEPRECATED: Use `Flow` instead.
-   *
-   * A taint-tracking configuration for reasoning about zip-slip vulnerabilities.
-   */
-  deprecated class Configuration extends TaintTracking::Configuration {
-    Configuration() { this = "ZipSlip" }
-
-    override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-    override predicate isSanitizer(DataFlow::Node node) {
-      super.isSanitizer(node) or
-      node instanceof Sanitizer
-    }
-  }
-
   private module Config implements DataFlow::ConfigSig {
     predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/go/ql/src/Security/CWE-640/EmailInjection.qll b/go/ql/src/Security/CWE-640/EmailInjection.qll
index 479fe6dc055..35b7795ad55 100644
--- a/go/ql/src/Security/CWE-640/EmailInjection.qll
+++ b/go/ql/src/Security/CWE-640/EmailInjection.qll
@@ -16,19 +16,6 @@ import go
 module EmailInjection {
   import EmailInjectionCustomizations::EmailInjection
 
-  /**
-   * DEPRECATED: Use `Flow` instead.
-   *
-   * A taint-tracking configuration for reasoning about email-injection vulnerabilities.
-   */
-  deprecated class Configuration extends TaintTracking::Configuration {
-    Configuration() { this = "Email Injection" }
-
-    override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-  }
-
   private module Config implements DataFlow::ConfigSig {
     predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/go/ql/src/change-notes/2024-11-26-model-slices-package.md b/go/ql/src/change-notes/2024-11-26-model-slices-package.md
new file mode 100644
index 00000000000..5a3141c8075
--- /dev/null
+++ b/go/ql/src/change-notes/2024-11-26-model-slices-package.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Added value flow models for functions in the `slices` package which do not involve the `iter` package.
diff --git a/go/ql/src/experimental/CWE-090/LDAPInjection.qll b/go/ql/src/experimental/CWE-090/LDAPInjection.qll
index 4e0a6e290da..fd138fa0645 100644
--- a/go/ql/src/experimental/CWE-090/LDAPInjection.qll
+++ b/go/ql/src/experimental/CWE-090/LDAPInjection.qll
@@ -95,22 +95,6 @@ private class LdapClientDNSink extends LdapSink {
   }
 }
 
-/**
- * DEPRECATED: Use `LdapInjectionFlow` instead.
- *
- * A taint-tracking configuration for reasoning about when a `ActiveThreatModelSource`
- * flows into an argument or field that is vulnerable to LDAP injection.
- */
-deprecated class LdapInjectionConfiguration extends TaintTracking::Configuration {
-  LdapInjectionConfiguration() { this = "Ldap injection" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof LdapSink }
-
-  override predicate isSanitizer(DataFlow::Node sanitizer) { sanitizer instanceof LdapSanitizer }
-}
-
 private module LdapInjectionConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof ActiveThreatModelSource }
 
diff --git a/go/ql/src/experimental/CWE-1004/AuthCookie.qll b/go/ql/src/experimental/CWE-1004/AuthCookie.qll
index c995a8b2f68..411da5a79fa 100644
--- a/go/ql/src/experimental/CWE-1004/AuthCookie.qll
+++ b/go/ql/src/experimental/CWE-1004/AuthCookie.qll
@@ -64,28 +64,6 @@ private class SetCookieSink extends DataFlow::Node {
   }
 }
 
-/**
- * DEPRECATED: Use `NameToNetHttpCookieTrackingFlow` instead.
- *
- * A taint-tracking configuration for tracking flow from sensitive names to
- * `net/http.SetCookie`.
- */
-deprecated class NameToNetHttpCookieTrackingConfiguration extends TaintTracking::Configuration {
-  NameToNetHttpCookieTrackingConfiguration() { this = "NameToNetHttpCookieTrackingConfiguration" }
-
-  override predicate isSource(DataFlow::Node source) { isAuthVariable(source.asExpr()) }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof SetCookieSink }
-
-  override predicate isAdditionalTaintStep(DataFlow::Node pred, DataFlow::Node succ) {
-    exists(StructLit sl |
-      sl.getType() instanceof NetHttpCookieType and
-      getValueForFieldWrite(sl, "Name") = pred and
-      sl = succ.asExpr()
-    )
-  }
-}
-
 private module NameToNetHttpCookieTrackingConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { isAuthVariable(source.asExpr()) }
 
@@ -103,30 +81,6 @@ private module NameToNetHttpCookieTrackingConfig implements DataFlow::ConfigSig
 /** Tracks taint flow from sensitive names to `net/http.SetCookie`. */
 module NameToNetHttpCookieTrackingFlow = TaintTracking::Global<NameToNetHttpCookieTrackingConfig>;
 
-/**
- * DEPRECATED: Use `BoolToNetHttpCookieTrackingFlow` instead.
- *
- * A taint-tracking configuration for tracking flow from `bool` assigned to
- * `HttpOnly` that flows into `net/http.SetCookie`.
- */
-deprecated class BoolToNetHttpCookieTrackingConfiguration extends TaintTracking::Configuration {
-  BoolToNetHttpCookieTrackingConfiguration() { this = "BoolToNetHttpCookieTrackingConfiguration" }
-
-  override predicate isSource(DataFlow::Node source) {
-    source.getType().getUnderlyingType() instanceof BoolType
-  }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof SetCookieSink }
-
-  override predicate isAdditionalTaintStep(DataFlow::Node pred, DataFlow::Node succ) {
-    exists(StructLit sl |
-      sl.getType() instanceof NetHttpCookieType and
-      getValueForFieldWrite(sl, "HttpOnly") = pred and
-      sl = succ.asExpr()
-    )
-  }
-}
-
 private module BoolToNetHttpCookieTrackingConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
     source.getType().getUnderlyingType() instanceof BoolType
@@ -149,29 +103,6 @@ private module BoolToNetHttpCookieTrackingConfig implements DataFlow::ConfigSig
  */
 module BoolToNetHttpCookieTrackingFlow = TaintTracking::Global<BoolToNetHttpCookieTrackingConfig>;
 
-/**
- * DEPRECATED: Use `BoolToGinSetCookieTrackingFlow` instead.
- *
- * A taint-tracking configuration for tracking flow from `HttpOnly` set to
- * `false` to `gin-gonic/gin.Context.SetCookie`.
- */
-deprecated class BoolToGinSetCookieTrackingConfiguration extends DataFlow::Configuration {
-  BoolToGinSetCookieTrackingConfiguration() { this = "BoolToGinSetCookieTrackingConfiguration" }
-
-  override predicate isSource(DataFlow::Node source) { source.getBoolValue() = false }
-
-  override predicate isSink(DataFlow::Node sink) {
-    exists(DataFlow::MethodCallNode mcn |
-      mcn.getTarget() instanceof GinContextSetCookieMethod and
-      mcn.getArgument(6) = sink and
-      exists(NameToGinSetCookieTrackingConfiguration cfg, DataFlow::Node nameArg |
-        cfg.hasFlowTo(nameArg) and
-        mcn.getArgument(0) = nameArg
-      )
-    )
-  }
-}
-
 private module BoolToGinSetCookieTrackingConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source.getBoolValue() = false }
 
@@ -193,25 +124,6 @@ private module BoolToGinSetCookieTrackingConfig implements DataFlow::ConfigSig {
  */
 module BoolToGinSetCookieTrackingFlow = DataFlow::Global<BoolToGinSetCookieTrackingConfig>;
 
-/**
- * DEPRECATED: Use `NameToGinSetCookieTrackingFlow` instead.
- *
- * A taint-tracking configuration for tracking flow from sensitive names to
- * `gin-gonic/gin.Context.SetCookie`.
- */
-deprecated private class NameToGinSetCookieTrackingConfiguration extends DataFlow2::Configuration {
-  NameToGinSetCookieTrackingConfiguration() { this = "NameToGinSetCookieTrackingConfiguration" }
-
-  override predicate isSource(DataFlow::Node source) { isAuthVariable(source.asExpr()) }
-
-  override predicate isSink(DataFlow::Node sink) {
-    exists(DataFlow::MethodCallNode mcn |
-      mcn.getTarget() instanceof GinContextSetCookieMethod and
-      mcn.getArgument(0) = sink
-    )
-  }
-}
-
 private module NameToGinSetCookieTrackingConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { isAuthVariable(source.asExpr()) }
 
@@ -251,39 +163,6 @@ private class GorillaStoreSaveSink extends DataFlow::Node {
   }
 }
 
-/**
- * DEPRECATED: Use `GorillaCookieStoreSaveTrackingFlow` instead.
- *
- * A taint-tracking configuration for tracking flow from gorilla cookie store
- * creation to `gorilla/sessions.Session.Save`.
- */
-deprecated class GorillaCookieStoreSaveTrackingConfiguration extends DataFlow::Configuration {
-  GorillaCookieStoreSaveTrackingConfiguration() {
-    this = "GorillaCookieStoreSaveTrackingConfiguration"
-  }
-
-  override predicate isSource(DataFlow::Node source) {
-    source
-        .(DataFlow::CallNode)
-        .getTarget()
-        .hasQualifiedName(package("github.com/gorilla/sessions", ""), "NewCookieStore")
-  }
-
-  override predicate isSink(DataFlow::Node sink) {
-    sink instanceof GorillaSessionSaveSink or
-    sink instanceof GorillaStoreSaveSink
-  }
-
-  override predicate isAdditionalFlowStep(DataFlow::Node pred, DataFlow::Node succ) {
-    exists(DataFlow::MethodCallNode cn |
-      cn.getTarget()
-          .hasQualifiedName(package("github.com/gorilla/sessions", ""), "CookieStore", "Get") and
-      pred = cn.getReceiver() and
-      succ = cn.getResult(0)
-    )
-  }
-}
-
 private module GorillaCookieStoreSaveTrackingConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
     source
@@ -313,34 +192,6 @@ private module GorillaCookieStoreSaveTrackingConfig implements DataFlow::ConfigS
  */
 module GorillaCookieStoreSaveTrackingFlow = DataFlow::Global<GorillaCookieStoreSaveTrackingConfig>;
 
-/**
- * DEPRECATED: Use `GorillaSessionOptionsTrackingFlow` instead.
- *
- * A taint-tracking configuration for tracking flow from session options to
- * `gorilla/sessions.Session.Save`.
- */
-deprecated class GorillaSessionOptionsTrackingConfiguration extends TaintTracking::Configuration {
-  GorillaSessionOptionsTrackingConfiguration() {
-    this = "GorillaSessionOptionsTrackingConfiguration"
-  }
-
-  override predicate isSource(DataFlow::Node source) {
-    exists(StructLit sl |
-      sl.getType().hasQualifiedName(package("github.com/gorilla/sessions", ""), "Options") and
-      source.asExpr() = sl
-    )
-  }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof GorillaSessionSaveSink }
-
-  override predicate isAdditionalTaintStep(DataFlow::Node pred, DataFlow::Node succ) {
-    exists(GorillaSessionOptionsField f, DataFlow::Write w, DataFlow::Node base |
-      w.writesField(base, f, pred) and
-      succ = base
-    )
-  }
-}
-
 private module GorillaSessionOptionsTrackingConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
     exists(StructLit sl |
@@ -366,37 +217,6 @@ private module GorillaSessionOptionsTrackingConfig implements DataFlow::ConfigSi
 module GorillaSessionOptionsTrackingFlow =
   TaintTracking::Global<GorillaSessionOptionsTrackingConfig>;
 
-/**
- * DEPRECATED: Use `BoolToGorillaSessionOptionsTrackingFlow` instead.
- *
- * A taint-tracking configuration for tracking flow from a `bool` assigned to
- * `HttpOnly` to `gorilla/sessions.Session.Save`.
- */
-deprecated class BoolToGorillaSessionOptionsTrackingConfiguration extends TaintTracking::Configuration
-{
-  BoolToGorillaSessionOptionsTrackingConfiguration() {
-    this = "BoolToGorillaSessionOptionsTrackingConfiguration"
-  }
-
-  override predicate isSource(DataFlow::Node source) {
-    source.getType().getUnderlyingType() instanceof BoolType
-  }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof GorillaSessionSaveSink }
-
-  override predicate isAdditionalTaintStep(DataFlow::Node pred, DataFlow::Node succ) {
-    exists(StructLit sl |
-      getValueForFieldWrite(sl, "HttpOnly") = pred and
-      sl = succ.asExpr()
-    )
-    or
-    exists(GorillaSessionOptionsField f, DataFlow::Write w, DataFlow::Node base |
-      w.writesField(base, f, pred) and
-      succ = base
-    )
-  }
-}
-
 private module BoolToGorillaSessionOptionsTrackingConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
     source.getType().getUnderlyingType() instanceof BoolType
diff --git a/go/ql/src/experimental/CWE-327/WeakCryptoAlgorithmCustomizations.qll b/go/ql/src/experimental/CWE-327/WeakCryptoAlgorithmCustomizations.qll
index 61a55bdd32b..1d64d731f50 100644
--- a/go/ql/src/experimental/CWE-327/WeakCryptoAlgorithmCustomizations.qll
+++ b/go/ql/src/experimental/CWE-327/WeakCryptoAlgorithmCustomizations.qll
@@ -48,24 +48,6 @@ module WeakCryptoAlgorithm {
     }
   }
 
-  /**
-   * DEPRECATED: Use `Flow` instead.
-   *
-   * A configuration depicting taint flow from sensitive information to weak cryptographic algorithms.
-   */
-  deprecated class Configuration extends TaintTracking::Configuration {
-    Configuration() { this = "WeakCryptoAlgorithm" }
-
-    override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-    override predicate isSanitizer(DataFlow::Node node) {
-      super.isSanitizer(node) or
-      node instanceof Sanitizer
-    }
-  }
-
   private module Config implements DataFlow::ConfigSig {
     predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/go/ql/src/experimental/CWE-74/DsnInjectionCustomizations.qll b/go/ql/src/experimental/CWE-74/DsnInjectionCustomizations.qll
index 5417ddf4f3e..2c320855072 100644
--- a/go/ql/src/experimental/CWE-74/DsnInjectionCustomizations.qll
+++ b/go/ql/src/experimental/CWE-74/DsnInjectionCustomizations.qll
@@ -6,28 +6,6 @@ import semmle.go.dataflow.barrierguardutil.RegexpCheck
 /** A source for `DsnInjection` taint-flow configuration. */
 abstract class Source extends DataFlow::Node { }
 
-/**
- * DEPRECATED: Use `DsnInjectionFlow` instead.
- *
- *  A taint-tracking configuration to reason about Data Source Name injection vulnerabilities.
- */
-deprecated class DsnInjection extends TaintTracking::Configuration {
-  DsnInjection() { this = "DsnInjection" }
-
-  override predicate isSource(DataFlow::Node node) { node instanceof Source }
-
-  override predicate isSink(DataFlow::Node node) {
-    exists(DataFlow::CallNode c |
-      c.getTarget().hasQualifiedName("database/sql", "Open") and
-      c.getArgument(0).getStringValue() = "mysql"
-    |
-      node = c.getArgument(1)
-    )
-  }
-
-  override predicate isSanitizer(DataFlow::Node node) { node instanceof RegexpCheckBarrier }
-}
-
 private module DsnInjectionConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/go/ql/src/experimental/CWE-807/SensitiveConditionBypass.qll b/go/ql/src/experimental/CWE-807/SensitiveConditionBypass.qll
index 0d4bdfb1dd0..2f2ca94fa87 100644
--- a/go/ql/src/experimental/CWE-807/SensitiveConditionBypass.qll
+++ b/go/ql/src/experimental/CWE-807/SensitiveConditionBypass.qll
@@ -42,33 +42,6 @@ private class ConstComparisonExpr extends ComparisonExpr {
   }
 }
 
-/**
- * DEPRECATED: Use `Flow` instead.
- *
- * A data-flow configuration for reasoning about
- * user-controlled bypassing of sensitive actions.
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "Condtional Expression Check Bypass" }
-
-  override predicate isSource(DataFlow::Node source) {
-    source instanceof ActiveThreatModelSource
-    or
-    exists(DataFlow::FieldReadNode f |
-      f.getField().hasQualifiedName("net/http", "Request", "Host")
-    |
-      source = f
-    )
-  }
-
-  override predicate isSink(DataFlow::Node sink) {
-    exists(ConstComparisonExpr c |
-      c.getAnOperand() = sink.asExpr() and
-      not c.isPotentialFalsePositive()
-    )
-  }
-}
-
 private module Config implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
     source instanceof ActiveThreatModelSource
diff --git a/go/ql/src/experimental/CWE-918/SSRF.qll b/go/ql/src/experimental/CWE-918/SSRF.qll
index 42b017ac487..b1374da8a5f 100644
--- a/go/ql/src/experimental/CWE-918/SSRF.qll
+++ b/go/ql/src/experimental/CWE-918/SSRF.qll
@@ -15,36 +15,6 @@ module ServerSideRequestForgery {
   private import semmle.go.dataflow.barrierguardutil.RegexpCheck
   private import semmle.go.dataflow.Properties
 
-  /**
-   * DEPRECATED: Use `Flow` instead.
-   *
-   * A taint-tracking configuration for reasoning about request forgery.
-   */
-  deprecated class Configuration extends TaintTracking::Configuration {
-    Configuration() { this = "SSRF" }
-
-    override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-    override predicate isAdditionalTaintStep(DataFlow::Node pred, DataFlow::Node succ) {
-      // propagate to a URL when its host is assigned to
-      exists(Write w, Field f, SsaWithFields v | f.hasQualifiedName("net/url", "URL", "Host") |
-        w.writesField(v.getAUse(), f, pred) and succ = v.getAUse()
-      )
-    }
-
-    override predicate isSanitizer(DataFlow::Node node) {
-      super.isSanitizer(node) or
-      node instanceof Sanitizer
-    }
-
-    override predicate isSanitizerOut(DataFlow::Node node) {
-      super.isSanitizerOut(node) or
-      node instanceof SanitizerEdge
-    }
-  }
-
   private module Config implements DataFlow::ConfigSig {
     predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/go/ql/test/experimental/CWE-522-DecompressionBombs/DecompressionBombTest.expected b/go/ql/test/experimental/CWE-522-DecompressionBombs/DecompressionBombTest.expected
index 105b7026d0c..42831abaf15 100644
--- a/go/ql/test/experimental/CWE-522-DecompressionBombs/DecompressionBombTest.expected
+++ b/go/ql/test/experimental/CWE-522-DecompressionBombs/DecompressionBombTest.expected
@@ -1,3 +1,2 @@
-failures
 invalidModelRow
 testFailures
diff --git a/go/ql/test/experimental/frameworks/CleverGo/HeaderWrite.expected b/go/ql/test/experimental/frameworks/CleverGo/HeaderWrite.expected
index 48de9172b36..e69de29bb2d 100644
--- a/go/ql/test/experimental/frameworks/CleverGo/HeaderWrite.expected
+++ b/go/ql/test/experimental/frameworks/CleverGo/HeaderWrite.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/go/ql/test/experimental/frameworks/CleverGo/HttpRedirect.expected b/go/ql/test/experimental/frameworks/CleverGo/HttpRedirect.expected
index 48de9172b36..e69de29bb2d 100644
--- a/go/ql/test/experimental/frameworks/CleverGo/HttpRedirect.expected
+++ b/go/ql/test/experimental/frameworks/CleverGo/HttpRedirect.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/go/ql/test/experimental/frameworks/CleverGo/HttpResponseBody.expected b/go/ql/test/experimental/frameworks/CleverGo/HttpResponseBody.expected
index 48de9172b36..e69de29bb2d 100644
--- a/go/ql/test/experimental/frameworks/CleverGo/HttpResponseBody.expected
+++ b/go/ql/test/experimental/frameworks/CleverGo/HttpResponseBody.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/go/ql/test/experimental/frameworks/CleverGo/RemoteSources.expected b/go/ql/test/experimental/frameworks/CleverGo/RemoteSources.expected
index 48de9172b36..e69de29bb2d 100644
--- a/go/ql/test/experimental/frameworks/CleverGo/RemoteSources.expected
+++ b/go/ql/test/experimental/frameworks/CleverGo/RemoteSources.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/go/ql/test/experimental/frameworks/Fiber/HeaderWrite.expected b/go/ql/test/experimental/frameworks/Fiber/HeaderWrite.expected
index 48de9172b36..e69de29bb2d 100644
--- a/go/ql/test/experimental/frameworks/Fiber/HeaderWrite.expected
+++ b/go/ql/test/experimental/frameworks/Fiber/HeaderWrite.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/go/ql/test/experimental/frameworks/Fiber/Redirect.expected b/go/ql/test/experimental/frameworks/Fiber/Redirect.expected
index 48de9172b36..e69de29bb2d 100644
--- a/go/ql/test/experimental/frameworks/Fiber/Redirect.expected
+++ b/go/ql/test/experimental/frameworks/Fiber/Redirect.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/go/ql/test/experimental/frameworks/Fiber/RemoteFlowSources.expected b/go/ql/test/experimental/frameworks/Fiber/RemoteFlowSources.expected
index 48de9172b36..e69de29bb2d 100644
--- a/go/ql/test/experimental/frameworks/Fiber/RemoteFlowSources.expected
+++ b/go/ql/test/experimental/frameworks/Fiber/RemoteFlowSources.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/go/ql/test/experimental/frameworks/Fiber/ResponseBody.expected b/go/ql/test/experimental/frameworks/Fiber/ResponseBody.expected
index 48de9172b36..e69de29bb2d 100644
--- a/go/ql/test/experimental/frameworks/Fiber/ResponseBody.expected
+++ b/go/ql/test/experimental/frameworks/Fiber/ResponseBody.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/go/ql/test/library-tests/semmle/go/Function/isVariadic.expected b/go/ql/test/library-tests/semmle/go/Function/isVariadic.expected
index 48de9172b36..e69de29bb2d 100644
--- a/go/ql/test/library-tests/semmle/go/Function/isVariadic.expected
+++ b/go/ql/test/library-tests/semmle/go/Function/isVariadic.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/go/ql/test/library-tests/semmle/go/Types/Field_getPackage.expected b/go/ql/test/library-tests/semmle/go/Types/Field_getPackage.expected
index 485a42b185e..8a527e3d4f7 100644
--- a/go/ql/test/library-tests/semmle/go/Types/Field_getPackage.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/Field_getPackage.expected
@@ -13,8 +13,8 @@
 | depth.go:19:2:19:2 | f | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types |
 | embedded.go:4:2:4:2 | A | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types |
 | embedded.go:8:3:8:5 | Baz | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types |
-| embedded.go:13:2:13:4 | Qux | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types |
-| embedded.go:14:2:14:4 | Baz | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types |
+| embedded.go:12:2:12:4 | Qux | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types |
+| embedded.go:13:2:13:4 | Baz | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types |
 | generic.go:4:2:4:11 | valueField | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types |
 | generic.go:5:2:5:13 | pointerField | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types |
 | generic.go:6:2:6:11 | arrayField | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types |
@@ -26,6 +26,7 @@
 | generic.go:21:2:21:9 | mapField | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types |
 | generic.go:25:2:25:12 | structField | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types |
 | generic.go:29:2:29:13 | pointerField | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types |
+| main.go:18:7:18:15 | NameClash | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types |
 | pkg1/embedding.go:19:23:19:26 | base | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
 | pkg1/embedding.go:22:27:22:30 | base | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
 | pkg1/embedding.go:25:24:25:31 | embedder | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
@@ -36,20 +37,22 @@
 | pkg1/promotedStructs.go:14:2:14:7 | PField | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
 | pkg1/promotedStructs.go:22:22:22:22 | S | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
 | pkg1/promotedStructs.go:25:22:25:22 | P | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
-| pkg1/tst.go:4:2:4:2 | f | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
-| pkg1/tst.go:5:2:5:4 | Foo | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
-| pkg1/tst.go:6:2:6:4 | Bar | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
-| pkg1/tst.go:10:2:10:4 | Foo | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
-| pkg1/tst.go:11:2:11:4 | Bar | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
-| pkg1/tst.go:15:3:15:5 | Foo | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
-| pkg1/tst.go:16:3:16:5 | Bar | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
-| pkg1/tst.go:20:3:20:5 | Foo | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
-| pkg1/tst.go:21:2:21:4 | Bar | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
-| pkg1/tst.go:25:2:25:4 | val | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
-| pkg1/tst.go:26:2:26:5 | flag | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
-| pkg1/tst.go:30:2:30:5 | flag | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
+| pkg1/tst.go:6:2:6:2 | f | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
+| pkg1/tst.go:7:2:7:4 | Foo | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
+| pkg1/tst.go:8:2:8:4 | Bar | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
+| pkg1/tst.go:12:2:12:4 | Foo | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
+| pkg1/tst.go:13:2:13:4 | Bar | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
+| pkg1/tst.go:17:3:17:5 | Foo | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
+| pkg1/tst.go:18:3:18:5 | Bar | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
+| pkg1/tst.go:22:3:22:5 | Foo | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
+| pkg1/tst.go:23:2:23:4 | Bar | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
+| pkg1/tst.go:27:2:27:4 | val | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
+| pkg1/tst.go:28:2:28:5 | flag | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
+| pkg1/tst.go:32:2:32:5 | flag | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
+| pkg1/tst.go:62:7:62:15 | NameClash | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 |
 | pkg2/tst.go:4:2:4:2 | g | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2 |
 | pkg2/tst.go:8:2:8:2 | g | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2 |
+| pkg2/tst.go:17:2:17:8 | NCField | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2 |
 | struct_tags.go:4:2:4:7 | field1 | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types |
 | struct_tags.go:5:2:5:7 | field2 | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types |
 | struct_tags.go:9:2:9:7 | field1 | package github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types |
diff --git a/go/ql/test/library-tests/semmle/go/Types/Field_hasQualifiedName2.expected b/go/ql/test/library-tests/semmle/go/Types/Field_hasQualifiedName2.expected
index c8575332f6f..e7ffe6bc1ba 100644
--- a/go/ql/test/library-tests/semmle/go/Types/Field_hasQualifiedName2.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/Field_hasQualifiedName2.expected
@@ -18,10 +18,11 @@
 | depth.go:19:2:19:2 | f | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.c | f |
 | depth.go:19:2:19:2 | f | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.d | f |
 | embedded.go:4:2:4:2 | A | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.Baz | A |
+| embedded.go:4:2:4:2 | A | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.EmbedsBaz | A |
 | embedded.go:4:2:4:2 | A | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.Qux | A |
 | embedded.go:8:3:8:5 | Baz | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.Qux | Baz |
-| embedded.go:13:2:13:4 | Qux | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.EmbedsBaz | Qux |
-| embedded.go:14:2:14:4 | Baz | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.EmbedsBaz | Baz |
+| embedded.go:12:2:12:4 | Qux | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.EmbedsBaz | Qux |
+| embedded.go:13:2:13:4 | Baz | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.EmbedsBaz | Baz |
 | generic.go:4:2:4:11 | valueField | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.GenericStruct1 | valueField |
 | generic.go:5:2:5:13 | pointerField | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.GenericStruct1 | pointerField |
 | generic.go:6:2:6:11 | arrayField | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.GenericStruct1 | arrayField |
@@ -33,6 +34,7 @@
 | generic.go:21:2:21:9 | mapField | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.GenericStruct2 | mapField |
 | generic.go:25:2:25:12 | structField | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.GenericStruct2b | structField |
 | generic.go:29:2:29:13 | pointerField | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.CircularGenericStruct2 | pointerField |
+| main.go:18:7:18:15 | NameClash | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.EmbedsNameClash | NameClash |
 | pkg1/embedding.go:19:23:19:26 | base | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.embedder | base |
 | pkg1/embedding.go:19:23:19:26 | base | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.embedder2 | base |
 | pkg1/embedding.go:19:23:19:26 | base | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.embedder3 | base |
@@ -49,27 +51,31 @@
 | pkg1/promotedStructs.go:14:2:14:7 | PField | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.SEmbedP | PField |
 | pkg1/promotedStructs.go:22:22:22:22 | S | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.SEmbedS | S |
 | pkg1/promotedStructs.go:25:22:25:22 | P | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.SEmbedP | P |
-| pkg1/tst.go:4:2:4:2 | f | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T | f |
-| pkg1/tst.go:5:2:5:4 | Foo | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T | Foo |
-| pkg1/tst.go:6:2:6:4 | Bar | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T | Bar |
-| pkg1/tst.go:10:2:10:4 | Foo | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T2 | Foo |
-| pkg1/tst.go:11:2:11:4 | Bar | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T2 | Bar |
-| pkg1/tst.go:15:3:15:5 | Foo | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T3 | Foo |
-| pkg1/tst.go:16:3:16:5 | Bar | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T3 | Bar |
-| pkg1/tst.go:20:3:20:5 | Foo | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T4 | Foo |
-| pkg1/tst.go:21:2:21:4 | Bar | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T4 | Bar |
-| pkg1/tst.go:25:2:25:4 | val | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.Foo | val |
-| pkg1/tst.go:25:2:25:4 | val | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T | val |
-| pkg1/tst.go:25:2:25:4 | val | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T3 | val |
-| pkg1/tst.go:25:2:25:4 | val | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T4 | val |
-| pkg1/tst.go:26:2:26:5 | flag | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.Foo | flag |
-| pkg1/tst.go:26:2:26:5 | flag | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T4 | flag |
-| pkg1/tst.go:30:2:30:5 | flag | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.Bar | flag |
-| pkg1/tst.go:30:2:30:5 | flag | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T2 | flag |
+| pkg1/tst.go:6:2:6:2 | f | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T | f |
+| pkg1/tst.go:7:2:7:4 | Foo | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T | Foo |
+| pkg1/tst.go:8:2:8:4 | Bar | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T | Bar |
+| pkg1/tst.go:12:2:12:4 | Foo | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T2 | Foo |
+| pkg1/tst.go:13:2:13:4 | Bar | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T2 | Bar |
+| pkg1/tst.go:17:3:17:5 | Foo | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T3 | Foo |
+| pkg1/tst.go:18:3:18:5 | Bar | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T3 | Bar |
+| pkg1/tst.go:22:3:22:5 | Foo | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T4 | Foo |
+| pkg1/tst.go:23:2:23:4 | Bar | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T4 | Bar |
+| pkg1/tst.go:27:2:27:4 | val | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.Foo | val |
+| pkg1/tst.go:27:2:27:4 | val | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T | val |
+| pkg1/tst.go:27:2:27:4 | val | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T3 | val |
+| pkg1/tst.go:27:2:27:4 | val | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T4 | val |
+| pkg1/tst.go:28:2:28:5 | flag | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.Foo | flag |
+| pkg1/tst.go:28:2:28:5 | flag | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T4 | flag |
+| pkg1/tst.go:32:2:32:5 | flag | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.Bar | flag |
+| pkg1/tst.go:32:2:32:5 | flag | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T2 | flag |
+| pkg1/tst.go:62:7:62:15 | NameClash | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.NameClash | NameClash |
 | pkg2/tst.go:4:2:4:2 | g | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.G | g |
 | pkg2/tst.go:4:2:4:2 | g | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.T | g |
 | pkg2/tst.go:8:2:8:2 | g | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.G | g |
 | pkg2/tst.go:8:2:8:2 | g | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.T | g |
+| pkg2/tst.go:17:2:17:8 | NCField | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.EmbedsNameClash | NCField |
+| pkg2/tst.go:17:2:17:8 | NCField | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.NameClash | NCField |
+| pkg2/tst.go:17:2:17:8 | NCField | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.NameClash | NCField |
 | struct_tags.go:4:2:4:7 | field1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.S1 | field1 |
 | struct_tags.go:5:2:5:7 | field2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.S1 | field2 |
 | struct_tags.go:9:2:9:7 | field1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.S2 | field1 |
diff --git a/go/ql/test/library-tests/semmle/go/Types/Field_hasQualifiedName3.expected b/go/ql/test/library-tests/semmle/go/Types/Field_hasQualifiedName3.expected
index 56176082d9a..03b93b37c74 100644
--- a/go/ql/test/library-tests/semmle/go/Types/Field_hasQualifiedName3.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/Field_hasQualifiedName3.expected
@@ -18,10 +18,11 @@
 | depth.go:19:2:19:2 | f | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | c | f |
 | depth.go:19:2:19:2 | f | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | d | f |
 | embedded.go:4:2:4:2 | A | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | Baz | A |
+| embedded.go:4:2:4:2 | A | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | EmbedsBaz | A |
 | embedded.go:4:2:4:2 | A | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | Qux | A |
 | embedded.go:8:3:8:5 | Baz | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | Qux | Baz |
-| embedded.go:13:2:13:4 | Qux | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | EmbedsBaz | Qux |
-| embedded.go:14:2:14:4 | Baz | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | EmbedsBaz | Baz |
+| embedded.go:12:2:12:4 | Qux | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | EmbedsBaz | Qux |
+| embedded.go:13:2:13:4 | Baz | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | EmbedsBaz | Baz |
 | generic.go:4:2:4:11 | valueField | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | GenericStruct1 | valueField |
 | generic.go:5:2:5:13 | pointerField | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | GenericStruct1 | pointerField |
 | generic.go:6:2:6:11 | arrayField | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | GenericStruct1 | arrayField |
@@ -33,6 +34,7 @@
 | generic.go:21:2:21:9 | mapField | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | GenericStruct2 | mapField |
 | generic.go:25:2:25:12 | structField | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | GenericStruct2b | structField |
 | generic.go:29:2:29:13 | pointerField | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | CircularGenericStruct2 | pointerField |
+| main.go:18:7:18:15 | NameClash | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | EmbedsNameClash | NameClash |
 | pkg1/embedding.go:19:23:19:26 | base | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | embedder | base |
 | pkg1/embedding.go:19:23:19:26 | base | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | embedder2 | base |
 | pkg1/embedding.go:19:23:19:26 | base | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | embedder3 | base |
@@ -49,27 +51,31 @@
 | pkg1/promotedStructs.go:14:2:14:7 | PField | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | SEmbedP | PField |
 | pkg1/promotedStructs.go:22:22:22:22 | S | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | SEmbedS | S |
 | pkg1/promotedStructs.go:25:22:25:22 | P | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | SEmbedP | P |
-| pkg1/tst.go:4:2:4:2 | f | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T | f |
-| pkg1/tst.go:5:2:5:4 | Foo | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T | Foo |
-| pkg1/tst.go:6:2:6:4 | Bar | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T | Bar |
-| pkg1/tst.go:10:2:10:4 | Foo | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T2 | Foo |
-| pkg1/tst.go:11:2:11:4 | Bar | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T2 | Bar |
-| pkg1/tst.go:15:3:15:5 | Foo | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T3 | Foo |
-| pkg1/tst.go:16:3:16:5 | Bar | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T3 | Bar |
-| pkg1/tst.go:20:3:20:5 | Foo | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T4 | Foo |
-| pkg1/tst.go:21:2:21:4 | Bar | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T4 | Bar |
-| pkg1/tst.go:25:2:25:4 | val | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | Foo | val |
-| pkg1/tst.go:25:2:25:4 | val | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T | val |
-| pkg1/tst.go:25:2:25:4 | val | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T3 | val |
-| pkg1/tst.go:25:2:25:4 | val | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T4 | val |
-| pkg1/tst.go:26:2:26:5 | flag | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | Foo | flag |
-| pkg1/tst.go:26:2:26:5 | flag | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T4 | flag |
-| pkg1/tst.go:30:2:30:5 | flag | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | Bar | flag |
-| pkg1/tst.go:30:2:30:5 | flag | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T2 | flag |
+| pkg1/tst.go:6:2:6:2 | f | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T | f |
+| pkg1/tst.go:7:2:7:4 | Foo | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T | Foo |
+| pkg1/tst.go:8:2:8:4 | Bar | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T | Bar |
+| pkg1/tst.go:12:2:12:4 | Foo | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T2 | Foo |
+| pkg1/tst.go:13:2:13:4 | Bar | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T2 | Bar |
+| pkg1/tst.go:17:3:17:5 | Foo | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T3 | Foo |
+| pkg1/tst.go:18:3:18:5 | Bar | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T3 | Bar |
+| pkg1/tst.go:22:3:22:5 | Foo | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T4 | Foo |
+| pkg1/tst.go:23:2:23:4 | Bar | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T4 | Bar |
+| pkg1/tst.go:27:2:27:4 | val | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | Foo | val |
+| pkg1/tst.go:27:2:27:4 | val | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T | val |
+| pkg1/tst.go:27:2:27:4 | val | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T3 | val |
+| pkg1/tst.go:27:2:27:4 | val | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T4 | val |
+| pkg1/tst.go:28:2:28:5 | flag | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | Foo | flag |
+| pkg1/tst.go:28:2:28:5 | flag | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T4 | flag |
+| pkg1/tst.go:32:2:32:5 | flag | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | Bar | flag |
+| pkg1/tst.go:32:2:32:5 | flag | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T2 | flag |
+| pkg1/tst.go:62:7:62:15 | NameClash | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | NameClash | NameClash |
 | pkg2/tst.go:4:2:4:2 | g | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2 | G | g |
 | pkg2/tst.go:4:2:4:2 | g | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2 | T | g |
 | pkg2/tst.go:8:2:8:2 | g | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2 | G | g |
 | pkg2/tst.go:8:2:8:2 | g | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2 | T | g |
+| pkg2/tst.go:17:2:17:8 | NCField | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | EmbedsNameClash | NCField |
+| pkg2/tst.go:17:2:17:8 | NCField | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | NameClash | NCField |
+| pkg2/tst.go:17:2:17:8 | NCField | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2 | NameClash | NCField |
 | struct_tags.go:4:2:4:7 | field1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | S1 | field1 |
 | struct_tags.go:5:2:5:7 | field2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | S1 | field2 |
 | struct_tags.go:9:2:9:7 | field1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | S2 | field1 |
diff --git a/go/ql/test/library-tests/semmle/go/Types/ImplementsComparable.expected b/go/ql/test/library-tests/semmle/go/Types/ImplementsComparable.expected
index 48de9172b36..e69de29bb2d 100644
--- a/go/ql/test/library-tests/semmle/go/Types/ImplementsComparable.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/ImplementsComparable.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/go/ql/test/library-tests/semmle/go/Types/MethodCount.expected b/go/ql/test/library-tests/semmle/go/Types/MethodCount.expected
index 9d576b0f4f6..351b29c6222 100644
--- a/go/ql/test/library-tests/semmle/go/Types/MethodCount.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/MethodCount.expected
@@ -1,4 +1,6 @@
+| * EmbedsNameClash | 1 |
 | * Foo | 1 |
+| * NameClash | 1 |
 | * P | 1 |
 | * S | 1 |
 | * SEmbedP | 1 |
@@ -19,10 +21,12 @@
 | AExtended | 2 |
 | B | 2 |
 | C | 2 |
+| EmbedsNameClash | 1 |
 | Foo | 1 |
 | GenericInterface | 1 |
 | MixedExportedAndNot | 2 |
 | MyInterface | 17 |
+| NameClash | 1 |
 | S | 1 |
 | SEmbedS | 1 |
 | T | 1 |
diff --git a/go/ql/test/library-tests/semmle/go/Types/MethodTypes.expected b/go/ql/test/library-tests/semmle/go/Types/MethodTypes.expected
index 326debd2f80..d143fb3121e 100644
--- a/go/ql/test/library-tests/semmle/go/Types/MethodTypes.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/MethodTypes.expected
@@ -30,6 +30,7 @@
 | interface.go:95:6:95:8 | i18 | StringA | func() string |
 | interface.go:101:6:101:8 | i19 | StringB | func() string |
 | interface.go:105:6:105:8 | i20 | StringB | func() string |
+| main.go:17:6:17:20 | EmbedsNameClash | NCMethod | func()  |
 | pkg1/embedding.go:19:6:19:13 | embedder | f | func() int |
 | pkg1/embedding.go:22:6:22:16 | ptrembedder | f | func() int |
 | pkg1/embedding.go:22:6:22:16 | ptrembedder | g | func() int |
@@ -51,8 +52,9 @@
 | pkg1/interfaces.go:35:6:35:24 | MixedExportedAndNot | Exported | func()  |
 | pkg1/interfaces.go:35:6:35:24 | MixedExportedAndNot | notExported | func()  |
 | pkg1/promotedStructs.go:22:6:22:12 | SEmbedS | SMethod | func() interface { } |
-| pkg1/tst.go:3:6:3:6 | T | half | func() Foo |
-| pkg1/tst.go:14:6:14:7 | T3 | half | func() Foo |
-| pkg1/tst.go:19:6:19:7 | T4 | half | func() Foo |
+| pkg1/tst.go:5:6:5:6 | T | half | func() Foo |
+| pkg1/tst.go:16:6:16:7 | T3 | half | func() Foo |
+| pkg1/tst.go:21:6:21:7 | T4 | half | func() Foo |
+| pkg1/tst.go:61:6:61:14 | NameClash | NCMethod | func()  |
 | pkg2/tst.go:11:6:11:24 | MixedExportedAndNot | Exported | func()  |
 | pkg2/tst.go:11:6:11:24 | MixedExportedAndNot | notExported | func()  |
diff --git a/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName2.expected b/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName2.expected
index 1f893728e30..3929e1d98d5 100644
--- a/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName2.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName2.expected
@@ -59,9 +59,12 @@
 | pkg1/promotedStructs.go:8:12:8:18 | SMethod | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.SEmbedS | SMethod |
 | pkg1/promotedStructs.go:17:13:17:19 | PMethod | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.P | PMethod |
 | pkg1/promotedStructs.go:17:13:17:19 | PMethod | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.SEmbedP | PMethod |
-| pkg1/tst.go:33:16:33:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.Foo | half |
-| pkg1/tst.go:33:16:33:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T | half |
-| pkg1/tst.go:33:16:33:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T3 | half |
-| pkg1/tst.go:33:16:33:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T4 | half |
+| pkg1/tst.go:35:16:35:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.Foo | half |
+| pkg1/tst.go:35:16:35:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T | half |
+| pkg1/tst.go:35:16:35:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T3 | half |
+| pkg1/tst.go:35:16:35:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T4 | half |
 | pkg2/tst.go:12:2:12:9 | Exported | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.MixedExportedAndNot | Exported |
 | pkg2/tst.go:13:2:13:12 | notExported | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.MixedExportedAndNot | notExported |
+| pkg2/tst.go:20:20:20:27 | NCMethod | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.EmbedsNameClash | NCMethod |
+| pkg2/tst.go:20:20:20:27 | NCMethod | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.NameClash | NCMethod |
+| pkg2/tst.go:20:20:20:27 | NCMethod | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.NameClash | NCMethod |
diff --git a/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName3.expected b/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName3.expected
index 59a298e4b5f..9699ba3f382 100644
--- a/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName3.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/Method_hasQualifiedName3.expected
@@ -59,9 +59,12 @@
 | pkg1/promotedStructs.go:8:12:8:18 | SMethod | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | SEmbedS | SMethod |
 | pkg1/promotedStructs.go:17:13:17:19 | PMethod | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | P | PMethod |
 | pkg1/promotedStructs.go:17:13:17:19 | PMethod | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | SEmbedP | PMethod |
-| pkg1/tst.go:33:16:33:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | Foo | half |
-| pkg1/tst.go:33:16:33:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T | half |
-| pkg1/tst.go:33:16:33:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T3 | half |
-| pkg1/tst.go:33:16:33:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T4 | half |
+| pkg1/tst.go:35:16:35:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | Foo | half |
+| pkg1/tst.go:35:16:35:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T | half |
+| pkg1/tst.go:35:16:35:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T3 | half |
+| pkg1/tst.go:35:16:35:19 | half | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | T4 | half |
 | pkg2/tst.go:12:2:12:9 | Exported | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2 | MixedExportedAndNot | Exported |
 | pkg2/tst.go:13:2:13:12 | notExported | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2 | MixedExportedAndNot | notExported |
+| pkg2/tst.go:20:20:20:27 | NCMethod | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types | EmbedsNameClash | NCMethod |
+| pkg2/tst.go:20:20:20:27 | NCMethod | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1 | NameClash | NCMethod |
+| pkg2/tst.go:20:20:20:27 | NCMethod | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2 | NameClash | NCMethod |
diff --git a/go/ql/test/library-tests/semmle/go/Types/Methods.expected b/go/ql/test/library-tests/semmle/go/Types/Methods.expected
index 2c17013c186..c75b336543a 100644
--- a/go/ql/test/library-tests/semmle/go/Types/Methods.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/Methods.expected
@@ -1,11 +1,13 @@
-| * Foo | half | pkg1/tst.go:33:16:33:19 | half |
+| * EmbedsNameClash | NCMethod | pkg2/tst.go:20:20:20:27 | NCMethod |
+| * Foo | half | pkg1/tst.go:35:16:35:19 | half |
+| * NameClash | NCMethod | pkg2/tst.go:20:20:20:27 | NCMethod |
 | * P | PMethod | pkg1/promotedStructs.go:17:13:17:19 | PMethod |
 | * S | SMethod | pkg1/promotedStructs.go:8:12:8:18 | SMethod |
 | * SEmbedP | PMethod | pkg1/promotedStructs.go:17:13:17:19 | PMethod |
 | * SEmbedS | SMethod | pkg1/promotedStructs.go:8:12:8:18 | SMethod |
-| * T | half | pkg1/tst.go:33:16:33:19 | half |
-| * T3 | half | pkg1/tst.go:33:16:33:19 | half |
-| * T4 | half | pkg1/tst.go:33:16:33:19 | half |
+| * T | half | pkg1/tst.go:35:16:35:19 | half |
+| * T3 | half | pkg1/tst.go:35:16:35:19 | half |
+| * T4 | half | pkg1/tst.go:35:16:35:19 | half |
 | * base | f | pkg1/embedding.go:10:13:10:13 | f |
 | * base | g | pkg1/embedding.go:14:14:14:14 | g |
 | * embedder | f | pkg1/embedding.go:10:13:10:13 | f |
@@ -29,7 +31,8 @@
 | B | n | pkg1/interfaces.go:9:2:9:2 | n |
 | C | n | pkg1/interfaces.go:13:2:13:2 | n |
 | C | o | pkg1/interfaces.go:14:2:14:2 | o |
-| Foo | half | pkg1/tst.go:33:16:33:19 | half |
+| EmbedsNameClash | NCMethod | pkg2/tst.go:20:20:20:27 | NCMethod |
+| Foo | half | pkg1/tst.go:35:16:35:19 | half |
 | GenericInterface | GetT | generic.go:33:2:33:5 | GetT |
 | MixedExportedAndNot | Exported | pkg1/interfaces.go:36:2:36:9 | Exported |
 | MixedExportedAndNot | Exported | pkg2/tst.go:12:2:12:9 | Exported |
@@ -52,11 +55,12 @@
 | MyInterface | dummy18 | generic.go:62:2:62:8 | dummy18 |
 | MyInterface | dummy19 | generic.go:63:2:63:8 | dummy19 |
 | MyInterface | dummy20 | generic.go:64:2:64:8 | dummy20 |
+| NameClash | NCMethod | pkg2/tst.go:20:20:20:27 | NCMethod |
 | S | SMethod | pkg1/promotedStructs.go:8:12:8:18 | SMethod |
 | SEmbedS | SMethod | pkg1/promotedStructs.go:8:12:8:18 | SMethod |
-| T | half | pkg1/tst.go:33:16:33:19 | half |
-| T3 | half | pkg1/tst.go:33:16:33:19 | half |
-| T4 | half | pkg1/tst.go:33:16:33:19 | half |
+| T | half | pkg1/tst.go:35:16:35:19 | half |
+| T3 | half | pkg1/tst.go:35:16:35:19 | half |
+| T4 | half | pkg1/tst.go:35:16:35:19 | half |
 | base | f | pkg1/embedding.go:10:13:10:13 | f |
 | embedder | f | pkg1/embedding.go:10:13:10:13 | f |
 | embedder2 | f | pkg1/embedding.go:10:13:10:13 | f |
diff --git a/go/ql/test/library-tests/semmle/go/Types/QualifiedNames.expected b/go/ql/test/library-tests/semmle/go/Types/QualifiedNames.expected
index 660209effbb..dd6e9021a4f 100644
--- a/go/ql/test/library-tests/semmle/go/Types/QualifiedNames.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/QualifiedNames.expected
@@ -9,7 +9,7 @@
 | depth.go:18:6:18:6 | d | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.d |
 | embedded.go:3:6:3:8 | Baz | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.Baz |
 | embedded.go:7:6:7:8 | Qux | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.Qux |
-| embedded.go:12:6:12:14 | EmbedsBaz | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.EmbedsBaz |
+| embedded.go:11:6:11:14 | EmbedsBaz | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.EmbedsBaz |
 | generic.go:3:6:3:19 | GenericStruct1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.GenericStruct1 |
 | generic.go:11:6:11:27 | CircularGenericStruct1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.CircularGenericStruct1 |
 | generic.go:15:6:15:31 | UsesCircularGenericStruct1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.UsesCircularGenericStruct1 |
@@ -77,6 +77,7 @@
 | interface.go:136:6:136:21 | testComparable21 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable21 |
 | interface.go:137:6:137:21 | testComparable22 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable22 |
 | interface.go:138:6:138:21 | testComparable23 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.testComparable23 |
+| main.go:17:6:17:20 | EmbedsNameClash | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.EmbedsNameClash |
 | pkg1/embedding.go:8:6:8:9 | base | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.base |
 | pkg1/embedding.go:19:6:19:13 | embedder | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.embedder |
 | pkg1/embedding.go:22:6:22:16 | ptrembedder | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.ptrembedder |
@@ -95,14 +96,16 @@
 | pkg1/promotedStructs.go:13:6:13:6 | P | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.P |
 | pkg1/promotedStructs.go:22:6:22:12 | SEmbedS | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.SEmbedS |
 | pkg1/promotedStructs.go:25:6:25:12 | SEmbedP | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.SEmbedP |
-| pkg1/tst.go:3:6:3:6 | T | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T |
-| pkg1/tst.go:9:6:9:7 | T2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T2 |
-| pkg1/tst.go:14:6:14:7 | T3 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T3 |
-| pkg1/tst.go:19:6:19:7 | T4 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T4 |
-| pkg1/tst.go:24:6:24:8 | Foo | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.Foo |
-| pkg1/tst.go:29:6:29:8 | Bar | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.Bar |
+| pkg1/tst.go:5:6:5:6 | T | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T |
+| pkg1/tst.go:11:6:11:7 | T2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T2 |
+| pkg1/tst.go:16:6:16:7 | T3 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T3 |
+| pkg1/tst.go:21:6:21:7 | T4 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.T4 |
+| pkg1/tst.go:26:6:26:8 | Foo | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.Foo |
+| pkg1/tst.go:31:6:31:8 | Bar | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.Bar |
+| pkg1/tst.go:61:6:61:14 | NameClash | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1.NameClash |
 | pkg2/tst.go:3:6:3:6 | T | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.T |
 | pkg2/tst.go:7:6:7:6 | G | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.G |
 | pkg2/tst.go:11:6:11:24 | MixedExportedAndNot | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.MixedExportedAndNot |
+| pkg2/tst.go:16:6:16:14 | NameClash | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2.NameClash |
 | struct_tags.go:3:6:3:7 | S1 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.S1 |
 | struct_tags.go:8:6:8:7 | S2 | github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types.S2 |
diff --git a/go/ql/test/library-tests/semmle/go/Types/SignatureType_getNumParameter.expected b/go/ql/test/library-tests/semmle/go/Types/SignatureType_getNumParameter.expected
index faedd5aa0de..5831152884b 100644
--- a/go/ql/test/library-tests/semmle/go/Types/SignatureType_getNumParameter.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/SignatureType_getNumParameter.expected
@@ -4,18 +4,19 @@
 | depth.go:22:1:25:1 | function declaration | 0 |
 | generic.go:70:1:72:1 | function declaration | 1 |
 | generic.go:74:1:80:1 | function declaration | 1 |
-| main.go:5:1:5:30 | function declaration | 1 |
-| main.go:7:1:9:1 | function declaration | 2 |
-| main.go:11:1:11:14 | function declaration | 0 |
+| main.go:9:1:9:30 | function declaration | 1 |
+| main.go:11:1:13:1 | function declaration | 2 |
+| main.go:15:1:15:14 | function declaration | 0 |
 | pkg1/embedding.go:10:1:12:1 | function declaration | 0 |
 | pkg1/embedding.go:14:1:16:1 | function declaration | 0 |
 | pkg1/embedding.go:30:1:32:1 | function declaration | 0 |
 | pkg1/embedding.go:40:1:61:1 | function declaration | 0 |
 | pkg1/promotedStructs.go:8:1:10:1 | function declaration | 0 |
 | pkg1/promotedStructs.go:17:1:19:1 | function declaration | 0 |
-| pkg1/tst.go:33:1:35:1 | function declaration | 0 |
-| pkg1/tst.go:37:1:37:26 | function declaration | 1 |
-| pkg1/tst.go:39:1:57:1 | function declaration | 2 |
+| pkg1/tst.go:35:1:37:1 | function declaration | 0 |
+| pkg1/tst.go:39:1:39:26 | function declaration | 1 |
+| pkg1/tst.go:41:1:59:1 | function declaration | 2 |
+| pkg2/tst.go:20:1:20:32 | function declaration | 0 |
 | promoted.go:7:1:10:1 | function declaration | 1 |
 | promoted.go:12:1:15:1 | function declaration | 1 |
 | promoted.go:17:1:20:1 | function declaration | 1 |
diff --git a/go/ql/test/library-tests/semmle/go/Types/SignatureType_getNumResult.expected b/go/ql/test/library-tests/semmle/go/Types/SignatureType_getNumResult.expected
index 513ad56bd3c..960a272f73c 100644
--- a/go/ql/test/library-tests/semmle/go/Types/SignatureType_getNumResult.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/SignatureType_getNumResult.expected
@@ -4,18 +4,19 @@
 | depth.go:22:1:25:1 | function declaration | 0 |
 | generic.go:70:1:72:1 | function declaration | 1 |
 | generic.go:74:1:80:1 | function declaration | 0 |
-| main.go:5:1:5:30 | function declaration | 0 |
-| main.go:7:1:9:1 | function declaration | 2 |
-| main.go:11:1:11:14 | function declaration | 0 |
+| main.go:9:1:9:30 | function declaration | 0 |
+| main.go:11:1:13:1 | function declaration | 2 |
+| main.go:15:1:15:14 | function declaration | 0 |
 | pkg1/embedding.go:10:1:12:1 | function declaration | 1 |
 | pkg1/embedding.go:14:1:16:1 | function declaration | 1 |
 | pkg1/embedding.go:30:1:32:1 | function declaration | 1 |
 | pkg1/embedding.go:40:1:61:1 | function declaration | 0 |
 | pkg1/promotedStructs.go:8:1:10:1 | function declaration | 1 |
 | pkg1/promotedStructs.go:17:1:19:1 | function declaration | 1 |
-| pkg1/tst.go:33:1:35:1 | function declaration | 1 |
-| pkg1/tst.go:37:1:37:26 | function declaration | 0 |
-| pkg1/tst.go:39:1:57:1 | function declaration | 0 |
+| pkg1/tst.go:35:1:37:1 | function declaration | 1 |
+| pkg1/tst.go:39:1:39:26 | function declaration | 0 |
+| pkg1/tst.go:41:1:59:1 | function declaration | 0 |
+| pkg2/tst.go:20:1:20:32 | function declaration | 0 |
 | promoted.go:7:1:10:1 | function declaration | 0 |
 | promoted.go:12:1:15:1 | function declaration | 0 |
 | promoted.go:17:1:20:1 | function declaration | 0 |
diff --git a/go/ql/test/library-tests/semmle/go/Types/SignatureType_isVariadic.expected b/go/ql/test/library-tests/semmle/go/Types/SignatureType_isVariadic.expected
index 48de9172b36..e69de29bb2d 100644
--- a/go/ql/test/library-tests/semmle/go/Types/SignatureType_isVariadic.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/SignatureType_isVariadic.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/go/ql/test/library-tests/semmle/go/Types/StructFields.expected b/go/ql/test/library-tests/semmle/go/Types/StructFields.expected
index 502b4fa07ad..1757e0cdaf9 100644
--- a/go/ql/test/library-tests/semmle/go/Types/StructFields.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/StructFields.expected
@@ -20,8 +20,9 @@
 | embedded.go:3:6:3:8 | Baz | embedded.go:3:10:5:1 | struct type | A | string |
 | embedded.go:7:6:7:8 | Qux | embedded.go:7:10:9:1 | struct type | A | string |
 | embedded.go:7:6:7:8 | Qux | embedded.go:7:10:9:1 | struct type | Baz | * Baz |
-| embedded.go:12:6:12:14 | EmbedsBaz | embedded.go:12:16:15:1 | struct type | Baz | string |
-| embedded.go:12:6:12:14 | EmbedsBaz | embedded.go:12:16:15:1 | struct type | Qux | Qux |
+| embedded.go:11:6:11:14 | EmbedsBaz | embedded.go:11:16:14:1 | struct type | A | string |
+| embedded.go:11:6:11:14 | EmbedsBaz | embedded.go:11:16:14:1 | struct type | Baz | string |
+| embedded.go:11:6:11:14 | EmbedsBaz | embedded.go:11:16:14:1 | struct type | Qux | Qux |
 | generic.go:3:6:3:19 | GenericStruct1 | generic.go:3:28:9:1 | struct type | arrayField | [10]T |
 | generic.go:3:6:3:19 | GenericStruct1 | generic.go:3:28:9:1 | struct type | mapField | [string]T |
 | generic.go:3:6:3:19 | GenericStruct1 | generic.go:3:28:9:1 | struct type | pointerField | * T |
@@ -33,6 +34,8 @@
 | generic.go:19:6:19:19 | GenericStruct2 | generic.go:19:42:22:1 | struct type | structField | GenericStruct1 |
 | generic.go:24:6:24:20 | GenericStruct2b | generic.go:24:39:26:1 | struct type | structField | GenericStruct2 |
 | generic.go:28:6:28:27 | CircularGenericStruct2 | generic.go:28:39:30:1 | struct type | pointerField | * CircularGenericStruct2 |
+| main.go:17:6:17:20 | EmbedsNameClash | main.go:17:22:19:1 | struct type | NCField | string |
+| main.go:17:6:17:20 | EmbedsNameClash | main.go:17:22:19:1 | struct type | NameClash | NameClash |
 | pkg1/embedding.go:19:6:19:13 | embedder | pkg1/embedding.go:19:15:19:28 | struct type | base | base |
 | pkg1/embedding.go:22:6:22:16 | ptrembedder | pkg1/embedding.go:22:18:22:32 | struct type | base | * base |
 | pkg1/embedding.go:25:6:25:14 | embedder2 | pkg1/embedding.go:25:16:25:33 | struct type | base | base |
@@ -51,27 +54,30 @@
 | pkg1/promotedStructs.go:22:6:22:12 | SEmbedS | pkg1/promotedStructs.go:22:14:22:24 | struct type | SField | string |
 | pkg1/promotedStructs.go:25:6:25:12 | SEmbedP | pkg1/promotedStructs.go:25:14:25:24 | struct type | P | P |
 | pkg1/promotedStructs.go:25:6:25:12 | SEmbedP | pkg1/promotedStructs.go:25:14:25:24 | struct type | PField | string |
-| pkg1/tst.go:3:6:3:6 | T | pkg1/tst.go:3:8:7:1 | struct type | Bar | Bar |
-| pkg1/tst.go:3:6:3:6 | T | pkg1/tst.go:3:8:7:1 | struct type | Foo | Foo |
-| pkg1/tst.go:3:6:3:6 | T | pkg1/tst.go:3:8:7:1 | struct type | f | int |
-| pkg1/tst.go:3:6:3:6 | T | pkg1/tst.go:3:8:7:1 | struct type | val | int |
-| pkg1/tst.go:9:6:9:7 | T2 | pkg1/tst.go:9:9:12:1 | struct type | Bar | Bar |
-| pkg1/tst.go:9:6:9:7 | T2 | pkg1/tst.go:9:9:12:1 | struct type | Foo | Foo |
-| pkg1/tst.go:9:6:9:7 | T2 | pkg1/tst.go:9:9:12:1 | struct type | flag | bool |
-| pkg1/tst.go:14:6:14:7 | T3 | pkg1/tst.go:14:9:17:1 | struct type | Bar | * Bar |
-| pkg1/tst.go:14:6:14:7 | T3 | pkg1/tst.go:14:9:17:1 | struct type | Foo | * Foo |
-| pkg1/tst.go:14:6:14:7 | T3 | pkg1/tst.go:14:9:17:1 | struct type | val | int |
-| pkg1/tst.go:19:6:19:7 | T4 | pkg1/tst.go:19:9:22:1 | struct type | Bar | Bar |
-| pkg1/tst.go:19:6:19:7 | T4 | pkg1/tst.go:19:9:22:1 | struct type | Foo | * Foo |
-| pkg1/tst.go:19:6:19:7 | T4 | pkg1/tst.go:19:9:22:1 | struct type | flag | bool |
-| pkg1/tst.go:19:6:19:7 | T4 | pkg1/tst.go:19:9:22:1 | struct type | val | int |
-| pkg1/tst.go:24:6:24:8 | Foo | pkg1/tst.go:24:10:27:1 | struct type | flag | bool |
-| pkg1/tst.go:24:6:24:8 | Foo | pkg1/tst.go:24:10:27:1 | struct type | val | int |
-| pkg1/tst.go:29:6:29:8 | Bar | pkg1/tst.go:29:10:31:1 | struct type | flag | bool |
+| pkg1/tst.go:5:6:5:6 | T | pkg1/tst.go:5:8:9:1 | struct type | Bar | Bar |
+| pkg1/tst.go:5:6:5:6 | T | pkg1/tst.go:5:8:9:1 | struct type | Foo | Foo |
+| pkg1/tst.go:5:6:5:6 | T | pkg1/tst.go:5:8:9:1 | struct type | f | int |
+| pkg1/tst.go:5:6:5:6 | T | pkg1/tst.go:5:8:9:1 | struct type | val | int |
+| pkg1/tst.go:11:6:11:7 | T2 | pkg1/tst.go:11:9:14:1 | struct type | Bar | Bar |
+| pkg1/tst.go:11:6:11:7 | T2 | pkg1/tst.go:11:9:14:1 | struct type | Foo | Foo |
+| pkg1/tst.go:11:6:11:7 | T2 | pkg1/tst.go:11:9:14:1 | struct type | flag | bool |
+| pkg1/tst.go:16:6:16:7 | T3 | pkg1/tst.go:16:9:19:1 | struct type | Bar | * Bar |
+| pkg1/tst.go:16:6:16:7 | T3 | pkg1/tst.go:16:9:19:1 | struct type | Foo | * Foo |
+| pkg1/tst.go:16:6:16:7 | T3 | pkg1/tst.go:16:9:19:1 | struct type | val | int |
+| pkg1/tst.go:21:6:21:7 | T4 | pkg1/tst.go:21:9:24:1 | struct type | Bar | Bar |
+| pkg1/tst.go:21:6:21:7 | T4 | pkg1/tst.go:21:9:24:1 | struct type | Foo | * Foo |
+| pkg1/tst.go:21:6:21:7 | T4 | pkg1/tst.go:21:9:24:1 | struct type | flag | bool |
+| pkg1/tst.go:21:6:21:7 | T4 | pkg1/tst.go:21:9:24:1 | struct type | val | int |
+| pkg1/tst.go:26:6:26:8 | Foo | pkg1/tst.go:26:10:29:1 | struct type | flag | bool |
+| pkg1/tst.go:26:6:26:8 | Foo | pkg1/tst.go:26:10:29:1 | struct type | val | int |
+| pkg1/tst.go:31:6:31:8 | Bar | pkg1/tst.go:31:10:33:1 | struct type | flag | bool |
+| pkg1/tst.go:61:6:61:14 | NameClash | pkg1/tst.go:61:16:63:1 | struct type | NCField | string |
+| pkg1/tst.go:61:6:61:14 | NameClash | pkg1/tst.go:61:16:63:1 | struct type | NameClash | NameClash |
 | pkg2/tst.go:3:6:3:6 | T | pkg2/tst.go:3:8:5:1 | struct type | g | int |
 | pkg2/tst.go:3:6:3:6 | T | pkg2/tst.go:7:8:9:1 | struct type | g | int |
 | pkg2/tst.go:7:6:7:6 | G | pkg2/tst.go:3:8:5:1 | struct type | g | int |
 | pkg2/tst.go:7:6:7:6 | G | pkg2/tst.go:7:8:9:1 | struct type | g | int |
+| pkg2/tst.go:16:6:16:14 | NameClash | pkg2/tst.go:16:16:18:1 | struct type | NCField | string |
 | struct_tags.go:3:6:3:7 | S1 | struct_tags.go:3:9:6:1 | struct type | field1 | int |
 | struct_tags.go:3:6:3:7 | S1 | struct_tags.go:3:9:6:1 | struct type | field2 | int |
 | struct_tags.go:8:6:8:7 | S2 | struct_tags.go:8:9:11:1 | struct type | field1 | int |
diff --git a/go/ql/test/library-tests/semmle/go/Types/Types.expected b/go/ql/test/library-tests/semmle/go/Types/Types.expected
index 9c04442d7aa..ab34dd4d8ee 100644
--- a/go/ql/test/library-tests/semmle/go/Types/Types.expected
+++ b/go/ql/test/library-tests/semmle/go/Types/Types.expected
@@ -9,7 +9,7 @@
 | depth.go:18:6:18:6 | d | d |
 | embedded.go:3:6:3:8 | Baz | Baz |
 | embedded.go:7:6:7:8 | Qux | Qux |
-| embedded.go:12:6:12:14 | EmbedsBaz | EmbedsBaz |
+| embedded.go:11:6:11:14 | EmbedsBaz | EmbedsBaz |
 | generic.go:3:6:3:19 | GenericStruct1 | GenericStruct1 |
 | generic.go:11:6:11:27 | CircularGenericStruct1 | CircularGenericStruct1 |
 | generic.go:15:6:15:31 | UsesCircularGenericStruct1 | UsesCircularGenericStruct1 |
@@ -77,6 +77,7 @@
 | interface.go:136:6:136:21 | testComparable21 | testComparable21 |
 | interface.go:137:6:137:21 | testComparable22 | testComparable22 |
 | interface.go:138:6:138:21 | testComparable23 | testComparable23 |
+| main.go:17:6:17:20 | EmbedsNameClash | EmbedsNameClash |
 | pkg1/embedding.go:8:6:8:9 | base | base |
 | pkg1/embedding.go:19:6:19:13 | embedder | embedder |
 | pkg1/embedding.go:22:6:22:16 | ptrembedder | ptrembedder |
@@ -95,14 +96,16 @@
 | pkg1/promotedStructs.go:13:6:13:6 | P | P |
 | pkg1/promotedStructs.go:22:6:22:12 | SEmbedS | SEmbedS |
 | pkg1/promotedStructs.go:25:6:25:12 | SEmbedP | SEmbedP |
-| pkg1/tst.go:3:6:3:6 | T | T |
-| pkg1/tst.go:9:6:9:7 | T2 | T2 |
-| pkg1/tst.go:14:6:14:7 | T3 | T3 |
-| pkg1/tst.go:19:6:19:7 | T4 | T4 |
-| pkg1/tst.go:24:6:24:8 | Foo | Foo |
-| pkg1/tst.go:29:6:29:8 | Bar | Bar |
+| pkg1/tst.go:5:6:5:6 | T | T |
+| pkg1/tst.go:11:6:11:7 | T2 | T2 |
+| pkg1/tst.go:16:6:16:7 | T3 | T3 |
+| pkg1/tst.go:21:6:21:7 | T4 | T4 |
+| pkg1/tst.go:26:6:26:8 | Foo | Foo |
+| pkg1/tst.go:31:6:31:8 | Bar | Bar |
+| pkg1/tst.go:61:6:61:14 | NameClash | NameClash |
 | pkg2/tst.go:3:6:3:6 | T | T |
 | pkg2/tst.go:7:6:7:6 | G | G |
 | pkg2/tst.go:11:6:11:24 | MixedExportedAndNot | MixedExportedAndNot |
+| pkg2/tst.go:16:6:16:14 | NameClash | NameClash |
 | struct_tags.go:3:6:3:7 | S1 | S1 |
 | struct_tags.go:8:6:8:7 | S2 | S2 |
diff --git a/go/ql/test/library-tests/semmle/go/Types/embedded.go b/go/ql/test/library-tests/semmle/go/Types/embedded.go
index c9c2cf46c2b..413290dbf1a 100644
--- a/go/ql/test/library-tests/semmle/go/Types/embedded.go
+++ b/go/ql/test/library-tests/semmle/go/Types/embedded.go
@@ -8,7 +8,6 @@ type Qux struct {
 	*Baz
 }
 
-// EmbedsBaz should have a field A but does not
 type EmbedsBaz struct {
 	Qux
 	Baz string
diff --git a/go/ql/test/library-tests/semmle/go/Types/main.go b/go/ql/test/library-tests/semmle/go/Types/main.go
index 1c7e1684725..de11cbd152f 100644
--- a/go/ql/test/library-tests/semmle/go/Types/main.go
+++ b/go/ql/test/library-tests/semmle/go/Types/main.go
@@ -1,6 +1,10 @@
 package main
 
-import "regexp"
+import (
+	"regexp"
+
+	"github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg1"
+)
 
 func test(r *regexp.Regexp) {}
 
@@ -9,3 +13,7 @@ func swap(x int, y int) (int, int) {
 }
 
 func main() {}
+
+type EmbedsNameClash struct {
+	pkg1.NameClash
+}
diff --git a/go/ql/test/library-tests/semmle/go/Types/pkg1/tst.go b/go/ql/test/library-tests/semmle/go/Types/pkg1/tst.go
index 1b1920ff33a..598e711ff2c 100644
--- a/go/ql/test/library-tests/semmle/go/Types/pkg1/tst.go
+++ b/go/ql/test/library-tests/semmle/go/Types/pkg1/tst.go
@@ -1,5 +1,7 @@
 package pkg1
 
+import "github.com/github/codeql-go/ql/test/library-tests/semmle/go/Types/pkg2"
+
 type T struct {
 	f int
 	Foo
@@ -55,3 +57,7 @@ func test(t T, t2 T2) {
 	// methods of T2
 	// illegal: t2.half()
 }
+
+type NameClash struct {
+	pkg2.NameClash
+}
diff --git a/go/ql/test/library-tests/semmle/go/Types/pkg2/tst.go b/go/ql/test/library-tests/semmle/go/Types/pkg2/tst.go
index af91e514b77..d1634851b6b 100644
--- a/go/ql/test/library-tests/semmle/go/Types/pkg2/tst.go
+++ b/go/ql/test/library-tests/semmle/go/Types/pkg2/tst.go
@@ -12,3 +12,9 @@ type MixedExportedAndNot interface {
 	Exported()
 	notExported()
 }
+
+type NameClash struct {
+	NCField string
+}
+
+func (t NameClash) NCMethod() {}
diff --git a/go/ql/test/library-tests/semmle/go/concepts/HTTP/Handler.expected b/go/ql/test/library-tests/semmle/go/concepts/HTTP/Handler.expected
index 48de9172b36..e69de29bb2d 100644
--- a/go/ql/test/library-tests/semmle/go/concepts/HTTP/Handler.expected
+++ b/go/ql/test/library-tests/semmle/go/concepts/HTTP/Handler.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/go/ql/test/library-tests/semmle/go/concepts/LoggerCall/LoggerCall.expected b/go/ql/test/library-tests/semmle/go/concepts/LoggerCall/LoggerCall.expected
index 105b7026d0c..42831abaf15 100644
--- a/go/ql/test/library-tests/semmle/go/concepts/LoggerCall/LoggerCall.expected
+++ b/go/ql/test/library-tests/semmle/go/concepts/LoggerCall/LoggerCall.expected
@@ -1,3 +1,2 @@
-failures
 invalidModelRow
 testFailures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I1_subtypes_false.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I1_subtypes_false.expected
index db33d6d2504..55e9aed2e93 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I1_subtypes_false.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I1_subtypes_false.expected
@@ -1,3 +1,2 @@
 testFailures
 invalidModelRow
-failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I1_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I1_subtypes_true.expected
index db33d6d2504..55e9aed2e93 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I1_subtypes_true.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I1_subtypes_true.expected
@@ -1,3 +1,2 @@
 testFailures
 invalidModelRow
-failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I2_subtypes_false.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I2_subtypes_false.expected
index db33d6d2504..55e9aed2e93 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I2_subtypes_false.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I2_subtypes_false.expected
@@ -1,3 +1,2 @@
 testFailures
 invalidModelRow
-failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I2_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I2_subtypes_true.expected
index db33d6d2504..55e9aed2e93 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I2_subtypes_true.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_I2_subtypes_true.expected
@@ -1,3 +1,2 @@
 testFailures
 invalidModelRow
-failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI1_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI1_subtypes_true.expected
index db33d6d2504..55e9aed2e93 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI1_subtypes_true.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI1_subtypes_true.expected
@@ -1,3 +1,2 @@
 testFailures
 invalidModelRow
-failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI2_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI2_subtypes_true.expected
index db33d6d2504..55e9aed2e93 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI2_subtypes_true.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_IEmbedI2_subtypes_true.expected
@@ -1,3 +1,2 @@
 testFailures
 invalidModelRow
-failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_PImplEmbedI1_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_PImplEmbedI1_subtypes_true.expected
index db33d6d2504..55e9aed2e93 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_PImplEmbedI1_subtypes_true.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_PImplEmbedI1_subtypes_true.expected
@@ -1,3 +1,2 @@
 testFailures
 invalidModelRow
-failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_PImplEmbedI2_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_PImplEmbedI2_subtypes_true.expected
index db33d6d2504..55e9aed2e93 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_PImplEmbedI2_subtypes_true.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_PImplEmbedI2_subtypes_true.expected
@@ -1,3 +1,2 @@
 testFailures
 invalidModelRow
-failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_S1_subtypes_false.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_S1_subtypes_false.expected
index db33d6d2504..55e9aed2e93 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_S1_subtypes_false.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_S1_subtypes_false.expected
@@ -1,3 +1,2 @@
 testFailures
 invalidModelRow
-failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_S1_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_S1_subtypes_true.expected
index db33d6d2504..55e9aed2e93 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_S1_subtypes_true.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_S1_subtypes_true.expected
@@ -1,3 +1,2 @@
 testFailures
 invalidModelRow
-failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI1_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI1_subtypes_true.expected
index db33d6d2504..55e9aed2e93 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI1_subtypes_true.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI1_subtypes_true.expected
@@ -1,3 +1,2 @@
 testFailures
 invalidModelRow
-failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI2_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI2_subtypes_true.expected
index db33d6d2504..55e9aed2e93 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI2_subtypes_true.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedI2_subtypes_true.expected
@@ -1,3 +1,2 @@
 testFailures
 invalidModelRow
-failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedP1_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedP1_subtypes_true.expected
index db33d6d2504..55e9aed2e93 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedP1_subtypes_true.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedP1_subtypes_true.expected
@@ -1,3 +1,2 @@
 testFailures
 invalidModelRow
-failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedP2_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedP2_subtypes_true.expected
index db33d6d2504..55e9aed2e93 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedP2_subtypes_true.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedP2_subtypes_true.expected
@@ -1,3 +1,2 @@
 testFailures
 invalidModelRow
-failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrP1_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrP1_subtypes_true.expected
index db33d6d2504..55e9aed2e93 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrP1_subtypes_true.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrP1_subtypes_true.expected
@@ -1,3 +1,2 @@
 testFailures
 invalidModelRow
-failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrP2_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrP2_subtypes_true.expected
index db33d6d2504..55e9aed2e93 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrP2_subtypes_true.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrP2_subtypes_true.expected
@@ -1,3 +1,2 @@
 testFailures
 invalidModelRow
-failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrS1_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrS1_subtypes_true.expected
index db33d6d2504..55e9aed2e93 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrS1_subtypes_true.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrS1_subtypes_true.expected
@@ -1,3 +1,2 @@
 testFailures
 invalidModelRow
-failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrS2_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrS2_subtypes_true.expected
index db33d6d2504..55e9aed2e93 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrS2_subtypes_true.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedPtrS2_subtypes_true.expected
@@ -1,3 +1,2 @@
 testFailures
 invalidModelRow
-failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS1_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS1_subtypes_true.expected
index db33d6d2504..55e9aed2e93 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS1_subtypes_true.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS1_subtypes_true.expected
@@ -1,3 +1,2 @@
 testFailures
 invalidModelRow
-failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS2_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS2_subtypes_true.expected
index db33d6d2504..55e9aed2e93 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS2_subtypes_true.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SEmbedS2_subtypes_true.expected
@@ -1,3 +1,2 @@
 testFailures
 invalidModelRow
-failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI1_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI1_subtypes_true.expected
index db33d6d2504..55e9aed2e93 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI1_subtypes_true.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI1_subtypes_true.expected
@@ -1,3 +1,2 @@
 testFailures
 invalidModelRow
-failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI2_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI2_subtypes_true.expected
index db33d6d2504..55e9aed2e93 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI2_subtypes_true.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedI2_subtypes_true.expected
@@ -1,3 +1,2 @@
 testFailures
 invalidModelRow
-failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS1_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS1_subtypes_true.expected
index db33d6d2504..55e9aed2e93 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS1_subtypes_true.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS1_subtypes_true.expected
@@ -1,3 +1,2 @@
 testFailures
 invalidModelRow
-failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS2_subtypes_true.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS2_subtypes_true.expected
index db33d6d2504..55e9aed2e93 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS2_subtypes_true.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/mad_SImplEmbedS2_subtypes_true.expected
@@ -1,3 +1,2 @@
 testFailures
 invalidModelRow
-failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_I1.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_I1.expected
index db33d6d2504..55e9aed2e93 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_I1.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_I1.expected
@@ -1,3 +1,2 @@
 testFailures
 invalidModelRow
-failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_P1.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_P1.expected
index db33d6d2504..55e9aed2e93 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_P1.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_P1.expected
@@ -1,3 +1,2 @@
 testFailures
 invalidModelRow
-failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_S1.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_S1.expected
index db33d6d2504..55e9aed2e93 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_S1.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalFlowInheritance/ql_S1.expected
@@ -1,3 +1,2 @@
 testFailures
 invalidModelRow
-failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/completetest.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/completetest.ext.yml
index 79bf9128ef5..d89a9e04e16 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/completetest.ext.yml
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/completetest.ext.yml
@@ -35,10 +35,12 @@ extensions:
       pack: codeql/go-all
       extensible: sourceModel
     data:
+      - ["github.com/nonexistent/test", "", False, "SourceVariable", "", "", "", "qltest", "manual"]
       - ["github.com/nonexistent/test", "A", False, "Src1", "", "", "ReturnValue", "qltest", "manual"]
   - addsTo:
       pack: codeql/go-all
       extensible: sinkModel
     data:
+      - ["github.com/nonexistent/test", "", False, "SinkVariable", "", "", "", "qltest", "manual"]
       - ["github.com/nonexistent/test", "B", False, "Sink1", "", "", "Argument[0]", "qltest", "manual"]
       - ["github.com/nonexistent/test", "B", False, "SinkManyArgs", "", "", "Argument[0..2]", "qltest", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/sinks.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/sinks.expected
index fc9adff8942..755c3f82279 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/sinks.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/sinks.expected
@@ -43,3 +43,4 @@ invalidModelRow
 | test.go:199:17:199:20 | arg1 | qltest |
 | test.go:199:23:199:26 | arg2 | qltest |
 | test.go:199:29:199:32 | arg3 | qltest |
+| test.go:202:22:202:25 | temp | qltest |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/sinks.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/sinks.ext.yml
index 426e094c00c..ec19b822a8c 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/sinks.ext.yml
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/sinks.ext.yml
@@ -3,6 +3,7 @@ extensions:
       pack: codeql/go-all
       extensible: sinkModel
     data:
+      - ["github.com/nonexistent/test", "", False, "SinkVariable", "", "", "", "qltest", "manual"]
       - ["github.com/nonexistent/test", "B", False, "Sink1", "", "", "Argument[0]", "qltest", "manual"]
       - ["github.com/nonexistent/test", "B", False, "SinkMethod", "", "", "Argument[receiver]", "qltest", "manual"]
       - ["github.com/nonexistent/test", "B", False, "SinkManyArgs", "", "", "Argument[0..2]", "qltest", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/srcs.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/srcs.expected
index d63fedba3fd..bd1525a984b 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/srcs.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/srcs.expected
@@ -21,3 +21,4 @@ invalidModelRow
 | test.go:183:17:183:24 | call to Src1 | qltest |
 | test.go:187:24:187:31 | call to Src1 | qltest |
 | test.go:191:24:191:31 | call to Src1 | qltest |
+| test.go:201:10:201:28 | selection of SourceVariable | qltest |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/srcs.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/srcs.ext.yml
index 5493650132c..cda2183894c 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/srcs.ext.yml
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/srcs.ext.yml
@@ -3,9 +3,10 @@ extensions:
       pack: codeql/go-all
       extensible: sourceModel
     data:
+      - ["github.com/nonexistent/test", "", False, "SourceVariable", "", "", "", "qltest", "manual"]
       - ["github.com/nonexistent/test", "A", False, "Src1", "", "", "ReturnValue", "qltest", "manual"]
       - ["github.com/nonexistent/test", "A", False, "Src2", "", "", "ReturnValue", "qltest", "manual"]
       - ["github.com/nonexistent/test", "A", True, "Src2", "", "", "ReturnValue", "qltest-w-subtypes", "manual"]
       - ["github.com/nonexistent/test", "A", False, "SrcArg", "", "", "Argument[0]", "qltest-arg", "manual"]
       - ["github.com/nonexistent/test", "A", False, "Src3", "", "", "ReturnValue[0]", "qltest", "manual"]
-      - ["github.com/nonexistent/test", "A", True, "Src3", "", "", "ReturnValue[1]", "qltest-w-subtypes", "manual"]
\ No newline at end of file
+      - ["github.com/nonexistent/test", "A", True, "Src3", "", "", "ReturnValue[1]", "qltest-w-subtypes", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/test.go b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/test.go
index 33e980dac99..29ed066cd50 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/test.go
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/test.go
@@ -197,6 +197,9 @@ func simpleflow() {
 	arg3 := src
 	arg4 := src
 	b.SinkManyArgs(arg1, arg2, arg3, arg4) // $ hasTaintFlow="arg1" hasTaintFlow="arg2" hasTaintFlow="arg3"
+
+	temp := test.SourceVariable
+	test.SinkVariable = temp // $ hasTaintFlow="temp"
 }
 
 type mapstringstringtype map[string]string
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/vendor/github.com/nonexistent/test/stub.go b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/vendor/github.com/nonexistent/test/stub.go
index 05a5f741d76..72681cf7238 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/vendor/github.com/nonexistent/test/stub.go
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalTaintFlow/vendor/github.com/nonexistent/test/stub.go
@@ -72,3 +72,6 @@ func (c C) Get() string  { return "" }
 
 func (c *C) SetThroughPointer(f string) {}
 func (c *C) GetThroughPointer() string  { return "" }
+
+var SourceVariable string
+var SinkVariable string
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/completetest.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/completetest.ext.yml
index 8fbc26ff6cd..924e19a8a73 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/completetest.ext.yml
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/completetest.ext.yml
@@ -35,10 +35,12 @@ extensions:
       pack: codeql/go-all
       extensible: sourceModel
     data:
+      - ["github.com/nonexistent/test", "", False, "SourceVariable", "", "", "", "qltest", "manual"]
       - ["github.com/nonexistent/test", "A", False, "Src1", "", "", "ReturnValue", "qltest", "manual"]
   - addsTo:
       pack: codeql/go-all
       extensible: sinkModel
     data:
+      - ["github.com/nonexistent/test", "", False, "SinkVariable", "", "", "", "qltest", "manual"]
       - ["github.com/nonexistent/test", "B", False, "Sink1", "", "", "Argument[0]", "qltest", "manual"]
       - ["github.com/nonexistent/test", "B", False, "SinkManyArgs", "", "", "Argument[0..2]", "qltest", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/sinks.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/sinks.expected
index 0fe3a614e11..c9940e181c8 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/sinks.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/sinks.expected
@@ -49,3 +49,4 @@ invalidModelRow
 | test.go:205:10:205:26 | call to min | qltest |
 | test.go:206:10:206:26 | call to min | qltest |
 | test.go:207:10:207:26 | call to min | qltest |
+| test.go:210:22:210:25 | temp | qltest |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/sinks.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/sinks.ext.yml
index 426e094c00c..ec19b822a8c 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/sinks.ext.yml
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/sinks.ext.yml
@@ -3,6 +3,7 @@ extensions:
       pack: codeql/go-all
       extensible: sinkModel
     data:
+      - ["github.com/nonexistent/test", "", False, "SinkVariable", "", "", "", "qltest", "manual"]
       - ["github.com/nonexistent/test", "B", False, "Sink1", "", "", "Argument[0]", "qltest", "manual"]
       - ["github.com/nonexistent/test", "B", False, "SinkMethod", "", "", "Argument[receiver]", "qltest", "manual"]
       - ["github.com/nonexistent/test", "B", False, "SinkManyArgs", "", "", "Argument[0..2]", "qltest", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/srcs.expected b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/srcs.expected
index d63fedba3fd..6fcfcc2a3bc 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/srcs.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/srcs.expected
@@ -21,3 +21,4 @@ invalidModelRow
 | test.go:183:17:183:24 | call to Src1 | qltest |
 | test.go:187:24:187:31 | call to Src1 | qltest |
 | test.go:191:24:191:31 | call to Src1 | qltest |
+| test.go:209:10:209:28 | selection of SourceVariable | qltest |
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/srcs.ext.yml b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/srcs.ext.yml
index 5493650132c..cda2183894c 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/srcs.ext.yml
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/srcs.ext.yml
@@ -3,9 +3,10 @@ extensions:
       pack: codeql/go-all
       extensible: sourceModel
     data:
+      - ["github.com/nonexistent/test", "", False, "SourceVariable", "", "", "", "qltest", "manual"]
       - ["github.com/nonexistent/test", "A", False, "Src1", "", "", "ReturnValue", "qltest", "manual"]
       - ["github.com/nonexistent/test", "A", False, "Src2", "", "", "ReturnValue", "qltest", "manual"]
       - ["github.com/nonexistent/test", "A", True, "Src2", "", "", "ReturnValue", "qltest-w-subtypes", "manual"]
       - ["github.com/nonexistent/test", "A", False, "SrcArg", "", "", "Argument[0]", "qltest-arg", "manual"]
       - ["github.com/nonexistent/test", "A", False, "Src3", "", "", "ReturnValue[0]", "qltest", "manual"]
-      - ["github.com/nonexistent/test", "A", True, "Src3", "", "", "ReturnValue[1]", "qltest-w-subtypes", "manual"]
\ No newline at end of file
+      - ["github.com/nonexistent/test", "A", True, "Src3", "", "", "ReturnValue[1]", "qltest-w-subtypes", "manual"]
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/test.go b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/test.go
index 82419ae7d59..72c4db35248 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/test.go
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/test.go
@@ -205,6 +205,9 @@ func simpleflow() {
 	b.Sink1(min(srcInt, 0, 1)) // $ hasValueFlow="call to min"
 	b.Sink1(min(0, srcInt, 1)) // $ hasValueFlow="call to min"
 	b.Sink1(min(0, 1, srcInt)) // $ hasValueFlow="call to min"
+
+	temp := test.SourceVariable
+	test.SinkVariable = temp // $ hasValueFlow="temp"
 }
 
 type mapstringstringtype map[string]string
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/vendor/github.com/nonexistent/test/stub.go b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/vendor/github.com/nonexistent/test/stub.go
index 05a5f741d76..72681cf7238 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/vendor/github.com/nonexistent/test/stub.go
+++ b/go/ql/test/library-tests/semmle/go/dataflow/ExternalValueFlow/vendor/github.com/nonexistent/test/stub.go
@@ -72,3 +72,6 @@ func (c C) Get() string  { return "" }
 
 func (c *C) SetThroughPointer(f string) {}
 func (c *C) GetThroughPointer() string  { return "" }
+
+var SourceVariable string
+var SinkVariable string
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/PromotedMethods/DataFlowConfig.expected b/go/ql/test/library-tests/semmle/go/dataflow/PromotedMethods/DataFlowConfig.expected
index 105b7026d0c..42831abaf15 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/PromotedMethods/DataFlowConfig.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/PromotedMethods/DataFlowConfig.expected
@@ -1,3 +1,2 @@
-failures
 invalidModelRow
 testFailures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/environment/test.expected b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/environment/test.expected
index db33d6d2504..55e9aed2e93 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/environment/test.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/environment/test.expected
@@ -1,3 +1,2 @@
 testFailures
 invalidModelRow
-failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/file/test.expected b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/file/test.expected
index db33d6d2504..55e9aed2e93 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/file/test.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/file/test.expected
@@ -1,3 +1,2 @@
 testFailures
 invalidModelRow
-failures
diff --git a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/source.expected b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/source.expected
index db33d6d2504..55e9aed2e93 100644
--- a/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/source.expected
+++ b/go/ql/test/library-tests/semmle/go/dataflow/flowsources/local/stdin/source.expected
@@ -1,3 +1,2 @@
 testFailures
 invalidModelRow
-failures
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Afero/Query.expected b/go/ql/test/library-tests/semmle/go/frameworks/Afero/Query.expected
index 08c5eee5289..42831abaf15 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Afero/Query.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Afero/Query.expected
@@ -1,3 +1,2 @@
 invalidModelRow
 testFailures
-failures
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/BeegoOrm/QueryString.expected b/go/ql/test/library-tests/semmle/go/frameworks/BeegoOrm/QueryString.expected
index 105b7026d0c..42831abaf15 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/BeegoOrm/QueryString.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/BeegoOrm/QueryString.expected
@@ -1,3 +1,2 @@
-failures
 invalidModelRow
 testFailures
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/BeegoOrm/SqlInjection.expected b/go/ql/test/library-tests/semmle/go/frameworks/BeegoOrm/SqlInjection.expected
index 6cc1e09486b..1198f8d41a9 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/BeegoOrm/SqlInjection.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/BeegoOrm/SqlInjection.expected
@@ -32,40 +32,61 @@
 | test.go:59:31:59:39 | untrusted | test.go:57:15:57:41 | call to UserAgent | test.go:59:31:59:39 | untrusted | This query depends on a $@. | test.go:57:15:57:41 | call to UserAgent | user-provided value |
 | test.go:65:19:65:27 | untrusted | test.go:63:15:63:41 | call to UserAgent | test.go:65:19:65:27 | untrusted | This query depends on a $@. | test.go:63:15:63:41 | call to UserAgent | user-provided value |
 edges
-| test.go:11:15:11:41 | call to UserAgent | test.go:13:11:13:19 | untrusted | provenance | Src:MaD:1  |
-| test.go:11:15:11:41 | call to UserAgent | test.go:14:23:14:31 | untrusted | provenance | Src:MaD:1  |
-| test.go:11:15:11:41 | call to UserAgent | test.go:15:14:15:22 | untrusted | provenance | Src:MaD:1  |
-| test.go:11:15:11:41 | call to UserAgent | test.go:16:26:16:34 | untrusted | provenance | Src:MaD:1  |
-| test.go:11:15:11:41 | call to UserAgent | test.go:17:12:17:20 | untrusted | provenance | Src:MaD:1  |
-| test.go:11:15:11:41 | call to UserAgent | test.go:18:24:18:32 | untrusted | provenance | Src:MaD:1  |
-| test.go:11:15:11:41 | call to UserAgent | test.go:19:15:19:23 | untrusted | provenance | Src:MaD:1  |
-| test.go:11:15:11:41 | call to UserAgent | test.go:20:27:20:35 | untrusted | provenance | Src:MaD:1  |
-| test.go:25:15:25:41 | call to UserAgent | test.go:28:12:28:20 | untrusted | provenance | Src:MaD:1  |
-| test.go:25:15:25:41 | call to UserAgent | test.go:29:10:29:18 | untrusted | provenance | Src:MaD:1  |
-| test.go:25:15:25:41 | call to UserAgent | test.go:30:15:30:23 | untrusted | provenance | Src:MaD:1  |
-| test.go:25:15:25:41 | call to UserAgent | test.go:31:14:31:22 | untrusted | provenance | Src:MaD:1  |
-| test.go:25:15:25:41 | call to UserAgent | test.go:32:15:32:23 | untrusted | provenance | Src:MaD:1  |
-| test.go:25:15:25:41 | call to UserAgent | test.go:33:8:33:16 | untrusted | provenance | Src:MaD:1  |
-| test.go:25:15:25:41 | call to UserAgent | test.go:34:11:34:19 | untrusted | provenance | Src:MaD:1  |
-| test.go:25:15:25:41 | call to UserAgent | test.go:35:9:35:17 | untrusted | provenance | Src:MaD:1  |
-| test.go:25:15:25:41 | call to UserAgent | test.go:36:8:36:16 | untrusted | provenance | Src:MaD:1  |
-| test.go:25:15:25:41 | call to UserAgent | test.go:37:8:37:16 | untrusted | provenance | Src:MaD:1  |
-| test.go:25:15:25:41 | call to UserAgent | test.go:38:13:38:21 | untrusted | provenance | Src:MaD:1  |
-| test.go:25:15:25:41 | call to UserAgent | test.go:39:13:39:21 | untrusted | provenance | Src:MaD:1  |
-| test.go:25:15:25:41 | call to UserAgent | test.go:40:12:40:20 | untrusted | provenance | Src:MaD:1  |
-| test.go:25:15:25:41 | call to UserAgent | test.go:41:12:41:20 | untrusted | provenance | Src:MaD:1  |
-| test.go:25:15:25:41 | call to UserAgent | test.go:42:9:42:17 | untrusted | provenance | Src:MaD:1  |
-| test.go:25:15:25:41 | call to UserAgent | test.go:43:12:43:20 | untrusted | provenance | Src:MaD:1  |
-| test.go:25:15:25:41 | call to UserAgent | test.go:44:16:44:24 | untrusted | provenance | Src:MaD:1  |
-| test.go:25:15:25:41 | call to UserAgent | test.go:45:12:45:20 | untrusted | provenance | Src:MaD:1  |
-| test.go:25:15:25:41 | call to UserAgent | test.go:46:14:46:22 | untrusted | provenance | Src:MaD:1  |
-| test.go:26:16:26:42 | call to UserAgent | test.go:44:27:44:36 | untrusted2 | provenance | Src:MaD:1  |
-| test.go:26:16:26:42 | call to UserAgent | test.go:46:25:46:34 | untrusted2 | provenance | Src:MaD:1  |
-| test.go:50:15:50:41 | call to UserAgent | test.go:52:12:52:20 | untrusted | provenance | Src:MaD:1  |
-| test.go:57:15:57:41 | call to UserAgent | test.go:59:31:59:39 | untrusted | provenance | Src:MaD:1  |
-| test.go:63:15:63:41 | call to UserAgent | test.go:65:19:65:27 | untrusted | provenance | Src:MaD:1  |
+| test.go:11:15:11:41 | call to UserAgent | test.go:13:11:13:19 | untrusted | provenance | Src:MaD:22 Sink:MaD:2 |
+| test.go:11:15:11:41 | call to UserAgent | test.go:14:23:14:31 | untrusted | provenance | Src:MaD:22 Sink:MaD:3 |
+| test.go:11:15:11:41 | call to UserAgent | test.go:15:14:15:22 | untrusted | provenance | Src:MaD:22 Sink:MaD:4 |
+| test.go:11:15:11:41 | call to UserAgent | test.go:16:26:16:34 | untrusted | provenance | Src:MaD:22 Sink:MaD:5 |
+| test.go:11:15:11:41 | call to UserAgent | test.go:17:12:17:20 | untrusted | provenance | Src:MaD:22 Sink:MaD:6 |
+| test.go:11:15:11:41 | call to UserAgent | test.go:18:24:18:32 | untrusted | provenance | Src:MaD:22 Sink:MaD:7 |
+| test.go:11:15:11:41 | call to UserAgent | test.go:19:15:19:23 | untrusted | provenance | Src:MaD:22 Sink:MaD:8 |
+| test.go:11:15:11:41 | call to UserAgent | test.go:20:27:20:35 | untrusted | provenance | Src:MaD:22 Sink:MaD:9 |
+| test.go:25:15:25:41 | call to UserAgent | test.go:28:12:28:20 | untrusted | provenance | Src:MaD:22  |
+| test.go:25:15:25:41 | call to UserAgent | test.go:29:10:29:18 | untrusted | provenance | Src:MaD:22  |
+| test.go:25:15:25:41 | call to UserAgent | test.go:30:15:30:23 | untrusted | provenance | Src:MaD:22 Sink:MaD:13 |
+| test.go:25:15:25:41 | call to UserAgent | test.go:31:14:31:22 | untrusted | provenance | Src:MaD:22 Sink:MaD:15 |
+| test.go:25:15:25:41 | call to UserAgent | test.go:32:15:32:23 | untrusted | provenance | Src:MaD:22 Sink:MaD:18 |
+| test.go:25:15:25:41 | call to UserAgent | test.go:33:8:33:16 | untrusted | provenance | Src:MaD:22 Sink:MaD:16 |
+| test.go:25:15:25:41 | call to UserAgent | test.go:34:11:34:19 | untrusted | provenance | Src:MaD:22 Sink:MaD:20 |
+| test.go:25:15:25:41 | call to UserAgent | test.go:35:9:35:17 | untrusted | provenance | Src:MaD:22 Sink:MaD:11 |
+| test.go:25:15:25:41 | call to UserAgent | test.go:36:8:36:16 | untrusted | provenance | Src:MaD:22 Sink:MaD:17 |
+| test.go:25:15:25:41 | call to UserAgent | test.go:37:8:37:16 | untrusted | provenance | Src:MaD:22  |
+| test.go:25:15:25:41 | call to UserAgent | test.go:38:13:38:21 | untrusted | provenance | Src:MaD:22  |
+| test.go:25:15:25:41 | call to UserAgent | test.go:39:13:39:21 | untrusted | provenance | Src:MaD:22  |
+| test.go:25:15:25:41 | call to UserAgent | test.go:40:12:40:20 | untrusted | provenance | Src:MaD:22 Sink:MaD:12 |
+| test.go:25:15:25:41 | call to UserAgent | test.go:41:12:41:20 | untrusted | provenance | Src:MaD:22  |
+| test.go:25:15:25:41 | call to UserAgent | test.go:42:9:42:17 | untrusted | provenance | Src:MaD:22  |
+| test.go:25:15:25:41 | call to UserAgent | test.go:43:12:43:20 | untrusted | provenance | Src:MaD:22  |
+| test.go:25:15:25:41 | call to UserAgent | test.go:44:16:44:24 | untrusted | provenance | Src:MaD:22 Sink:MaD:14 |
+| test.go:25:15:25:41 | call to UserAgent | test.go:45:12:45:20 | untrusted | provenance | Src:MaD:22  |
+| test.go:25:15:25:41 | call to UserAgent | test.go:46:14:46:22 | untrusted | provenance | Src:MaD:22 Sink:MaD:19 |
+| test.go:26:16:26:42 | call to UserAgent | test.go:44:27:44:36 | untrusted2 | provenance | Src:MaD:22  |
+| test.go:26:16:26:42 | call to UserAgent | test.go:46:25:46:34 | untrusted2 | provenance | Src:MaD:22 Sink:MaD:19 |
+| test.go:50:15:50:41 | call to UserAgent | test.go:52:12:52:20 | untrusted | provenance | Src:MaD:22 Sink:MaD:10 |
+| test.go:57:15:57:41 | call to UserAgent | test.go:59:31:59:39 | untrusted | provenance | Src:MaD:22 Sink:MaD:21 |
+| test.go:63:15:63:41 | call to UserAgent | test.go:65:19:65:27 | untrusted | provenance | Src:MaD:22 Sink:MaD:1 |
 models
-| 1 | Source: net/http; Request; true; UserAgent; ; ; ReturnValue; remote; manual |
+| 1 | Sink: group:beego-orm; Condition; true; Raw; ; ; Argument[1]; sql-injection; manual |
+| 2 | Sink: group:beego-orm; DB; true; Exec; ; ; Argument[0]; sql-injection; manual |
+| 3 | Sink: group:beego-orm; DB; true; ExecContext; ; ; Argument[1]; sql-injection; manual |
+| 4 | Sink: group:beego-orm; DB; true; Prepare; ; ; Argument[0]; sql-injection; manual |
+| 5 | Sink: group:beego-orm; DB; true; PrepareContext; ; ; Argument[1]; sql-injection; manual |
+| 6 | Sink: group:beego-orm; DB; true; Query; ; ; Argument[0]; sql-injection; manual |
+| 7 | Sink: group:beego-orm; DB; true; QueryContext; ; ; Argument[1]; sql-injection; manual |
+| 8 | Sink: group:beego-orm; DB; true; QueryRow; ; ; Argument[0]; sql-injection; manual |
+| 9 | Sink: group:beego-orm; DB; true; QueryRowContext; ; ; Argument[1]; sql-injection; manual |
+| 10 | Sink: group:beego-orm; Ormer; true; Raw; ; ; Argument[0]; sql-injection; manual |
+| 11 | Sink: group:beego-orm; QueryBuilder; true; And; ; ; Argument[0]; sql-injection; manual |
+| 12 | Sink: group:beego-orm; QueryBuilder; true; Having; ; ; Argument[0]; sql-injection; manual |
+| 13 | Sink: group:beego-orm; QueryBuilder; true; InnerJoin; ; ; Argument[0]; sql-injection; manual |
+| 14 | Sink: group:beego-orm; QueryBuilder; true; InsertInto; ; ; Argument[0..1]; sql-injection; manual |
+| 15 | Sink: group:beego-orm; QueryBuilder; true; LeftJoin; ; ; Argument[0]; sql-injection; manual |
+| 16 | Sink: group:beego-orm; QueryBuilder; true; On; ; ; Argument[0]; sql-injection; manual |
+| 17 | Sink: group:beego-orm; QueryBuilder; true; Or; ; ; Argument[0]; sql-injection; manual |
+| 18 | Sink: group:beego-orm; QueryBuilder; true; RightJoin; ; ; Argument[0]; sql-injection; manual |
+| 19 | Sink: group:beego-orm; QueryBuilder; true; Subquery; ; ; Argument[0..1]; sql-injection; manual |
+| 20 | Sink: group:beego-orm; QueryBuilder; true; Where; ; ; Argument[0]; sql-injection; manual |
+| 21 | Sink: group:beego-orm; QuerySeter; true; FilterRaw; ; ; Argument[1]; sql-injection; manual |
+| 22 | Source: net/http; Request; true; UserAgent; ; ; ReturnValue; remote; manual |
 nodes
 | test.go:11:15:11:41 | call to UserAgent | semmle.label | call to UserAgent |
 | test.go:13:11:13:19 | untrusted | semmle.label | untrusted |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/CouchbaseV1/test.expected b/go/ql/test/library-tests/semmle/go/frameworks/CouchbaseV1/test.expected
index 105b7026d0c..42831abaf15 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/CouchbaseV1/test.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/CouchbaseV1/test.expected
@@ -1,3 +1,2 @@
-failures
 invalidModelRow
 testFailures
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/ElazarlGoproxy/test.expected b/go/ql/test/library-tests/semmle/go/frameworks/ElazarlGoproxy/test.expected
index 105b7026d0c..42831abaf15 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/ElazarlGoproxy/test.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/ElazarlGoproxy/test.expected
@@ -1,3 +1,2 @@
-failures
 invalidModelRow
 testFailures
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/EscapeFunction.expected b/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/EscapeFunction.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/EscapeFunction.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/EscapeFunction.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/FileSystemAccess.expected b/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/FileSystemAccess.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/FileSystemAccess.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/FileSystemAccess.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/OpenRedirect.expected b/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/OpenRedirect.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/OpenRedirect.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/OpenRedirect.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/RemoteFlowSources.expected b/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/RemoteFlowSources.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/RemoteFlowSources.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/RemoteFlowSources.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/SSRF.expected b/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/SSRF.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/SSRF.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/SSRF.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/Xss.expected b/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/Xss.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/Xss.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Fasthttp/Xss.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Fiber/Query.expected b/go/ql/test/library-tests/semmle/go/frameworks/Fiber/Query.expected
index 105b7026d0c..42831abaf15 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Fiber/Query.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Fiber/Query.expected
@@ -1,3 +1,2 @@
-failures
 invalidModelRow
 testFailures
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/GoKit/RemoteFlowSources.expected b/go/ql/test/library-tests/semmle/go/frameworks/GoKit/RemoteFlowSources.expected
index 105b7026d0c..42831abaf15 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/GoKit/RemoteFlowSources.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/GoKit/RemoteFlowSources.expected
@@ -1,3 +1,2 @@
-failures
 invalidModelRow
 testFailures
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/GoMicro/gomicro.expected b/go/ql/test/library-tests/semmle/go/frameworks/GoMicro/gomicro.expected
index 105b7026d0c..42831abaf15 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/GoMicro/gomicro.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/GoMicro/gomicro.expected
@@ -1,3 +1,2 @@
-failures
 invalidModelRow
 testFailures
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Iris/Query.expected b/go/ql/test/library-tests/semmle/go/frameworks/Iris/Query.expected
index 105b7026d0c..42831abaf15 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Iris/Query.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Iris/Query.expected
@@ -1,3 +1,2 @@
-failures
 invalidModelRow
 testFailures
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/K8sIoClientGo/SecretInterfaceSource.expected b/go/ql/test/library-tests/semmle/go/frameworks/K8sIoClientGo/SecretInterfaceSource.expected
index 105b7026d0c..42831abaf15 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/K8sIoClientGo/SecretInterfaceSource.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/K8sIoClientGo/SecretInterfaceSource.expected
@@ -1,3 +1,2 @@
-failures
 invalidModelRow
 testFailures
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Macaron/Sources.expected b/go/ql/test/library-tests/semmle/go/frameworks/Macaron/Sources.expected
index 105b7026d0c..42831abaf15 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Macaron/Sources.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Macaron/Sources.expected
@@ -1,3 +1,2 @@
-failures
 invalidModelRow
 testFailures
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/NoSQL/Query.expected b/go/ql/test/library-tests/semmle/go/frameworks/NoSQL/Query.expected
index 105b7026d0c..42831abaf15 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/NoSQL/Query.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/NoSQL/Query.expected
@@ -1,3 +1,2 @@
-failures
 invalidModelRow
 testFailures
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Revel/test.expected b/go/ql/test/library-tests/semmle/go/frameworks/Revel/test.expected
index 48de9172b36..e69de29bb2d 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Revel/test.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Revel/test.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/Gorm/QueryString.expected b/go/ql/test/library-tests/semmle/go/frameworks/SQL/Gorm/QueryString.expected
new file mode 100644
index 00000000000..55e9aed2e93
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/SQL/Gorm/QueryString.expected
@@ -0,0 +1,2 @@
+testFailures
+invalidModelRow
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/Gorm/QueryString.ql b/go/ql/test/library-tests/semmle/go/frameworks/SQL/Gorm/QueryString.ql
new file mode 100644
index 00000000000..eeb43a82fad
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/SQL/Gorm/QueryString.ql
@@ -0,0 +1,60 @@
+import go
+import semmle.go.dataflow.ExternalFlow
+import ModelValidation
+import TestUtilities.InlineExpectationsTest
+
+module SqlTest implements TestSig {
+  string getARelevantTag() { result = "query" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "query" and
+    exists(SQL::Query q, SQL::QueryString qs | qs = q.getAQueryString() |
+      q.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = q.toString() and
+      value = qs.toString()
+    )
+  }
+}
+
+module QueryString implements TestSig {
+  string getARelevantTag() { result = "querystring" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "querystring" and
+    element = "" and
+    exists(SQL::QueryString qs | not exists(SQL::Query q | qs = q.getAQueryString()) |
+      qs.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      value = qs.toString()
+    )
+  }
+}
+
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node n) { n.asExpr() instanceof StringLit }
+
+  predicate isSink(DataFlow::Node n) {
+    n = any(DataFlow::CallNode cn | cn.getTarget().getName() = "sink").getAnArgument()
+  }
+}
+
+module Flow = TaintTracking::Global<Config>;
+
+module TaintFlow implements TestSig {
+  string getARelevantTag() { result = "flowfrom" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "flowfrom" and
+    element = "" and
+    exists(DataFlow::Node fromNode, DataFlow::Node toNode |
+      toNode
+          .hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+            location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      Flow::flow(fromNode, toNode) and
+      value = fromNode.asExpr().(StringLit).getValue()
+    )
+  }
+}
+
+import MakeTest<MergeTests3<SqlTest, QueryString, TaintFlow>>
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/Gorm/gorm.expected b/go/ql/test/library-tests/semmle/go/frameworks/SQL/Gorm/gorm.expected
deleted file mode 100644
index ca70ed07c33..00000000000
--- a/go/ql/test/library-tests/semmle/go/frameworks/SQL/Gorm/gorm.expected
+++ /dev/null
@@ -1,25 +0,0 @@
-| gorm.go:20:12:20:20 | untrusted | github.com/jinzhu/gorm | DB | Where |
-| gorm.go:21:10:21:18 | untrusted | github.com/jinzhu/gorm | DB | Raw |
-| gorm.go:22:10:22:18 | untrusted | github.com/jinzhu/gorm | DB | Not |
-| gorm.go:23:12:23:20 | untrusted | github.com/jinzhu/gorm | DB | Order |
-| gorm.go:24:9:24:17 | untrusted | github.com/jinzhu/gorm | DB | Or |
-| gorm.go:25:13:25:21 | untrusted | github.com/jinzhu/gorm | DB | Select |
-| gorm.go:26:12:26:20 | untrusted | github.com/jinzhu/gorm | DB | Table |
-| gorm.go:27:12:27:20 | untrusted | github.com/jinzhu/gorm | DB | Group |
-| gorm.go:28:13:28:21 | untrusted | github.com/jinzhu/gorm | DB | Having |
-| gorm.go:29:12:29:20 | untrusted | github.com/jinzhu/gorm | DB | Joins |
-| gorm.go:30:11:30:19 | untrusted | github.com/jinzhu/gorm | DB | Exec |
-| gorm.go:31:12:31:20 | untrusted | github.com/jinzhu/gorm | DB | Pluck |
-| gorm.go:34:12:34:20 | untrusted | gorm.io/gorm | DB | Where |
-| gorm.go:35:10:35:18 | untrusted | gorm.io/gorm | DB | Raw |
-| gorm.go:36:10:36:18 | untrusted | gorm.io/gorm | DB | Not |
-| gorm.go:37:12:37:20 | untrusted | gorm.io/gorm | DB | Order |
-| gorm.go:38:9:38:17 | untrusted | gorm.io/gorm | DB | Or |
-| gorm.go:39:13:39:21 | untrusted | gorm.io/gorm | DB | Select |
-| gorm.go:40:12:40:20 | untrusted | gorm.io/gorm | DB | Table |
-| gorm.go:41:12:41:20 | untrusted | gorm.io/gorm | DB | Group |
-| gorm.go:42:13:42:21 | untrusted | gorm.io/gorm | DB | Having |
-| gorm.go:43:12:43:20 | untrusted | gorm.io/gorm | DB | Joins |
-| gorm.go:44:11:44:19 | untrusted | gorm.io/gorm | DB | Exec |
-| gorm.go:45:15:45:23 | untrusted | gorm.io/gorm | DB | Distinct |
-| gorm.go:46:12:46:20 | untrusted | gorm.io/gorm | DB | Pluck |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/Gorm/gorm.go b/go/ql/test/library-tests/semmle/go/frameworks/SQL/Gorm/gorm.go
index bee8edbf7af..2d736e2407c 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/SQL/Gorm/gorm.go
+++ b/go/ql/test/library-tests/semmle/go/frameworks/SQL/Gorm/gorm.go
@@ -13,36 +13,35 @@ func getUntrustedString() string {
 }
 
 func main() {
-
 	untrusted := getUntrustedString()
 
 	db1 := gorm1.DB{}
-	db1.Where(untrusted)
-	db1.Raw(untrusted)
-	db1.Not(untrusted)
-	db1.Order(untrusted)
-	db1.Or(untrusted)
-	db1.Select(untrusted)
-	db1.Table(untrusted)
-	db1.Group(untrusted)
-	db1.Having(untrusted)
-	db1.Joins(untrusted)
-	db1.Exec(untrusted)
-	db1.Pluck(untrusted, nil)
+	db1.Where(untrusted)      // $ querystring=untrusted
+	db1.Raw(untrusted)        // $ querystring=untrusted
+	db1.Not(untrusted)        // $ querystring=untrusted
+	db1.Order(untrusted)      // $ querystring=untrusted
+	db1.Or(untrusted)         // $ querystring=untrusted
+	db1.Select(untrusted)     // $ querystring=untrusted
+	db1.Table(untrusted)      // $ querystring=untrusted
+	db1.Group(untrusted)      // $ querystring=untrusted
+	db1.Having(untrusted)     // $ querystring=untrusted
+	db1.Joins(untrusted)      // $ querystring=untrusted
+	db1.Exec(untrusted)       // $ querystring=untrusted
+	db1.Pluck(untrusted, nil) // $ querystring=untrusted
 
 	db2 := gorm2.DB{}
-	db2.Where(untrusted)
-	db2.Raw(untrusted)
-	db2.Not(untrusted)
-	db2.Order(untrusted)
-	db2.Or(untrusted)
-	db2.Select(untrusted)
-	db2.Table(untrusted)
-	db2.Group(untrusted)
-	db2.Having(untrusted)
-	db2.Joins(untrusted)
-	db2.Exec(untrusted)
-	db2.Distinct(untrusted)
-	db2.Pluck(untrusted, nil)
+	db2.Where(untrusted)      // $ querystring=untrusted
+	db2.Raw(untrusted)        // $ querystring=untrusted
+	db2.Not(untrusted)        // $ querystring=untrusted
+	db2.Order(untrusted)      // $ querystring=untrusted
+	db2.Or(untrusted)         // $ querystring=untrusted
+	db2.Select(untrusted)     // $ querystring=untrusted
+	db2.Table(untrusted)      // $ querystring=untrusted
+	db2.Group(untrusted)      // $ querystring=untrusted
+	db2.Having(untrusted)     // $ querystring=untrusted
+	db2.Joins(untrusted)      // $ querystring=untrusted
+	db2.Exec(untrusted)       // $ querystring=untrusted
+	db2.Distinct(untrusted)   // $ querystring=untrusted
+	db2.Pluck(untrusted, nil) // $ querystring=untrusted
 
 }
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/Gorm/gorm.ql b/go/ql/test/library-tests/semmle/go/frameworks/SQL/Gorm/gorm.ql
deleted file mode 100644
index e08b506deaf..00000000000
--- a/go/ql/test/library-tests/semmle/go/frameworks/SQL/Gorm/gorm.ql
+++ /dev/null
@@ -1,5 +0,0 @@
-import go
-
-from SQL::QueryString qs, Method meth, string a, string b, string c
-where meth.hasQualifiedName(a, b, c) and qs = meth.getACall().getSyntacticArgument(0)
-select qs, a, b, c
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/QueryString.expected b/go/ql/test/library-tests/semmle/go/frameworks/SQL/QueryString.expected
index 105b7026d0c..42831abaf15 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/SQL/QueryString.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/SQL/QueryString.expected
@@ -1,3 +1,2 @@
-failures
 invalidModelRow
 testFailures
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/Sqlx/QueryString.expected b/go/ql/test/library-tests/semmle/go/frameworks/SQL/Sqlx/QueryString.expected
new file mode 100644
index 00000000000..55e9aed2e93
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/SQL/Sqlx/QueryString.expected
@@ -0,0 +1,2 @@
+testFailures
+invalidModelRow
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/Sqlx/QueryString.ql b/go/ql/test/library-tests/semmle/go/frameworks/SQL/Sqlx/QueryString.ql
new file mode 100644
index 00000000000..eeb43a82fad
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/SQL/Sqlx/QueryString.ql
@@ -0,0 +1,60 @@
+import go
+import semmle.go.dataflow.ExternalFlow
+import ModelValidation
+import TestUtilities.InlineExpectationsTest
+
+module SqlTest implements TestSig {
+  string getARelevantTag() { result = "query" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "query" and
+    exists(SQL::Query q, SQL::QueryString qs | qs = q.getAQueryString() |
+      q.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = q.toString() and
+      value = qs.toString()
+    )
+  }
+}
+
+module QueryString implements TestSig {
+  string getARelevantTag() { result = "querystring" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "querystring" and
+    element = "" and
+    exists(SQL::QueryString qs | not exists(SQL::Query q | qs = q.getAQueryString()) |
+      qs.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      value = qs.toString()
+    )
+  }
+}
+
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node n) { n.asExpr() instanceof StringLit }
+
+  predicate isSink(DataFlow::Node n) {
+    n = any(DataFlow::CallNode cn | cn.getTarget().getName() = "sink").getAnArgument()
+  }
+}
+
+module Flow = TaintTracking::Global<Config>;
+
+module TaintFlow implements TestSig {
+  string getARelevantTag() { result = "flowfrom" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "flowfrom" and
+    element = "" and
+    exists(DataFlow::Node fromNode, DataFlow::Node toNode |
+      toNode
+          .hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+            location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      Flow::flow(fromNode, toNode) and
+      value = fromNode.asExpr().(StringLit).getValue()
+    )
+  }
+}
+
+import MakeTest<MergeTests3<SqlTest, QueryString, TaintFlow>>
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/Sqlx/sqlx.expected b/go/ql/test/library-tests/semmle/go/frameworks/SQL/Sqlx/sqlx.expected
deleted file mode 100644
index 0540a78fb34..00000000000
--- a/go/ql/test/library-tests/semmle/go/frameworks/SQL/Sqlx/sqlx.expected
+++ /dev/null
@@ -1,12 +0,0 @@
-| sqlx.go:15:17:15:25 | untrusted |
-| sqlx.go:16:14:16:22 | untrusted |
-| sqlx.go:17:14:17:22 | untrusted |
-| sqlx.go:18:12:18:20 | untrusted |
-| sqlx.go:19:15:19:23 | untrusted |
-| sqlx.go:20:16:20:24 | untrusted |
-| sqlx.go:23:17:23:25 | untrusted |
-| sqlx.go:24:14:24:22 | untrusted |
-| sqlx.go:25:14:25:22 | untrusted |
-| sqlx.go:26:12:26:20 | untrusted |
-| sqlx.go:27:15:27:23 | untrusted |
-| sqlx.go:28:16:28:24 | untrusted |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/Sqlx/sqlx.go b/go/ql/test/library-tests/semmle/go/frameworks/SQL/Sqlx/sqlx.go
index edc29c4d4ee..e4e8d43395b 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/SQL/Sqlx/sqlx.go
+++ b/go/ql/test/library-tests/semmle/go/frameworks/SQL/Sqlx/sqlx.go
@@ -12,19 +12,19 @@ func main() {
 
 	db := sqlx.DB{}
 	untrusted := getUntrustedString()
-	db.Select(nil, untrusted)
-	db.Get(nil, untrusted)
-	db.MustExec(untrusted)
-	db.Queryx(untrusted)
-	db.NamedExec(untrusted, nil)
-	db.NamedQuery(untrusted, nil)
+	db.Select(nil, untrusted)     // $ querystring=untrusted
+	db.Get(nil, untrusted)        // $ querystring=untrusted
+	db.MustExec(untrusted)        // $ querystring=untrusted
+	db.Queryx(untrusted)          // $ querystring=untrusted
+	db.NamedExec(untrusted, nil)  // $ querystring=untrusted
+	db.NamedQuery(untrusted, nil) // $ querystring=untrusted
 
 	tx := sqlx.Tx{}
-	tx.Select(nil, untrusted)
-	tx.Get(nil, untrusted)
-	tx.MustExec(untrusted)
-	tx.Queryx(untrusted)
-	tx.NamedExec(untrusted, nil)
-	tx.NamedQuery(untrusted, nil)
+	tx.Select(nil, untrusted)     // $ querystring=untrusted
+	tx.Get(nil, untrusted)        // $ querystring=untrusted
+	tx.MustExec(untrusted)        // $ querystring=untrusted
+	tx.Queryx(untrusted)          // $ querystring=untrusted
+	tx.NamedExec(untrusted, nil)  // $ querystring=untrusted
+	tx.NamedQuery(untrusted, nil) // $ querystring=untrusted
 
 }
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/Sqlx/sqlx.ql b/go/ql/test/library-tests/semmle/go/frameworks/SQL/Sqlx/sqlx.ql
deleted file mode 100644
index 7b56fd97441..00000000000
--- a/go/ql/test/library-tests/semmle/go/frameworks/SQL/Sqlx/sqlx.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-import go
-
-from SQL::QueryString qs
-select qs
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/bun/QueryString.expected b/go/ql/test/library-tests/semmle/go/frameworks/SQL/bun/QueryString.expected
new file mode 100644
index 00000000000..42831abaf15
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/SQL/bun/QueryString.expected
@@ -0,0 +1,2 @@
+invalidModelRow
+testFailures
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/bun/QueryString.ql b/go/ql/test/library-tests/semmle/go/frameworks/SQL/bun/QueryString.ql
new file mode 100644
index 00000000000..eeb43a82fad
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/SQL/bun/QueryString.ql
@@ -0,0 +1,60 @@
+import go
+import semmle.go.dataflow.ExternalFlow
+import ModelValidation
+import TestUtilities.InlineExpectationsTest
+
+module SqlTest implements TestSig {
+  string getARelevantTag() { result = "query" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "query" and
+    exists(SQL::Query q, SQL::QueryString qs | qs = q.getAQueryString() |
+      q.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = q.toString() and
+      value = qs.toString()
+    )
+  }
+}
+
+module QueryString implements TestSig {
+  string getARelevantTag() { result = "querystring" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "querystring" and
+    element = "" and
+    exists(SQL::QueryString qs | not exists(SQL::Query q | qs = q.getAQueryString()) |
+      qs.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      value = qs.toString()
+    )
+  }
+}
+
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node n) { n.asExpr() instanceof StringLit }
+
+  predicate isSink(DataFlow::Node n) {
+    n = any(DataFlow::CallNode cn | cn.getTarget().getName() = "sink").getAnArgument()
+  }
+}
+
+module Flow = TaintTracking::Global<Config>;
+
+module TaintFlow implements TestSig {
+  string getARelevantTag() { result = "flowfrom" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "flowfrom" and
+    element = "" and
+    exists(DataFlow::Node fromNode, DataFlow::Node toNode |
+      toNode
+          .hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+            location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      Flow::flow(fromNode, toNode) and
+      value = fromNode.asExpr().(StringLit).getValue()
+    )
+  }
+}
+
+import MakeTest<MergeTests3<SqlTest, QueryString, TaintFlow>>
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/bun/bun.go b/go/ql/test/library-tests/semmle/go/frameworks/SQL/bun/bun.go
index 8ce4e5b0826..44a2e2c2fce 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/SQL/bun/bun.go
+++ b/go/ql/test/library-tests/semmle/go/frameworks/SQL/bun/bun.go
@@ -22,28 +22,28 @@ func main() {
 		panic(err)
 	}
 	db := bun.NewDB(sqlite, sqlitedialect.New())
-	bun.NewRawQuery(db, untrusted)
+	bun.NewRawQuery(db, untrusted) // $ querystring=untrusted
 
-	db.ExecContext(ctx, untrusted)
-	db.PrepareContext(ctx, untrusted)
-	db.QueryContext(ctx, untrusted)
-	db.QueryRowContext(ctx, untrusted)
+	db.ExecContext(ctx, untrusted)     // $ querystring=untrusted
+	db.PrepareContext(ctx, untrusted)  // $ querystring=untrusted
+	db.QueryContext(ctx, untrusted)    // $ querystring=untrusted
+	db.QueryRowContext(ctx, untrusted) // $ querystring=untrusted
 
-	db.Exec(untrusted)
-	db.NewRaw(untrusted)
-	db.Prepare(untrusted)
-	db.Query(untrusted)
-	db.QueryRow(untrusted)
-	db.Raw(untrusted)
+	db.Exec(untrusted)     // $ querystring=untrusted
+	db.NewRaw(untrusted)   // $ querystring=untrusted
+	db.Prepare(untrusted)  // $ querystring=untrusted
+	db.Query(untrusted)    // $ querystring=untrusted
+	db.QueryRow(untrusted) // $ querystring=untrusted
+	db.Raw(untrusted)      // $ querystring=untrusted
 
-	db.NewSelect().ColumnExpr(untrusted)
-	db.NewSelect().DistinctOn(untrusted)
-	db.NewSelect().For(untrusted)
-	db.NewSelect().GroupExpr(untrusted)
-	db.NewSelect().Having(untrusted)
-	db.NewSelect().ModelTableExpr(untrusted)
-	db.NewSelect().OrderExpr(untrusted)
-	db.NewSelect().TableExpr(untrusted)
-	db.NewSelect().Where(untrusted)
-	db.NewSelect().WhereOr(untrusted)
+	db.NewSelect().ColumnExpr(untrusted)     // $ querystring=untrusted
+	db.NewSelect().DistinctOn(untrusted)     // $ querystring=untrusted
+	db.NewSelect().For(untrusted)            // $ querystring=untrusted
+	db.NewSelect().GroupExpr(untrusted)      // $ querystring=untrusted
+	db.NewSelect().Having(untrusted)         // $ querystring=untrusted
+	db.NewSelect().ModelTableExpr(untrusted) // $ querystring=untrusted
+	db.NewSelect().OrderExpr(untrusted)      // $ querystring=untrusted
+	db.NewSelect().TableExpr(untrusted)      // $ querystring=untrusted
+	db.NewSelect().Where(untrusted)          // $ querystring=untrusted
+	db.NewSelect().WhereOr(untrusted)        // $ querystring=untrusted
 }
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/gogf/QueryString.expected b/go/ql/test/library-tests/semmle/go/frameworks/SQL/gogf/QueryString.expected
new file mode 100644
index 00000000000..55e9aed2e93
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/SQL/gogf/QueryString.expected
@@ -0,0 +1,2 @@
+testFailures
+invalidModelRow
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/gogf/QueryString.ql b/go/ql/test/library-tests/semmle/go/frameworks/SQL/gogf/QueryString.ql
new file mode 100644
index 00000000000..eeb43a82fad
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/SQL/gogf/QueryString.ql
@@ -0,0 +1,60 @@
+import go
+import semmle.go.dataflow.ExternalFlow
+import ModelValidation
+import TestUtilities.InlineExpectationsTest
+
+module SqlTest implements TestSig {
+  string getARelevantTag() { result = "query" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "query" and
+    exists(SQL::Query q, SQL::QueryString qs | qs = q.getAQueryString() |
+      q.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = q.toString() and
+      value = qs.toString()
+    )
+  }
+}
+
+module QueryString implements TestSig {
+  string getARelevantTag() { result = "querystring" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "querystring" and
+    element = "" and
+    exists(SQL::QueryString qs | not exists(SQL::Query q | qs = q.getAQueryString()) |
+      qs.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      value = qs.toString()
+    )
+  }
+}
+
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node n) { n.asExpr() instanceof StringLit }
+
+  predicate isSink(DataFlow::Node n) {
+    n = any(DataFlow::CallNode cn | cn.getTarget().getName() = "sink").getAnArgument()
+  }
+}
+
+module Flow = TaintTracking::Global<Config>;
+
+module TaintFlow implements TestSig {
+  string getARelevantTag() { result = "flowfrom" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "flowfrom" and
+    element = "" and
+    exists(DataFlow::Node fromNode, DataFlow::Node toNode |
+      toNode
+          .hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+            location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      Flow::flow(fromNode, toNode) and
+      value = fromNode.asExpr().(StringLit).getValue()
+    )
+  }
+}
+
+import MakeTest<MergeTests3<SqlTest, QueryString, TaintFlow>>
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/gogf/gogf.expected b/go/ql/test/library-tests/semmle/go/frameworks/SQL/gogf/gogf.expected
deleted file mode 100644
index f4e3e4f15b0..00000000000
--- a/go/ql/test/library-tests/semmle/go/frameworks/SQL/gogf/gogf.expected
+++ /dev/null
@@ -1,47 +0,0 @@
-| gogf.go:12:9:12:11 | sql |
-| gogf.go:13:11:13:13 | sql |
-| gogf.go:14:13:14:15 | sql |
-| gogf.go:15:13:15:15 | sql |
-| gogf.go:16:11:16:13 | sql |
-| gogf.go:17:13:17:15 | sql |
-| gogf.go:18:12:18:14 | sql |
-| gogf.go:19:10:19:12 | sql |
-| gogf.go:20:8:20:10 | sql |
-| gogf.go:21:17:21:19 | sql |
-| gogf.go:22:19:22:21 | sql |
-| gogf.go:23:20:23:22 | sql |
-| gogf.go:24:23:24:25 | sql |
-| gogf.go:25:21:25:23 | sql |
-| gogf.go:26:23:26:25 | sql |
-| gogf.go:27:22:27:24 | sql |
-| gogf.go:28:24:28:26 | sql |
-| gogf.go:32:9:32:11 | sql |
-| gogf.go:33:11:33:13 | sql |
-| gogf.go:34:13:34:15 | sql |
-| gogf.go:35:13:35:15 | sql |
-| gogf.go:36:11:36:13 | sql |
-| gogf.go:37:13:37:15 | sql |
-| gogf.go:38:12:38:14 | sql |
-| gogf.go:39:10:39:12 | sql |
-| gogf.go:40:8:40:10 | sql |
-| gogf.go:41:17:41:19 | sql |
-| gogf.go:42:23:42:25 | sql |
-| gogf.go:43:21:43:23 | sql |
-| gogf.go:44:23:44:25 | sql |
-| gogf.go:45:22:45:24 | sql |
-| gogf.go:46:24:46:26 | sql |
-| gogf.go:51:9:51:11 | sql |
-| gogf.go:52:11:52:13 | sql |
-| gogf.go:53:13:53:15 | sql |
-| gogf.go:54:13:54:15 | sql |
-| gogf.go:55:11:55:13 | sql |
-| gogf.go:56:13:56:15 | sql |
-| gogf.go:57:12:57:14 | sql |
-| gogf.go:58:10:58:12 | sql |
-| gogf.go:59:8:59:10 | sql |
-| gogf.go:60:17:60:19 | sql |
-| gogf.go:61:23:61:25 | sql |
-| gogf.go:62:21:62:23 | sql |
-| gogf.go:63:23:63:25 | sql |
-| gogf.go:64:22:64:24 | sql |
-| gogf.go:65:24:65:26 | sql |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/gogf/gogf.go b/go/ql/test/library-tests/semmle/go/frameworks/SQL/gogf/gogf.go
index d0eceaf862c..e2db8016cf0 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/SQL/gogf/gogf.go
+++ b/go/ql/test/library-tests/semmle/go/frameworks/SQL/gogf/gogf.go
@@ -4,11 +4,13 @@ package main
 //go:generate depstubber -vendor github.com/gogf/gf/database/gdb DB,Core,TX ""
 
 import (
+	"context"
+
 	"github.com/gogf/gf/database/gdb"
 	"github.com/gogf/gf/frame/g"
 )
 
-func gogfCoreTest(sql string, c *gdb.Core) {
+func gogfCoreTest(sql string, c *gdb.Core, ctx context.Context) {
 	c.Exec(sql, nil)               // $ querystring=sql
 	c.GetAll(sql, nil)             // $ querystring=sql
 	c.GetArray(sql, nil)           // $ querystring=sql
@@ -21,14 +23,14 @@ func gogfCoreTest(sql string, c *gdb.Core) {
 	c.GetScan(nil, sql, nil)       // $ querystring=sql
 	c.GetStruct(nil, sql, nil)     // $ querystring=sql
 	c.GetStructs(nil, sql, nil)    // $ querystring=sql
-	c.DoCommit(nil, nil, sql, nil) // $ querystring=sql
-	c.DoExec(nil, nil, sql, nil)   // $ querystring=sql
-	c.DoGetAll(nil, nil, sql, nil) // $ querystring=sql
-	c.DoQuery(nil, nil, sql, nil)  // $ querystring=sql
-	c.DoPrepare(nil, nil, sql)     // $ querystring=sql
+	c.DoCommit(ctx, nil, sql, nil) // $ querystring=sql
+	c.DoExec(ctx, nil, sql, nil)   // $ querystring=sql
+	c.DoGetAll(ctx, nil, sql, nil) // $ querystring=sql
+	c.DoQuery(ctx, nil, sql, nil)  // $ querystring=sql
+	c.DoPrepare(ctx, nil, sql)     // $ querystring=sql
 }
 
-func gogfDbtest(sql string, c gdb.DB) {
+func gogfDbtest(sql string, c gdb.DB, ctx context.Context) {
 	c.Exec(sql, nil)               // $ querystring=sql
 	c.GetAll(sql, nil)             // $ querystring=sql
 	c.GetArray(sql, nil)           // $ querystring=sql
@@ -39,14 +41,14 @@ func gogfDbtest(sql string, c gdb.DB) {
 	c.Query(sql, nil)              // $ querystring=sql
 	c.Raw(sql, nil)                // $ querystring=sql
 	c.GetScan(nil, sql, nil)       // $ querystring=sql
-	c.DoCommit(nil, nil, sql, nil) // $ querystring=sql
-	c.DoExec(nil, nil, sql, nil)   // $ querystring=sql
-	c.DoGetAll(nil, nil, sql, nil) // $ querystring=sql
-	c.DoQuery(nil, nil, sql, nil)  // $ querystring=sql
-	c.DoPrepare(nil, nil, sql)     // $ querystring=sql
+	c.DoCommit(ctx, nil, sql, nil) // $ querystring=sql
+	c.DoExec(ctx, nil, sql, nil)   // $ querystring=sql
+	c.DoGetAll(ctx, nil, sql, nil) // $ querystring=sql
+	c.DoQuery(ctx, nil, sql, nil)  // $ querystring=sql
+	c.DoPrepare(ctx, nil, sql)     // $ querystring=sql
 }
 
-func gogfGTest(sql string) {
+func gogfGTest(sql string, ctx context.Context) {
 	c := g.DB("ad")
 	c.Exec(sql, nil)               // $ querystring=sql
 	c.GetAll(sql, nil)             // $ querystring=sql
@@ -58,11 +60,11 @@ func gogfGTest(sql string) {
 	c.Query(sql, nil)              // $ querystring=sql
 	c.Raw(sql, nil)                // $ querystring=sql
 	c.GetScan(nil, sql, nil)       // $ querystring=sql
-	c.DoCommit(nil, nil, sql, nil) // $ querystring=sql
-	c.DoExec(nil, nil, sql, nil)   // $ querystring=sql
-	c.DoGetAll(nil, nil, sql, nil) // $ querystring=sql
-	c.DoQuery(nil, nil, sql, nil)  // $ querystring=sql
-	c.DoPrepare(nil, nil, sql)     // $ querystring=sql
+	c.DoCommit(ctx, nil, sql, nil) // $ querystring=sql
+	c.DoExec(ctx, nil, sql, nil)   // $ querystring=sql
+	c.DoGetAll(ctx, nil, sql, nil) // $ querystring=sql
+	c.DoQuery(ctx, nil, sql, nil)  // $ querystring=sql
+	c.DoPrepare(ctx, nil, sql)     // $ querystring=sql
 }
 
 func main() {
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/gogf/gogf.ql b/go/ql/test/library-tests/semmle/go/frameworks/SQL/gogf/gogf.ql
deleted file mode 100644
index 7b56fd97441..00000000000
--- a/go/ql/test/library-tests/semmle/go/frameworks/SQL/gogf/gogf.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-import go
-
-from SQL::QueryString qs
-select qs
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/gorqlite/QueryString.expected b/go/ql/test/library-tests/semmle/go/frameworks/SQL/gorqlite/QueryString.expected
new file mode 100644
index 00000000000..55e9aed2e93
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/SQL/gorqlite/QueryString.expected
@@ -0,0 +1,2 @@
+testFailures
+invalidModelRow
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/gorqlite/QueryString.ql b/go/ql/test/library-tests/semmle/go/frameworks/SQL/gorqlite/QueryString.ql
new file mode 100644
index 00000000000..eeb43a82fad
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/SQL/gorqlite/QueryString.ql
@@ -0,0 +1,60 @@
+import go
+import semmle.go.dataflow.ExternalFlow
+import ModelValidation
+import TestUtilities.InlineExpectationsTest
+
+module SqlTest implements TestSig {
+  string getARelevantTag() { result = "query" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "query" and
+    exists(SQL::Query q, SQL::QueryString qs | qs = q.getAQueryString() |
+      q.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      element = q.toString() and
+      value = qs.toString()
+    )
+  }
+}
+
+module QueryString implements TestSig {
+  string getARelevantTag() { result = "querystring" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "querystring" and
+    element = "" and
+    exists(SQL::QueryString qs | not exists(SQL::Query q | qs = q.getAQueryString()) |
+      qs.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+        location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      value = qs.toString()
+    )
+  }
+}
+
+module Config implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node n) { n.asExpr() instanceof StringLit }
+
+  predicate isSink(DataFlow::Node n) {
+    n = any(DataFlow::CallNode cn | cn.getTarget().getName() = "sink").getAnArgument()
+  }
+}
+
+module Flow = TaintTracking::Global<Config>;
+
+module TaintFlow implements TestSig {
+  string getARelevantTag() { result = "flowfrom" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "flowfrom" and
+    element = "" and
+    exists(DataFlow::Node fromNode, DataFlow::Node toNode |
+      toNode
+          .hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
+            location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
+      Flow::flow(fromNode, toNode) and
+      value = fromNode.asExpr().(StringLit).getValue()
+    )
+  }
+}
+
+import MakeTest<MergeTests3<SqlTest, QueryString, TaintFlow>>
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/gorqlite/go.mod b/go/ql/test/library-tests/semmle/go/frameworks/SQL/gorqlite/go.mod
index 1f243775658..826ed0eb1c0 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/SQL/gorqlite/go.mod
+++ b/go/ql/test/library-tests/semmle/go/frameworks/SQL/gorqlite/go.mod
@@ -2,4 +2,4 @@ module main
 
 go 1.18
 
-require github.com/rqlite/gorqlite v0.0.0-20220528150909-c4e99ae96be6
+require github.com/rqlite/gorqlite v0.0.0-20240808172217-12ae7d03ef19
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/gorqlite/gorqlite.expected b/go/ql/test/library-tests/semmle/go/frameworks/SQL/gorqlite/gorqlite.expected
deleted file mode 100644
index cbd8166ea5e..00000000000
--- a/go/ql/test/library-tests/semmle/go/frameworks/SQL/gorqlite/gorqlite.expected
+++ /dev/null
@@ -1,6 +0,0 @@
-| gorqlite.go:11:13:11:16 | sqls |
-| gorqlite.go:12:13:12:16 | sqls |
-| gorqlite.go:13:13:13:16 | sqls |
-| gorqlite.go:14:16:14:18 | sql |
-| gorqlite.go:15:16:15:18 | sql |
-| gorqlite.go:16:16:16:18 | sql |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/gorqlite/gorqlite.go b/go/ql/test/library-tests/semmle/go/frameworks/SQL/gorqlite/gorqlite.go
index 9b60c6684e6..ebd6e5fd9f3 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/SQL/gorqlite/gorqlite.go
+++ b/go/ql/test/library-tests/semmle/go/frameworks/SQL/gorqlite/gorqlite.go
@@ -1,20 +1,49 @@
 package main
 
-//go:generate depstubber -vendor github.com/rqlite/gorqlite Connection Open
+//go:generate depstubber -vendor github.com/rqlite/gorqlite Connection,ParameterizedStatement Open
 
 import (
+	"context"
+
 	"github.com/rqlite/gorqlite"
 )
 
-func gorqlitetest(sql string, sqls []string) {
+func gorqlitetest(sql string, sqls []string, param_sql gorqlite.ParameterizedStatement, param_sqls []gorqlite.ParameterizedStatement, ctx context.Context) {
 	conn, _ := gorqlite.Open("dbUrl")
-	conn.Query(sqls)   // $ querystring=sqls
-	conn.Queue(sqls)   // $ querystring=sqls
-	conn.Write(sqls)   // $ querystring=sqls
+
+	conn.Query(sqls) // $ querystring=sqls
+	conn.Queue(sqls) // $ querystring=sqls
+	conn.Write(sqls) // $ querystring=sqls
+
 	conn.QueryOne(sql) // $ querystring=sql
 	conn.QueueOne(sql) // $ querystring=sql
 	conn.WriteOne(sql) // $ querystring=sql
+
+	conn.QueryParameterized(param_sqls) // $ querystring=param_sqls
+	conn.QueueParameterized(param_sqls) // $ querystring=param_sqls
+	conn.WriteParameterized(param_sqls) // $ querystring=param_sqls
+
+	conn.QueryOneParameterized(param_sql) // $ querystring=param_sql
+	conn.QueueOneParameterized(param_sql) // $ querystring=param_sql
+	conn.WriteOneParameterized(param_sql) // $ querystring=param_sql
+
+	conn.QueryContext(ctx, sqls) // $ querystring=sqls
+	conn.QueueContext(ctx, sqls) // $ querystring=sqls
+	conn.WriteContext(ctx, sqls) // $ querystring=sqls
+
+	conn.QueryOneContext(ctx, sql) // $ querystring=sql
+	conn.QueueOneContext(ctx, sql) // $ querystring=sql
+	conn.WriteOneContext(ctx, sql) // $ querystring=sql
+
+	conn.QueryParameterizedContext(ctx, param_sqls) // $ querystring=param_sqls
+	conn.QueueParameterizedContext(ctx, param_sqls) // $ querystring=param_sqls
+	conn.WriteParameterizedContext(ctx, param_sqls) // $ querystring=param_sqls
+
+	conn.QueryOneParameterizedContext(ctx, param_sql) // $ querystring=param_sql
+	conn.QueueOneParameterizedContext(ctx, param_sql) // $ querystring=param_sql
+	conn.WriteOneParameterizedContext(ctx, param_sql) // $ querystring=param_sql
 }
+
 func main() {
 	return
 }
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/gorqlite/gorqlite.ql b/go/ql/test/library-tests/semmle/go/frameworks/SQL/gorqlite/gorqlite.ql
deleted file mode 100644
index 7b56fd97441..00000000000
--- a/go/ql/test/library-tests/semmle/go/frameworks/SQL/gorqlite/gorqlite.ql
+++ /dev/null
@@ -1,4 +0,0 @@
-import go
-
-from SQL::QueryString qs
-select qs
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/gorqlite/vendor/github.com/rqlite/gorqlite/stub.go b/go/ql/test/library-tests/semmle/go/frameworks/SQL/gorqlite/vendor/github.com/rqlite/gorqlite/stub.go
index f6f4ca18ec1..0572097582e 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/SQL/gorqlite/vendor/github.com/rqlite/gorqlite/stub.go
+++ b/go/ql/test/library-tests/semmle/go/frameworks/SQL/gorqlite/vendor/github.com/rqlite/gorqlite/stub.go
@@ -2,11 +2,15 @@
 // This is a simple stub for github.com/rqlite/gorqlite, strictly for use in testing.
 
 // See the LICENSE file for information about the licensing of the original library.
-// Source: github.com/rqlite/gorqlite (exports: Connection; functions: Open)
+// Source: github.com/rqlite/gorqlite (exports: Connection,ParameterizedStatement; functions: Open)
 
 // Package gorqlite is a stub of github.com/rqlite/gorqlite, generated by depstubber.
 package gorqlite
 
+import (
+	context "context"
+)
+
 type Connection struct {
 	ID string
 }
@@ -29,19 +33,83 @@ func (_ *Connection) Query(_ []string) ([]QueryResult, error) {
 	return nil, nil
 }
 
+func (_ *Connection) QueryContext(_ context.Context, _ []string) ([]QueryResult, error) {
+	return nil, nil
+}
+
 func (_ *Connection) QueryOne(_ string) (QueryResult, error) {
 	return QueryResult{}, nil
 }
 
+func (_ *Connection) QueryOneContext(_ context.Context, _ string) (QueryResult, error) {
+	return QueryResult{}, nil
+}
+
+func (_ *Connection) QueryOneParameterized(_ ParameterizedStatement) (QueryResult, error) {
+	return QueryResult{}, nil
+}
+
+func (_ *Connection) QueryOneParameterizedContext(_ context.Context, _ ParameterizedStatement) (QueryResult, error) {
+	return QueryResult{}, nil
+}
+
+func (_ *Connection) QueryParameterized(_ []ParameterizedStatement) ([]QueryResult, error) {
+	return nil, nil
+}
+
+func (_ *Connection) QueryParameterizedContext(_ context.Context, _ []ParameterizedStatement) ([]QueryResult, error) {
+	return nil, nil
+}
+
 func (_ *Connection) Queue(_ []string) (int64, error) {
 	return 0, nil
 }
 
+func (_ *Connection) QueueContext(_ context.Context, _ []string) (int64, error) {
+	return 0, nil
+}
+
 func (_ *Connection) QueueOne(_ string) (int64, error) {
 	return 0, nil
 }
 
-func (_ *Connection) SetConsistencyLevel(_ string) error {
+func (_ *Connection) QueueOneContext(_ context.Context, _ string) (int64, error) {
+	return 0, nil
+}
+
+func (_ *Connection) QueueOneParameterized(_ ParameterizedStatement) (int64, error) {
+	return 0, nil
+}
+
+func (_ *Connection) QueueOneParameterizedContext(_ context.Context, _ ParameterizedStatement) (int64, error) {
+	return 0, nil
+}
+
+func (_ *Connection) QueueParameterized(_ []ParameterizedStatement) (int64, error) {
+	return 0, nil
+}
+
+func (_ *Connection) QueueParameterizedContext(_ context.Context, _ []ParameterizedStatement) (int64, error) {
+	return 0, nil
+}
+
+func (_ *Connection) Request(_ []string) ([]RequestResult, error) {
+	return nil, nil
+}
+
+func (_ *Connection) RequestContext(_ context.Context, _ []string) ([]RequestResult, error) {
+	return nil, nil
+}
+
+func (_ *Connection) RequestParameterized(_ []ParameterizedStatement) ([]RequestResult, error) {
+	return nil, nil
+}
+
+func (_ *Connection) RequestParameterizedContext(_ context.Context, _ []ParameterizedStatement) ([]RequestResult, error) {
+	return nil, nil
+}
+
+func (_ *Connection) SetConsistencyLevel(_ interface{}) error {
 	return nil
 }
 
@@ -53,12 +121,41 @@ func (_ *Connection) Write(_ []string) ([]WriteResult, error) {
 	return nil, nil
 }
 
+func (_ *Connection) WriteContext(_ context.Context, _ []string) ([]WriteResult, error) {
+	return nil, nil
+}
+
 func (_ *Connection) WriteOne(_ string) (WriteResult, error) {
 	return WriteResult{}, nil
 }
 
-func Open(_ string) (Connection, error) {
-	return Connection{}, nil
+func (_ *Connection) WriteOneContext(_ context.Context, _ string) (WriteResult, error) {
+	return WriteResult{}, nil
+}
+
+func (_ *Connection) WriteOneParameterized(_ ParameterizedStatement) (WriteResult, error) {
+	return WriteResult{}, nil
+}
+
+func (_ *Connection) WriteOneParameterizedContext(_ context.Context, _ ParameterizedStatement) (WriteResult, error) {
+	return WriteResult{}, nil
+}
+
+func (_ *Connection) WriteParameterized(_ []ParameterizedStatement) ([]WriteResult, error) {
+	return nil, nil
+}
+
+func (_ *Connection) WriteParameterizedContext(_ context.Context, _ []ParameterizedStatement) ([]WriteResult, error) {
+	return nil, nil
+}
+
+func Open(_ string) (*Connection, error) {
+	return nil, nil
+}
+
+type ParameterizedStatement struct {
+	Query     string
+	Arguments []interface{}
 }
 
 type QueryResult struct {
@@ -90,10 +187,20 @@ func (_ *QueryResult) Scan(_ ...interface{}) error {
 	return nil
 }
 
+func (_ *QueryResult) Slice() ([]interface{}, error) {
+	return nil, nil
+}
+
 func (_ *QueryResult) Types() []string {
 	return nil
 }
 
+type RequestResult struct {
+	Err   error
+	Query *QueryResult
+	Write *WriteResult
+}
+
 type WriteResult struct {
 	Err          error
 	Timing       float64
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/gorqlite/vendor/modules.txt b/go/ql/test/library-tests/semmle/go/frameworks/SQL/gorqlite/vendor/modules.txt
index f5e5b9989ed..dafb7c6d1a9 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/SQL/gorqlite/vendor/modules.txt
+++ b/go/ql/test/library-tests/semmle/go/frameworks/SQL/gorqlite/vendor/modules.txt
@@ -1,3 +1,3 @@
-# github.com/rqlite/gorqlite v0.0.0-20220528150909-c4e99ae96be6
+# github.com/rqlite/gorqlite v0.0.0-20240808172217-12ae7d03ef19
 ## explicit
 github.com/rqlite/gorqlite
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/squirrel.go b/go/ql/test/library-tests/semmle/go/frameworks/SQL/squirrel.go
index 15b687c7ad1..d0350643bb0 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/SQL/squirrel.go
+++ b/go/ql/test/library-tests/semmle/go/frameworks/SQL/squirrel.go
@@ -1,6 +1,6 @@
 package main
 
-//go:generate depstubber -vendor github.com/Masterminds/squirrel DeleteBuilder,InsertBuilder,SelectBuilder,UpdateBuilder Delete,Expr,Insert,Select,Update
+//go:generate depstubber -vendor github.com/Masterminds/squirrel DeleteBuilder,Eq,InsertBuilder,SelectBuilder,UpdateBuilder Delete,Expr,Insert,Select,Update
 
 import (
 	"github.com/Masterminds/squirrel"
@@ -10,38 +10,44 @@ func squirrelTest(querypart string) {
 	squirrel.Expr(querypart)                    // $ querystring=querypart
 	deleteBuilder := squirrel.Delete(querypart) // $ querystring=querypart
 	deleteBuilder.From(querypart)               // $ querystring=querypart
-	deleteBuilder.OrderBy(querypart)            // $ querystring=[]type{args}
+	deleteBuilder.OrderBy(querypart)            // $ querystring=querypart
 	deleteBuilder.Prefix(querypart)             // $ querystring=querypart
 	deleteBuilder.Suffix(querypart)             // $ querystring=querypart
 	deleteBuilder.Where(querypart)              // $ querystring=querypart
 
 	insertBuilder := squirrel.Insert(querypart) // $ querystring=querypart
-	insertBuilder.Columns(querypart)            // $ querystring=[]type{args}
-	insertBuilder.Options(querypart)            // $ querystring=[]type{args}
+	insertBuilder.Columns(querypart)            // $ querystring=querypart
+	insertBuilder.Options(querypart)            // $ querystring=querypart
 	insertBuilder.Prefix(querypart)             // $ querystring=querypart
 	insertBuilder.Suffix(querypart)             // $ querystring=querypart
 	insertBuilder.Into(querypart)               // $ querystring=querypart
 
-	selectBuilder := squirrel.Select(querypart) // $ querystring=[]type{args}
-	selectBuilder.Columns(querypart)            // $ querystring=[]type{args}
+	selectBuilder := squirrel.Select(querypart) // $ querystring=querypart
+	selectBuilder.Columns(querypart)            // $ querystring=querypart
 	selectBuilder.From(querypart)               // $ querystring=querypart
-	selectBuilder.Options(querypart)            // $ querystring=[]type{args}
-	selectBuilder.OrderBy(querypart)            // $ querystring=[]type{args}
+	selectBuilder.Options(querypart)            // $ querystring=querypart
+	selectBuilder.OrderBy(querypart)            // $ querystring=querypart
 	selectBuilder.Prefix(querypart)             // $ querystring=querypart
 	selectBuilder.Suffix(querypart)             // $ querystring=querypart
 	selectBuilder.Where(querypart)              // $ querystring=querypart
 	selectBuilder.CrossJoin(querypart)          // $ querystring=querypart
-	selectBuilder.GroupBy(querypart)            // $ querystring=[]type{args}
+	selectBuilder.GroupBy(querypart)            // $ querystring=querypart
 	selectBuilder.InnerJoin(querypart)          // $ querystring=querypart
 	selectBuilder.LeftJoin(querypart)           // $ querystring=querypart
 	selectBuilder.RightJoin(querypart)          // $ querystring=querypart
 
 	updateBuilder := squirrel.Update(querypart) // $ querystring=querypart
 	updateBuilder.From(querypart)               // $ querystring=querypart
-	updateBuilder.OrderBy(querypart)            // $ querystring=[]type{args}
+	updateBuilder.OrderBy(querypart)            // $ querystring=querypart
 	updateBuilder.Prefix(querypart)             // $ querystring=querypart
 	updateBuilder.Suffix(querypart)             // $ querystring=querypart
 	updateBuilder.Where(querypart)              // $ querystring=querypart
 	updateBuilder.Set(querypart, "")            // $ querystring=querypart
 	updateBuilder.Table(querypart)              // $ querystring=querypart
+
+	// safe
+	wrapped := squirrel.Eq{"id": querypart}
+	deleteBuilder.Where(wrapped)
+	selectBuilder.Where(wrapped)
+	updateBuilder.Where(wrapped)
 }
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/vendor/github.com/Masterminds/squirrel/stub.go b/go/ql/test/library-tests/semmle/go/frameworks/SQL/vendor/github.com/Masterminds/squirrel/stub.go
index 96a30e49d4e..1a9e5ca0e9b 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/SQL/vendor/github.com/Masterminds/squirrel/stub.go
+++ b/go/ql/test/library-tests/semmle/go/frameworks/SQL/vendor/github.com/Masterminds/squirrel/stub.go
@@ -2,7 +2,7 @@
 // This is a simple stub for github.com/Masterminds/squirrel, strictly for use in testing.
 
 // See the LICENSE file for information about the licensing of the original library.
-// Source: github.com/Masterminds/squirrel (exports: DeleteBuilder,InsertBuilder,SelectBuilder,UpdateBuilder; functions: Delete,Expr,Insert,Select,Update)
+// Source: github.com/Masterminds/squirrel (exports: DeleteBuilder,Eq,InsertBuilder,SelectBuilder,UpdateBuilder; functions: Delete,Expr,Insert,Select,Update)
 
 // Package squirrel is a stub of github.com/Masterminds/squirrel, generated by depstubber.
 package squirrel
@@ -99,6 +99,12 @@ func (_ DeleteBuilder) Where(_ interface{}, _ ...interface{}) DeleteBuilder {
 	return DeleteBuilder{}
 }
 
+type Eq map[string]interface{}
+
+func (_ Eq) ToSql() (string, []interface{}, error) {
+	return "", nil, nil
+}
+
 func Expr(_ string, _ ...interface{}) Sqlizer {
 	return nil
 }
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/SQL/xorm.go b/go/ql/test/library-tests/semmle/go/frameworks/SQL/xorm.go
index 6b4dbb116ee..f63b33a0e09 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/SQL/xorm.go
+++ b/go/ql/test/library-tests/semmle/go/frameworks/SQL/xorm.go
@@ -10,68 +10,73 @@ import (
 
 func xormtest() {
 	query := "UntrustedString"
+	arg := "arg"
 
 	engine1 := xorm1.Engine{}
-	engine1.Query(query)          // $ querystring=query
-	engine1.QueryString(query)    // $ querystring=query
-	engine1.QueryInterface(query) // $ querystring=query
-	engine1.SQL(query)            // $ querystring=query
-	engine1.Where(query)          // $ querystring=query
-	engine1.Alias(query)          // $ querystring=query
-	engine1.NotIn(query)          // $ querystring=query
-	engine1.In(query)             // $ querystring=query
-	engine1.Select(query)         // $ querystring=query
-	engine1.SetExpr(query, nil)   // $ querystring=query
-	engine1.OrderBy(query)        // $ querystring=query
-	engine1.Having(query)         // $ querystring=query
-	engine1.GroupBy(query)        // $ querystring=query
+	engine1.Query(query, arg)          // $ querystring=query
+	engine1.Exec(query, arg)           // $ querystring=query
+	engine1.QueryString(query, arg)    // $ querystring=query
+	engine1.QueryInterface(query, arg) // $ querystring=query
+	engine1.SQL(query)                 // $ querystring=query
+	engine1.Where(query)               // $ querystring=query
+	engine1.Alias(query)               // $ querystring=query
+	engine1.NotIn(query)               // $ querystring=query
+	engine1.In(query)                  // $ querystring=query
+	engine1.Select(query)              // $ querystring=query
+	engine1.SetExpr(query, nil)        // $ querystring=query
+	engine1.OrderBy(query)             // $ querystring=query
+	engine1.Having(query)              // $ querystring=query
+	engine1.GroupBy(query)             // $ querystring=query
 
 	engine2 := xorm2.Engine{}
-	engine2.Query(query)          // $ querystring=query
-	engine2.QueryString(query)    // $ querystring=query
-	engine2.QueryInterface(query) // $ querystring=query
-	engine2.SQL(query)            // $ querystring=query
-	engine2.Where(query)          // $ querystring=query
-	engine2.Alias(query)          // $ querystring=query
-	engine2.NotIn(query)          // $ querystring=query
-	engine2.In(query)             // $ querystring=query
-	engine2.Select(query)         // $ querystring=query
-	engine2.SetExpr(query, nil)   // $ querystring=query
-	engine2.OrderBy(query)        // $ querystring=query
-	engine2.Having(query)         // $ querystring=query
-	engine2.GroupBy(query)        // $ querystring=query
+	engine2.Query(query, arg)          // $ querystring=query
+	engine2.Exec(query, arg)           // $ querystring=query
+	engine2.QueryString(query, arg)    // $ querystring=query
+	engine2.QueryInterface(query, arg) // $ querystring=query
+	engine2.SQL(query)                 // $ querystring=query
+	engine2.Where(query)               // $ querystring=query
+	engine2.Alias(query)               // $ querystring=query
+	engine2.NotIn(query)               // $ querystring=query
+	engine2.In(query)                  // $ querystring=query
+	engine2.Select(query)              // $ querystring=query
+	engine2.SetExpr(query, nil)        // $ querystring=query
+	engine2.OrderBy(query)             // $ querystring=query
+	engine2.Having(query)              // $ querystring=query
+	engine2.GroupBy(query)             // $ querystring=query
 
 	session1 := xorm1.Session{}
-	session1.Query(query)          // $ querystring=query
-	session1.QueryString(query)    // $ querystring=query
-	session1.QueryInterface(query) // $ querystring=query
-	session1.SQL(query)            // $ querystring=query
-	session1.Where(query)          // $ querystring=query
-	session1.Alias(query)          // $ querystring=query
-	session1.NotIn(query)          // $ querystring=query
-	session1.In(query)             // $ querystring=query
-	session1.Select(query)         // $ querystring=query
-	session1.SetExpr(query, nil)   // $ querystring=query
-	session1.OrderBy(query)        // $ querystring=query
-	session1.Having(query)         // $ querystring=query
-	session1.GroupBy(query)        // $ querystring=query
-	session1.And(query)            // $ querystring=query
-	session1.Or(query)             // $ querystring=query
+	session1.Query(query, arg)          // $ querystring=query
+	session1.Exec(query, arg)           // $ querystring=query
+	session1.QueryString(query, arg)    // $ querystring=query
+	session1.QueryInterface(query, arg) // $ querystring=query
+	session1.SQL(query)                 // $ querystring=query
+	session1.Where(query)               // $ querystring=query
+	session1.Alias(query)               // $ querystring=query
+	session1.NotIn(query)               // $ querystring=query
+	session1.In(query)                  // $ querystring=query
+	session1.Select(query)              // $ querystring=query
+	session1.SetExpr(query, nil)        // $ querystring=query
+	session1.OrderBy(query)             // $ querystring=query
+	session1.Having(query)              // $ querystring=query
+	session1.GroupBy(query)             // $ querystring=query
+	session1.And(query)                 // $ querystring=query
+	session1.Or(query)                  // $ querystring=query
 
 	session2 := xorm2.Session{}
-	session2.Query(query)          // $ querystring=query
-	session2.QueryString(query)    // $ querystring=query
-	session2.QueryInterface(query) // $ querystring=query
-	session2.SQL(query)            // $ querystring=query
-	session2.Where(query)          // $ querystring=query
-	session2.Alias(query)          // $ querystring=query
-	session2.NotIn(query)          // $ querystring=query
-	session2.In(query)             // $ querystring=query
-	session2.Select(query)         // $ querystring=query
-	session2.SetExpr(query, nil)   // $ querystring=query
-	session2.OrderBy(query)        // $ querystring=query
-	session2.Having(query)         // $ querystring=query
-	session2.GroupBy(query)        // $ querystring=query
-	session2.And(query)            // $ querystring=query
-	session2.Or(query)             // $ querystring=query
+	session2.Query(query, arg)          // $ querystring=query
+	session2.Exec(query, arg)           // $ querystring=query
+	session2.QueryString(query, arg)    // $ querystring=query
+	session2.QueryInterface(query, arg) // $ querystring=query
+	session2.SQL(query)                 // $ querystring=query
+	session2.Where(query)               // $ querystring=query
+	session2.Alias(query)               // $ querystring=query
+	session2.NotIn(query)               // $ querystring=query
+	session2.In(query)                  // $ querystring=query
+	session2.Select(query)              // $ querystring=query
+	session2.SetExpr(query, nil)        // $ querystring=query
+	session2.OrderBy(query)             // $ querystring=query
+	session2.Having(query)              // $ querystring=query
+	session2.GroupBy(query)             // $ querystring=query
+	session2.And(query)                 // $ querystring=query
+	session2.Or(query)                  // $ querystring=query
 }
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/Slices.go b/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/Slices.go
new file mode 100644
index 00000000000..6ecc98c0a2d
--- /dev/null
+++ b/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/Slices.go
@@ -0,0 +1,193 @@
+package main
+
+import (
+	"cmp"
+	"slices"
+	"strings"
+)
+
+func TaintStepTest_SlicesClip(fromStringSlice []string) []string {
+	toStringSlice := slices.Clip(fromStringSlice)
+	return toStringSlice
+}
+
+func TaintStepTest_SlicesClone(fromStringSlice []string) []string {
+	toStringSlice := slices.Clone(fromStringSlice)
+	return toStringSlice
+}
+
+func TaintStepTest_SlicesCompact(fromStringSlice []string) []string {
+	toStringSlice := slices.Compact(fromStringSlice)
+	return toStringSlice
+}
+
+func TaintStepTest_SlicesCompactFunc(fromStringSlice []string) []string {
+	toStringSlice := slices.CompactFunc(fromStringSlice, strings.EqualFold)
+	return toStringSlice
+}
+
+func TaintStepTest_SlicesConcat0(fromStringSlice []string) []string {
+	toStringSlice := slices.Concat(fromStringSlice, []string{"a", "b", "c"})
+	return toStringSlice
+}
+
+func TaintStepTest_SlicesConcat1(fromStringSlice []string) []string {
+	toStringSlice := slices.Concat([]string{"a", "b", "c"}, fromStringSlice)
+	return toStringSlice
+}
+
+func TaintStepTest_SlicesDelete(fromStringSlice []string) []string {
+	toStringSlice := slices.Delete(fromStringSlice, 0, 1)
+	return toStringSlice
+}
+
+func TaintStepTest_SlicesDeleteFunc(fromStringSlice []string) []string {
+	deleteEmptyString := func(str string) bool {
+		return str == ""
+	}
+	toStringSlice := slices.DeleteFunc(fromStringSlice, deleteEmptyString)
+	return toStringSlice
+}
+
+func TaintStepTest_SlicesGrow(fromStringSlice []string) []string {
+	toStringSlice := slices.Grow(fromStringSlice, 1)
+	return toStringSlice
+}
+
+func TaintStepTest_SlicesInsert0(fromStringSlice []string) []string {
+	toStringSlice := slices.Insert(fromStringSlice, 1, "a", "b")
+	return toStringSlice
+}
+
+func TaintStepTest_SlicesInsert2(fromString string) []string {
+	toStringSlice := slices.Insert([]string{}, 0, fromString, "b")
+	return toStringSlice
+}
+
+func TaintStepTest_SlicesMax(fromStringSlice []string) string {
+	toString := slices.Max(fromStringSlice)
+	return toString
+}
+
+func TaintStepTest_SlicesMaxFunc(fromStringSlice []string) string {
+	toString := slices.MaxFunc(fromStringSlice, cmp.Compare)
+	return toString
+}
+
+func TaintStepTest_SlicesMin(fromStringSlice []string) string {
+	toString := slices.Min(fromStringSlice)
+	return toString
+}
+
+func TaintStepTest_SlicesMinFunc(fromStringSlice []string) string {
+	toString := slices.MinFunc(fromStringSlice, cmp.Compare)
+	return toString
+}
+
+func TaintStepTest_SlicesRepeat(fromStringSlice []string) []string {
+	toStringSlice := slices.Repeat(fromStringSlice, 2)
+	return toStringSlice
+}
+
+func TaintStepTest_SlicesReplace0(fromStringSlice []string) []string {
+	toStringSlice := slices.Replace(fromStringSlice, 1, 2, "a")
+	return toStringSlice
+}
+
+func TaintStepTest_SlicesReplace3(fromString string) []string {
+	toStringSlice := slices.Replace([]string{}, 1, 3, fromString, "b")
+	return toStringSlice
+}
+
+func RunAllTaints_Slices() {
+	{
+		source := []string{newSource(0).(string)}
+		out := TaintStepTest_SlicesClip(source)
+		sink(0, out[0])
+	}
+	{
+		source := []string{newSource(1).(string)}
+		out := TaintStepTest_SlicesClone(source)
+		sink(1, out[0])
+	}
+	{
+		source := []string{newSource(2).(string)}
+		out := TaintStepTest_SlicesCompact(source)
+		sink(2, out[0])
+	}
+	{
+		source := []string{newSource(3).(string)}
+		out := TaintStepTest_SlicesCompactFunc(source)
+		sink(3, out[0])
+	}
+	{
+		source := []string{newSource(4).(string)}
+		out := TaintStepTest_SlicesConcat0(source)
+		sink(4, out[0])
+	}
+	{
+		source := []string{newSource(5).(string)}
+		out := TaintStepTest_SlicesConcat1(source)
+		sink(5, out[0])
+	}
+	{
+		source := []string{newSource(6).(string)}
+		out := TaintStepTest_SlicesDelete(source)
+		sink(6, out[0])
+	}
+	{
+		source := []string{newSource(7).(string)}
+		out := TaintStepTest_SlicesDeleteFunc(source)
+		sink(7, out[0])
+	}
+	{
+		source := []string{newSource(8).(string)}
+		out := TaintStepTest_SlicesGrow(source)
+		sink(8, out[0])
+	}
+	{
+		source := []string{newSource(9).(string)}
+		out := TaintStepTest_SlicesInsert0(source)
+		sink(9, out[0])
+	}
+	{
+		source := newSource(10).(string)
+		out := TaintStepTest_SlicesInsert2(source)
+		sink(10, out[0])
+	}
+	{
+		source := []string{newSource(11).(string)}
+		out := TaintStepTest_SlicesMax(source)
+		sink(11, out)
+	}
+	{
+		source := []string{newSource(12).(string)}
+		out := TaintStepTest_SlicesMaxFunc(source)
+		sink(12, out)
+	}
+	{
+		source := []string{newSource(13).(string)}
+		out := TaintStepTest_SlicesMin(source)
+		sink(13, out)
+	}
+	{
+		source := []string{newSource(14).(string)}
+		out := TaintStepTest_SlicesMinFunc(source)
+		sink(14, out)
+	}
+	{
+		source := []string{newSource(15).(string)}
+		out := TaintStepTest_SlicesRepeat(source)
+		sink(15, out[0])
+	}
+	{
+		source := []string{newSource(16).(string)}
+		out := TaintStepTest_SlicesReplace0(source)
+		sink(16, out[0])
+	}
+	{
+		source := newSource(17).(string)
+		out := TaintStepTest_SlicesReplace3(source)
+		sink(17, out[0])
+	}
+}
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/go.mod b/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/go.mod
index 1481ec9caf6..4168c0a398b 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/go.mod
+++ b/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/go.mod
@@ -1,6 +1,6 @@
 module example.com/m
 
-go 1.20
+go 1.23
 
 require (
 	golang.org/x/net v0.0.0-20201010224723-4f7140c49acb
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/test.expected b/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/test.expected
index 105b7026d0c..42831abaf15 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/test.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/test.expected
@@ -1,3 +1,2 @@
-failures
 invalidModelRow
 testFailures
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/vendor/modules.txt b/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/vendor/modules.txt
index fe5007e8ae1..b11be0ff1d2 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/vendor/modules.txt
+++ b/go/ql/test/library-tests/semmle/go/frameworks/StdlibTaintFlow/vendor/modules.txt
@@ -1,3 +1,3 @@
 # golang.org/x/net v0.0.0-20201010224723-4f7140c49acb
-## explicit
-golang.org/x/net
+## explicit; go 1.11
+golang.org/x/net/context
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/SqlInjection.expected b/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/SqlInjection.expected
index c28b1058e7c..8b2f05c297f 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/SqlInjection.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/XNetHtml/SqlInjection.expected
@@ -1,11 +1,12 @@
 #select
 | test.go:57:11:57:41 | call to EscapeString | test.go:56:2:56:42 | ... := ...[0] | test.go:57:11:57:41 | call to EscapeString | This query depends on a $@. | test.go:56:2:56:42 | ... := ...[0] | user-provided value |
 edges
-| test.go:56:2:56:42 | ... := ...[0] | test.go:57:29:57:40 | selection of Value | provenance | Src:MaD:1  |
-| test.go:57:29:57:40 | selection of Value | test.go:57:11:57:41 | call to EscapeString | provenance | MaD:2 |
+| test.go:56:2:56:42 | ... := ...[0] | test.go:57:29:57:40 | selection of Value | provenance | Src:MaD:2  |
+| test.go:57:29:57:40 | selection of Value | test.go:57:11:57:41 | call to EscapeString | provenance | MaD:3 Sink:MaD:1 |
 models
-| 1 | Source: net/http; Request; true; Cookie; ; ; ReturnValue[0]; remote; manual |
-| 2 | Summary: golang.org/x/net/html; ; false; EscapeString; ; ; Argument[0]; ReturnValue; taint; manual |
+| 1 | Sink: database/sql; DB; true; Query; ; ; Argument[0]; sql-injection; manual |
+| 2 | Source: net/http; Request; true; Cookie; ; ; ReturnValue[0]; remote; manual |
+| 3 | Summary: golang.org/x/net/html; ; false; EscapeString; ; ; Argument[0]; ReturnValue; taint; manual |
 nodes
 | test.go:56:2:56:42 | ... := ...[0] | semmle.label | ... := ...[0] |
 | test.go:57:11:57:41 | call to EscapeString | semmle.label | call to EscapeString |
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/Yaml/tests.expected b/go/ql/test/library-tests/semmle/go/frameworks/Yaml/tests.expected
index 105b7026d0c..42831abaf15 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/Yaml/tests.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/Yaml/tests.expected
@@ -1,3 +1,2 @@
-failures
 invalidModelRow
 testFailures
diff --git a/go/ql/test/library-tests/semmle/go/frameworks/gqlgen/gqlgen.expected b/go/ql/test/library-tests/semmle/go/frameworks/gqlgen/gqlgen.expected
index 105b7026d0c..42831abaf15 100644
--- a/go/ql/test/library-tests/semmle/go/frameworks/gqlgen/gqlgen.expected
+++ b/go/ql/test/library-tests/semmle/go/frameworks/gqlgen/gqlgen.expected
@@ -1,3 +1,2 @@
-failures
 invalidModelRow
 testFailures
diff --git a/go/ql/test/query-tests/Security/CWE-089/SqlInjection.expected b/go/ql/test/query-tests/Security/CWE-089/SqlInjection.expected
index 79d8809e19f..1ce8c3d1dcf 100644
--- a/go/ql/test/query-tests/Security/CWE-089/SqlInjection.expected
+++ b/go/ql/test/query-tests/Security/CWE-089/SqlInjection.expected
@@ -25,53 +25,53 @@
 | mongoDB.go:80:22:80:27 | filter | mongoDB.go:40:20:40:30 | call to Referer | mongoDB.go:80:22:80:27 | filter | This query depends on a $@. | mongoDB.go:40:20:40:30 | call to Referer | user-provided value |
 | mongoDB.go:81:18:81:25 | pipeline | mongoDB.go:40:20:40:30 | call to Referer | mongoDB.go:81:18:81:25 | pipeline | This query depends on a $@. | mongoDB.go:40:20:40:30 | call to Referer | user-provided value |
 edges
-| SqlInjection.go:10:7:11:30 | []type{args} [array] | SqlInjection.go:10:7:11:30 | call to Sprintf | provenance | MaD:7 |
-| SqlInjection.go:10:7:11:30 | call to Sprintf | SqlInjection.go:12:11:12:11 | q | provenance |  |
-| SqlInjection.go:11:3:11:9 | selection of URL | SqlInjection.go:11:3:11:17 | call to Query | provenance | Src:MaD:5 MaD:10 |
+| SqlInjection.go:10:7:11:30 | []type{args} [array] | SqlInjection.go:10:7:11:30 | call to Sprintf | provenance | MaD:23 |
+| SqlInjection.go:10:7:11:30 | call to Sprintf | SqlInjection.go:12:11:12:11 | q | provenance | Sink:MaD:1 |
+| SqlInjection.go:11:3:11:9 | selection of URL | SqlInjection.go:11:3:11:17 | call to Query | provenance | Src:MaD:21 MaD:26 |
 | SqlInjection.go:11:3:11:17 | call to Query | SqlInjection.go:11:3:11:29 | index expression | provenance |  |
 | SqlInjection.go:11:3:11:29 | index expression | SqlInjection.go:10:7:11:30 | []type{args} [array] | provenance |  |
 | SqlInjection.go:11:3:11:29 | index expression | SqlInjection.go:10:7:11:30 | call to Sprintf | provenance | FunctionModel |
 | issue48.go:17:2:17:33 | ... := ...[0] | issue48.go:18:17:18:17 | b | provenance |  |
-| issue48.go:17:25:17:32 | selection of Body | issue48.go:17:2:17:33 | ... := ...[0] | provenance | Src:MaD:1 MaD:8 |
-| issue48.go:18:17:18:17 | b | issue48.go:18:20:18:39 | &... | provenance | MaD:6 |
+| issue48.go:17:25:17:32 | selection of Body | issue48.go:17:2:17:33 | ... := ...[0] | provenance | Src:MaD:17 MaD:24 |
+| issue48.go:18:17:18:17 | b | issue48.go:18:20:18:39 | &... | provenance | MaD:22 |
 | issue48.go:18:20:18:39 | &... | issue48.go:21:3:21:33 | index expression | provenance |  |
-| issue48.go:20:8:21:34 | []type{args} [array] | issue48.go:20:8:21:34 | call to Sprintf | provenance | MaD:7 |
-| issue48.go:20:8:21:34 | call to Sprintf | issue48.go:22:11:22:12 | q3 | provenance |  |
+| issue48.go:20:8:21:34 | []type{args} [array] | issue48.go:20:8:21:34 | call to Sprintf | provenance | MaD:23 |
+| issue48.go:20:8:21:34 | call to Sprintf | issue48.go:22:11:22:12 | q3 | provenance | Sink:MaD:1 |
 | issue48.go:21:3:21:33 | index expression | issue48.go:20:8:21:34 | []type{args} [array] | provenance |  |
 | issue48.go:21:3:21:33 | index expression | issue48.go:20:8:21:34 | call to Sprintf | provenance | FunctionModel |
 | issue48.go:27:2:27:34 | ... := ...[0] | issue48.go:28:17:28:18 | b2 | provenance |  |
-| issue48.go:27:26:27:33 | selection of Body | issue48.go:27:2:27:34 | ... := ...[0] | provenance | Src:MaD:1 MaD:8 |
-| issue48.go:28:17:28:18 | b2 | issue48.go:28:21:28:41 | &... | provenance | MaD:6 |
+| issue48.go:27:26:27:33 | selection of Body | issue48.go:27:2:27:34 | ... := ...[0] | provenance | Src:MaD:17 MaD:24 |
+| issue48.go:28:17:28:18 | b2 | issue48.go:28:21:28:41 | &... | provenance | MaD:22 |
 | issue48.go:28:21:28:41 | &... | issue48.go:31:3:31:31 | selection of Category | provenance |  |
-| issue48.go:30:8:31:32 | []type{args} [array] | issue48.go:30:8:31:32 | call to Sprintf | provenance | MaD:7 |
-| issue48.go:30:8:31:32 | call to Sprintf | issue48.go:32:11:32:12 | q4 | provenance |  |
+| issue48.go:30:8:31:32 | []type{args} [array] | issue48.go:30:8:31:32 | call to Sprintf | provenance | MaD:23 |
+| issue48.go:30:8:31:32 | call to Sprintf | issue48.go:32:11:32:12 | q4 | provenance | Sink:MaD:1 |
 | issue48.go:31:3:31:31 | selection of Category | issue48.go:30:8:31:32 | []type{args} [array] | provenance |  |
 | issue48.go:31:3:31:31 | selection of Category | issue48.go:30:8:31:32 | call to Sprintf | provenance | FunctionModel |
-| issue48.go:37:17:37:50 | type conversion | issue48.go:37:53:37:73 | &... | provenance | MaD:6 |
-| issue48.go:37:24:37:30 | selection of URL | issue48.go:37:24:37:38 | call to Query | provenance | Src:MaD:5 MaD:10 |
+| issue48.go:37:17:37:50 | type conversion | issue48.go:37:53:37:73 | &... | provenance | MaD:22 |
+| issue48.go:37:24:37:30 | selection of URL | issue48.go:37:24:37:38 | call to Query | provenance | Src:MaD:21 MaD:26 |
 | issue48.go:37:24:37:38 | call to Query | issue48.go:37:17:37:50 | type conversion | provenance |  |
 | issue48.go:37:53:37:73 | &... | issue48.go:40:3:40:31 | selection of Category | provenance |  |
-| issue48.go:39:8:40:32 | []type{args} [array] | issue48.go:39:8:40:32 | call to Sprintf | provenance | MaD:7 |
-| issue48.go:39:8:40:32 | call to Sprintf | issue48.go:41:11:41:12 | q5 | provenance |  |
+| issue48.go:39:8:40:32 | []type{args} [array] | issue48.go:39:8:40:32 | call to Sprintf | provenance | MaD:23 |
+| issue48.go:39:8:40:32 | call to Sprintf | issue48.go:41:11:41:12 | q5 | provenance | Sink:MaD:1 |
 | issue48.go:40:3:40:31 | selection of Category | issue48.go:39:8:40:32 | []type{args} [array] | provenance |  |
 | issue48.go:40:3:40:31 | selection of Category | issue48.go:39:8:40:32 | call to Sprintf | provenance | FunctionModel |
-| main.go:11:11:11:16 | selection of Form | main.go:11:11:11:28 | index expression | provenance | Src:MaD:2  |
-| main.go:15:11:15:84 | []type{args} [array] | main.go:15:11:15:84 | call to Sprintf | provenance | MaD:7 |
-| main.go:15:63:15:67 | selection of URL | main.go:15:63:15:75 | call to Query | provenance | Src:MaD:5 MaD:10 |
+| main.go:11:11:11:16 | selection of Form | main.go:11:11:11:28 | index expression | provenance | Src:MaD:18 Sink:MaD:1 |
+| main.go:15:11:15:84 | []type{args} [array] | main.go:15:11:15:84 | call to Sprintf | provenance | MaD:23 Sink:MaD:2 |
+| main.go:15:63:15:67 | selection of URL | main.go:15:63:15:75 | call to Query | provenance | Src:MaD:21 MaD:26 |
 | main.go:15:63:15:75 | call to Query | main.go:15:63:15:83 | index expression | provenance |  |
 | main.go:15:63:15:83 | index expression | main.go:15:11:15:84 | []type{args} [array] | provenance |  |
-| main.go:15:63:15:83 | index expression | main.go:15:11:15:84 | call to Sprintf | provenance | FunctionModel |
-| main.go:16:11:16:85 | []type{args} [array] | main.go:16:11:16:85 | call to Sprintf | provenance | MaD:7 |
-| main.go:16:63:16:70 | selection of Header | main.go:16:63:16:84 | call to Get | provenance | Src:MaD:3 MaD:9 |
+| main.go:15:63:15:83 | index expression | main.go:15:11:15:84 | call to Sprintf | provenance | FunctionModel Sink:MaD:2 |
+| main.go:16:11:16:85 | []type{args} [array] | main.go:16:11:16:85 | call to Sprintf | provenance | MaD:23 Sink:MaD:2 |
+| main.go:16:63:16:70 | selection of Header | main.go:16:63:16:84 | call to Get | provenance | Src:MaD:19 MaD:25 |
 | main.go:16:63:16:84 | call to Get | main.go:16:11:16:85 | []type{args} [array] | provenance |  |
-| main.go:16:63:16:84 | call to Get | main.go:16:11:16:85 | call to Sprintf | provenance | FunctionModel |
+| main.go:16:63:16:84 | call to Get | main.go:16:11:16:85 | call to Sprintf | provenance | FunctionModel Sink:MaD:2 |
 | main.go:28:17:31:2 | &... [pointer, Category] | main.go:34:3:34:13 | RequestData [pointer, Category] | provenance |  |
 | main.go:28:18:31:2 | struct literal [Category] | main.go:28:17:31:2 | &... [pointer, Category] | provenance |  |
-| main.go:30:13:30:19 | selection of URL | main.go:30:13:30:27 | call to Query | provenance | Src:MaD:5 MaD:10 |
+| main.go:30:13:30:19 | selection of URL | main.go:30:13:30:27 | call to Query | provenance | Src:MaD:21 MaD:26 |
 | main.go:30:13:30:27 | call to Query | main.go:30:13:30:39 | index expression | provenance |  |
 | main.go:30:13:30:39 | index expression | main.go:28:18:31:2 | struct literal [Category] | provenance |  |
-| main.go:33:7:34:23 | []type{args} [array] | main.go:33:7:34:23 | call to Sprintf | provenance | MaD:7 |
-| main.go:33:7:34:23 | call to Sprintf | main.go:35:11:35:11 | q | provenance |  |
+| main.go:33:7:34:23 | []type{args} [array] | main.go:33:7:34:23 | call to Sprintf | provenance | MaD:23 |
+| main.go:33:7:34:23 | call to Sprintf | main.go:35:11:35:11 | q | provenance | Sink:MaD:1 |
 | main.go:34:3:34:13 | RequestData [pointer, Category] | main.go:34:3:34:13 | implicit dereference [Category] | provenance |  |
 | main.go:34:3:34:13 | implicit dereference [Category] | main.go:34:3:34:22 | selection of Category | provenance |  |
 | main.go:34:3:34:22 | selection of Category | main.go:33:7:34:23 | []type{args} [array] | provenance |  |
@@ -80,11 +80,11 @@ edges
 | main.go:39:2:39:12 | definition of RequestData [pointer, Category] | main.go:43:3:43:13 | RequestData [pointer, Category] | provenance |  |
 | main.go:40:2:40:12 | RequestData [pointer, Category] | main.go:40:2:40:12 | implicit dereference [Category] | provenance |  |
 | main.go:40:2:40:12 | implicit dereference [Category] | main.go:39:2:39:12 | definition of RequestData [pointer, Category] | provenance |  |
-| main.go:40:25:40:31 | selection of URL | main.go:40:25:40:39 | call to Query | provenance | Src:MaD:5 MaD:10 |
+| main.go:40:25:40:31 | selection of URL | main.go:40:25:40:39 | call to Query | provenance | Src:MaD:21 MaD:26 |
 | main.go:40:25:40:39 | call to Query | main.go:40:25:40:51 | index expression | provenance |  |
 | main.go:40:25:40:51 | index expression | main.go:40:2:40:12 | implicit dereference [Category] | provenance |  |
-| main.go:42:7:43:23 | []type{args} [array] | main.go:42:7:43:23 | call to Sprintf | provenance | MaD:7 |
-| main.go:42:7:43:23 | call to Sprintf | main.go:44:11:44:11 | q | provenance |  |
+| main.go:42:7:43:23 | []type{args} [array] | main.go:42:7:43:23 | call to Sprintf | provenance | MaD:23 |
+| main.go:42:7:43:23 | call to Sprintf | main.go:44:11:44:11 | q | provenance | Sink:MaD:1 |
 | main.go:43:3:43:13 | RequestData [pointer, Category] | main.go:43:3:43:13 | implicit dereference [Category] | provenance |  |
 | main.go:43:3:43:13 | implicit dereference [Category] | main.go:43:3:43:22 | selection of Category | provenance |  |
 | main.go:43:3:43:22 | selection of Category | main.go:42:7:43:23 | []type{args} [array] | provenance |  |
@@ -93,11 +93,11 @@ edges
 | main.go:48:2:48:12 | definition of RequestData [pointer, Category] | main.go:52:3:52:13 | RequestData [pointer, Category] | provenance |  |
 | main.go:49:3:49:14 | star expression [Category] | main.go:48:2:48:12 | definition of RequestData [pointer, Category] | provenance |  |
 | main.go:49:4:49:14 | RequestData [pointer, Category] | main.go:49:3:49:14 | star expression [Category] | provenance |  |
-| main.go:49:28:49:34 | selection of URL | main.go:49:28:49:42 | call to Query | provenance | Src:MaD:5 MaD:10 |
+| main.go:49:28:49:34 | selection of URL | main.go:49:28:49:42 | call to Query | provenance | Src:MaD:21 MaD:26 |
 | main.go:49:28:49:42 | call to Query | main.go:49:28:49:54 | index expression | provenance |  |
 | main.go:49:28:49:54 | index expression | main.go:49:3:49:14 | star expression [Category] | provenance |  |
-| main.go:51:7:52:23 | []type{args} [array] | main.go:51:7:52:23 | call to Sprintf | provenance | MaD:7 |
-| main.go:51:7:52:23 | call to Sprintf | main.go:53:11:53:11 | q | provenance |  |
+| main.go:51:7:52:23 | []type{args} [array] | main.go:51:7:52:23 | call to Sprintf | provenance | MaD:23 |
+| main.go:51:7:52:23 | call to Sprintf | main.go:53:11:53:11 | q | provenance | Sink:MaD:1 |
 | main.go:52:3:52:13 | RequestData [pointer, Category] | main.go:52:3:52:13 | implicit dereference [Category] | provenance |  |
 | main.go:52:3:52:13 | implicit dereference [Category] | main.go:52:3:52:22 | selection of Category | provenance |  |
 | main.go:52:3:52:22 | selection of Category | main.go:51:7:52:23 | []type{args} [array] | provenance |  |
@@ -106,44 +106,60 @@ edges
 | main.go:57:2:57:12 | definition of RequestData [pointer, Category] | main.go:61:5:61:15 | RequestData [pointer, Category] | provenance |  |
 | main.go:58:3:58:14 | star expression [Category] | main.go:57:2:57:12 | definition of RequestData [pointer, Category] | provenance |  |
 | main.go:58:4:58:14 | RequestData [pointer, Category] | main.go:58:3:58:14 | star expression [Category] | provenance |  |
-| main.go:58:28:58:34 | selection of URL | main.go:58:28:58:42 | call to Query | provenance | Src:MaD:5 MaD:10 |
+| main.go:58:28:58:34 | selection of URL | main.go:58:28:58:42 | call to Query | provenance | Src:MaD:21 MaD:26 |
 | main.go:58:28:58:42 | call to Query | main.go:58:28:58:54 | index expression | provenance |  |
 | main.go:58:28:58:54 | index expression | main.go:58:3:58:14 | star expression [Category] | provenance |  |
-| main.go:60:7:61:26 | []type{args} [array] | main.go:60:7:61:26 | call to Sprintf | provenance | MaD:7 |
-| main.go:60:7:61:26 | call to Sprintf | main.go:62:11:62:11 | q | provenance |  |
+| main.go:60:7:61:26 | []type{args} [array] | main.go:60:7:61:26 | call to Sprintf | provenance | MaD:23 |
+| main.go:60:7:61:26 | call to Sprintf | main.go:62:11:62:11 | q | provenance | Sink:MaD:1 |
 | main.go:61:3:61:25 | selection of Category | main.go:60:7:61:26 | []type{args} [array] | provenance |  |
 | main.go:61:3:61:25 | selection of Category | main.go:60:7:61:26 | call to Sprintf | provenance | FunctionModel |
 | main.go:61:4:61:15 | star expression [Category] | main.go:61:3:61:25 | selection of Category | provenance |  |
 | main.go:61:5:61:15 | RequestData [pointer, Category] | main.go:61:4:61:15 | star expression [Category] | provenance |  |
-| mongoDB.go:40:20:40:30 | call to Referer | mongoDB.go:42:28:42:41 | untrustedInput | provenance | Src:MaD:4  |
+| mongoDB.go:40:20:40:30 | call to Referer | mongoDB.go:42:28:42:41 | untrustedInput | provenance | Src:MaD:20  |
 | mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:50:34:50:39 | filter | provenance |  |
-| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:61:27:61:32 | filter | provenance |  |
-| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:63:23:63:28 | filter | provenance |  |
-| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:64:22:64:27 | filter | provenance |  |
-| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:66:32:66:37 | filter | provenance |  |
-| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:69:17:69:22 | filter | provenance |  |
-| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:70:20:70:25 | filter | provenance |  |
-| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:71:29:71:34 | filter | provenance |  |
-| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:72:30:72:35 | filter | provenance |  |
-| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:73:29:73:34 | filter | provenance |  |
-| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:78:23:78:28 | filter | provenance |  |
-| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:79:23:79:28 | filter | provenance |  |
-| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:80:22:80:27 | filter | provenance |  |
+| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:61:27:61:32 | filter | provenance | Sink:MaD:4 |
+| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:63:23:63:28 | filter | provenance | Sink:MaD:5 |
+| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:64:22:64:27 | filter | provenance | Sink:MaD:6 |
+| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:66:32:66:37 | filter | provenance | Sink:MaD:7 |
+| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:69:17:69:22 | filter | provenance | Sink:MaD:8 |
+| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:70:20:70:25 | filter | provenance | Sink:MaD:9 |
+| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:71:29:71:34 | filter | provenance | Sink:MaD:10 |
+| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:72:30:72:35 | filter | provenance | Sink:MaD:11 |
+| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:73:29:73:34 | filter | provenance | Sink:MaD:12 |
+| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:78:23:78:28 | filter | provenance | Sink:MaD:13 |
+| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:79:23:79:28 | filter | provenance | Sink:MaD:14 |
+| mongoDB.go:42:19:42:42 | struct literal | mongoDB.go:80:22:80:27 | filter | provenance | Sink:MaD:15 |
 | mongoDB.go:42:28:42:41 | untrustedInput | mongoDB.go:42:19:42:42 | struct literal | provenance | Config |
-| mongoDB.go:50:23:50:40 | struct literal | mongoDB.go:57:22:57:29 | pipeline | provenance |  |
-| mongoDB.go:50:23:50:40 | struct literal | mongoDB.go:81:18:81:25 | pipeline | provenance |  |
+| mongoDB.go:50:23:50:40 | struct literal | mongoDB.go:57:22:57:29 | pipeline | provenance | Sink:MaD:3 |
+| mongoDB.go:50:23:50:40 | struct literal | mongoDB.go:81:18:81:25 | pipeline | provenance | Sink:MaD:16 |
 | mongoDB.go:50:34:50:39 | filter | mongoDB.go:50:23:50:40 | struct literal | provenance | Config |
 models
-| 1 | Source: net/http; Request; true; Body; ; ; ; remote; manual |
-| 2 | Source: net/http; Request; true; Form; ; ; ; remote; manual |
-| 3 | Source: net/http; Request; true; Header; ; ; ; remote; manual |
-| 4 | Source: net/http; Request; true; Referer; ; ; ReturnValue; remote; manual |
-| 5 | Source: net/http; Request; true; URL; ; ; ; remote; manual |
-| 6 | Summary: encoding/json; ; false; Unmarshal; ; ; Argument[0]; Argument[1]; taint; manual |
-| 7 | Summary: fmt; ; false; Sprintf; ; ; Argument[1].ArrayElement; ReturnValue; taint; manual |
-| 8 | Summary: io/ioutil; ; false; ReadAll; ; ; Argument[0]; ReturnValue[0]; taint; manual |
-| 9 | Summary: net/http; Header; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
-| 10 | Summary: net/url; URL; true; Query; ; ; Argument[receiver]; ReturnValue; taint; manual |
+| 1 | Sink: database/sql; DB; true; Query; ; ; Argument[0]; sql-injection; manual |
+| 2 | Sink: database/sql; Tx; true; Query; ; ; Argument[0]; sql-injection; manual |
+| 3 | Sink: go.mongodb.org/mongo-driver/mongo; Collection; true; Aggregate; ; ; Argument[1]; nosql-injection; manual |
+| 4 | Sink: go.mongodb.org/mongo-driver/mongo; Collection; true; CountDocuments; ; ; Argument[1]; nosql-injection; manual |
+| 5 | Sink: go.mongodb.org/mongo-driver/mongo; Collection; true; DeleteMany; ; ; Argument[1]; nosql-injection; manual |
+| 6 | Sink: go.mongodb.org/mongo-driver/mongo; Collection; true; DeleteOne; ; ; Argument[1]; nosql-injection; manual |
+| 7 | Sink: go.mongodb.org/mongo-driver/mongo; Collection; true; Distinct; ; ; Argument[2]; nosql-injection; manual |
+| 8 | Sink: go.mongodb.org/mongo-driver/mongo; Collection; true; Find; ; ; Argument[1]; nosql-injection; manual |
+| 9 | Sink: go.mongodb.org/mongo-driver/mongo; Collection; true; FindOne; ; ; Argument[1]; nosql-injection; manual |
+| 10 | Sink: go.mongodb.org/mongo-driver/mongo; Collection; true; FindOneAndDelete; ; ; Argument[1]; nosql-injection; manual |
+| 11 | Sink: go.mongodb.org/mongo-driver/mongo; Collection; true; FindOneAndReplace; ; ; Argument[1]; nosql-injection; manual |
+| 12 | Sink: go.mongodb.org/mongo-driver/mongo; Collection; true; FindOneAndUpdate; ; ; Argument[1]; nosql-injection; manual |
+| 13 | Sink: go.mongodb.org/mongo-driver/mongo; Collection; true; ReplaceOne; ; ; Argument[1]; nosql-injection; manual |
+| 14 | Sink: go.mongodb.org/mongo-driver/mongo; Collection; true; UpdateMany; ; ; Argument[1]; nosql-injection; manual |
+| 15 | Sink: go.mongodb.org/mongo-driver/mongo; Collection; true; UpdateOne; ; ; Argument[1]; nosql-injection; manual |
+| 16 | Sink: go.mongodb.org/mongo-driver/mongo; Collection; true; Watch; ; ; Argument[1]; nosql-injection; manual |
+| 17 | Source: net/http; Request; true; Body; ; ; ; remote; manual |
+| 18 | Source: net/http; Request; true; Form; ; ; ; remote; manual |
+| 19 | Source: net/http; Request; true; Header; ; ; ; remote; manual |
+| 20 | Source: net/http; Request; true; Referer; ; ; ReturnValue; remote; manual |
+| 21 | Source: net/http; Request; true; URL; ; ; ; remote; manual |
+| 22 | Summary: encoding/json; ; false; Unmarshal; ; ; Argument[0]; Argument[1]; taint; manual |
+| 23 | Summary: fmt; ; false; Sprintf; ; ; Argument[1].ArrayElement; ReturnValue; taint; manual |
+| 24 | Summary: io/ioutil; ; false; ReadAll; ; ; Argument[0]; ReturnValue[0]; taint; manual |
+| 25 | Summary: net/http; Header; true; Get; ; ; Argument[receiver]; ReturnValue; taint; manual |
+| 26 | Summary: net/url; URL; true; Query; ; ; Argument[receiver]; ReturnValue; taint; manual |
 nodes
 | SqlInjection.go:10:7:11:30 | []type{args} [array] | semmle.label | []type{args} [array] |
 | SqlInjection.go:10:7:11:30 | call to Sprintf | semmle.label | call to Sprintf |
diff --git a/go/ql/test/query-tests/Security/CWE-117/LogInjection.go b/go/ql/test/query-tests/Security/CWE-117/LogInjection.go
index 4f02cc9aef8..6fb628c4cc3 100644
--- a/go/ql/test/query-tests/Security/CWE-117/LogInjection.go
+++ b/go/ql/test/query-tests/Security/CWE-117/LogInjection.go
@@ -7,7 +7,7 @@ package main
 //go:generate depstubber -vendor github.com/davecgh/go-spew/spew "" Dump,Errorf,Print,Printf,Println,Fdump,Fprint,Fprintf,Fprintln
 //go:generate depstubber -vendor github.com/elazarl/goproxy ProxyCtx ""
 //go:generate depstubber -vendor github.com/golang/glog Level,Verbose Info,InfoDepth,Infof,Infoln,Error,ErrorDepth,Errorf,Errorln,Fatal,FatalDepth,Fatalf,Fatalln,Exit,ExitDepth,Exitf,Exitln,V
-//go:generate depstubber -vendor github.com/sirupsen/logrus Fields,Entry,Logger,Level Debug,Debugf,Debugln,Error,Errorf,Errorln,Fatal,Fatalf,Fatalln,Info,Infof,Infoln,Panic,Panicf,Panicln,Print,Printf,Println,Trace,Tracef,Traceln,Warn,Warnf,Warnln,Warning,Warningf,Warningln,WithFields,WithField
+//go:generate depstubber -vendor github.com/sirupsen/logrus FieldLogger,Fields,Entry,Logger,Level Debug,Debugf,Debugln,Error,Errorf,Errorln,Fatal,Fatalf,Fatalln,Info,Infof,Infoln,New,NewEntry,Panic,Panicf,Panicln,Print,Printf,Println,Trace,Tracef,Traceln,Warn,Warnf,Warnln,Warning,Warningf,Warningln,WithError,WithFields,WithField
 //go:generate depstubber -vendor go.uber.org/zap Logger,SugaredLogger NewProduction
 
 import (
@@ -30,6 +30,7 @@ import (
 
 func handler(req *http.Request, ctx *goproxy.ProxyCtx) {
 	username := req.URL.Query()["username"][0]
+	slice := []any{"username", username}
 	testFlag := req.URL.Query()["testFlag"][0]
 
 	{
@@ -170,129 +171,180 @@ func handler(req *http.Request, ctx *goproxy.ProxyCtx) {
 	}
 	// sirupsen/logrus
 	{
-		logrus.Debug(username)        // $ hasTaintFlow="username"
-		logrus.Debugf(username, "")   // $ hasTaintFlow="username"
-		logrus.Debugf("", username)   // $ hasTaintFlow="username"
-		logrus.Debugln(username)      // $ hasTaintFlow="username"
-		logrus.Error(username)        // $ hasTaintFlow="username"
-		logrus.Errorf(username, "")   // $ hasTaintFlow="username"
-		logrus.Errorf("", username)   // $ hasTaintFlow="username"
-		logrus.Errorln(username)      // $ hasTaintFlow="username"
-		logrus.Fatal(username)        // $ hasTaintFlow="username"
-		logrus.Fatalf(username, "")   // $ hasTaintFlow="username"
-		logrus.Fatalf("", username)   // $ hasTaintFlow="username"
-		logrus.Fatalln(username)      // $ hasTaintFlow="username"
-		logrus.Info(username)         // $ hasTaintFlow="username"
-		logrus.Infof(username, "")    // $ hasTaintFlow="username"
-		logrus.Infof("", username)    // $ hasTaintFlow="username"
-		logrus.Infoln(username)       // $ hasTaintFlow="username"
-		logrus.Panic(username)        // $ hasTaintFlow="username"
-		logrus.Panicf(username, "")   // $ hasTaintFlow="username"
-		logrus.Panicf("", username)   // $ hasTaintFlow="username"
-		logrus.Panicln(username)      // $ hasTaintFlow="username"
-		logrus.Print(username)        // $ hasTaintFlow="username"
-		logrus.Printf(username, "")   // $ hasTaintFlow="username"
-		logrus.Printf("", username)   // $ hasTaintFlow="username"
-		logrus.Println(username)      // $ hasTaintFlow="username"
-		logrus.Trace(username)        // $ hasTaintFlow="username"
-		logrus.Tracef(username, "")   // $ hasTaintFlow="username"
-		logrus.Tracef("", username)   // $ hasTaintFlow="username"
-		logrus.Traceln(username)      // $ hasTaintFlow="username"
-		logrus.Warn(username)         // $ hasTaintFlow="username"
-		logrus.Warnf(username, "")    // $ hasTaintFlow="username"
-		logrus.Warnf("", username)    // $ hasTaintFlow="username"
-		logrus.Warnln(username)       // $ hasTaintFlow="username"
-		logrus.Warning(username)      // $ hasTaintFlow="username"
-		logrus.Warningf(username, "") // $ hasTaintFlow="username"
-		logrus.Warningf("", username) // $ hasTaintFlow="username"
-		logrus.Warningln(username)    // $ hasTaintFlow="username"
-
+		err := fmt.Errorf("error: %s", username)
 		fields := make(logrus.Fields)
 		fields["username"] = username
-		entry := logrus.WithFields(fields)             // $ hasTaintFlow="fields"
-		entry = logrus.WithField("username", username) // $ hasTaintFlow="username"
-		entry.Debug(username)                          // $ hasTaintFlow="username"
-		entry.Debugf(username, "")                     // $ hasTaintFlow="username"
-		entry.Debugf("", username)                     // $ hasTaintFlow="username"
-		entry.Debugln(username)                        // $ hasTaintFlow="username"
-		entry.Error(username)                          // $ hasTaintFlow="username"
-		entry.Errorf(username, "")                     // $ hasTaintFlow="username"
-		entry.Errorf("", username)                     // $ hasTaintFlow="username"
-		entry.Errorln(username)                        // $ hasTaintFlow="username"
-		entry.Fatal(username)                          // $ hasTaintFlow="username"
-		entry.Fatalf(username, "")                     // $ hasTaintFlow="username"
-		entry.Fatalf("", username)                     // $ hasTaintFlow="username"
-		entry.Fatalln(username)                        // $ hasTaintFlow="username"
-		entry.Info(username)                           // $ hasTaintFlow="username"
-		entry.Infof(username, "")                      // $ hasTaintFlow="username"
-		entry.Infof("", username)                      // $ hasTaintFlow="username"
-		entry.Infoln(username)                         // $ hasTaintFlow="username"
-		entry.Log(0, username)                         // $ hasTaintFlow="username"
-		entry.Logf(0, username, "")                    // $ hasTaintFlow="username"
-		entry.Logf(0, "", username)                    // $ hasTaintFlow="username"
-		entry.Logln(0, username)                       // $ hasTaintFlow="username"
-		entry.Panic(username)                          // $ hasTaintFlow="username"
-		entry.Panicf(username, "")                     // $ hasTaintFlow="username"
-		entry.Panicf("", username)                     // $ hasTaintFlow="username"
-		entry.Panicln(username)                        // $ hasTaintFlow="username"
-		entry.Print(username)                          // $ hasTaintFlow="username"
-		entry.Printf(username, "")                     // $ hasTaintFlow="username"
-		entry.Printf("", username)                     // $ hasTaintFlow="username"
-		entry.Println(username)                        // $ hasTaintFlow="username"
-		entry.Trace(username)                          // $ hasTaintFlow="username"
-		entry.Tracef(username, "")                     // $ hasTaintFlow="username"
-		entry.Tracef("", username)                     // $ hasTaintFlow="username"
-		entry.Traceln(username)                        // $ hasTaintFlow="username"
-		entry.Warn(username)                           // $ hasTaintFlow="username"
-		entry.Warnf(username, "")                      // $ hasTaintFlow="username"
-		entry.Warnf("", username)                      // $ hasTaintFlow="username"
-		entry.Warnln(username)                         // $ hasTaintFlow="username"
-		entry.Warning(username)                        // $ hasTaintFlow="username"
-		entry.Warningf(username, "")                   // $ hasTaintFlow="username"
-		entry.Warningf("", username)                   // $ hasTaintFlow="username"
-		entry.Warningln(username)                      // $ hasTaintFlow="username"
+		logger := logrus.New()
+		entry := logrus.NewEntry(logger)
 
-		logger := entry.Logger
-		logger.Debug(username)        // $ hasTaintFlow="username"
-		logger.Debugf(username, "")   // $ hasTaintFlow="username"
-		logger.Debugf("", username)   // $ hasTaintFlow="username"
-		logger.Debugln(username)      // $ hasTaintFlow="username"
-		logger.Error(username)        // $ hasTaintFlow="username"
-		logger.Errorf(username, "")   // $ hasTaintFlow="username"
-		logger.Errorf("", username)   // $ hasTaintFlow="username"
-		logger.Errorln(username)      // $ hasTaintFlow="username"
-		logger.Fatal(username)        // $ hasTaintFlow="username"
-		logger.Fatalf(username, "")   // $ hasTaintFlow="username"
-		logger.Fatalf("", username)   // $ hasTaintFlow="username"
-		logger.Fatalln(username)      // $ hasTaintFlow="username"
-		logger.Info(username)         // $ hasTaintFlow="username"
-		logger.Infof(username, "")    // $ hasTaintFlow="username"
-		logger.Infof("", username)    // $ hasTaintFlow="username"
-		logger.Infoln(username)       // $ hasTaintFlow="username"
-		logger.Log(0, username)       // $ hasTaintFlow="username"
-		logger.Logf(0, username, "")  // $ hasTaintFlow="username"
-		logger.Logf(0, "", username)  // $ hasTaintFlow="username"
-		logger.Logln(0, username)     // $ hasTaintFlow="username"
-		logger.Panic(username)        // $ hasTaintFlow="username"
-		logger.Panicf(username, "")   // $ hasTaintFlow="username"
-		logger.Panicf("", username)   // $ hasTaintFlow="username"
-		logger.Panicln(username)      // $ hasTaintFlow="username"
-		logger.Print(username)        // $ hasTaintFlow="username"
-		logger.Printf(username, "")   // $ hasTaintFlow="username"
-		logger.Printf("", username)   // $ hasTaintFlow="username"
-		logger.Println(username)      // $ hasTaintFlow="username"
-		logger.Trace(username)        // $ hasTaintFlow="username"
-		logger.Tracef(username, "")   // $ hasTaintFlow="username"
-		logger.Tracef("", username)   // $ hasTaintFlow="username"
-		logger.Traceln(username)      // $ hasTaintFlow="username"
-		logger.Warn(username)         // $ hasTaintFlow="username"
-		logger.Warnf(username, "")    // $ hasTaintFlow="username"
-		logger.Warnf("", username)    // $ hasTaintFlow="username"
-		logger.Warnln(username)       // $ hasTaintFlow="username"
-		logger.Warning(username)      // $ hasTaintFlow="username"
-		logger.Warningf(username, "") // $ hasTaintFlow="username"
-		logger.Warningf("", username) // $ hasTaintFlow="username"
-		logger.Warningln(username)    // $ hasTaintFlow="username"
+		logrus.Debug(username)         // $ hasTaintFlow="username"
+		logrus.Debugf(username, "")    // $ hasTaintFlow="username"
+		logrus.Debugf("", username)    // $ hasTaintFlow="username"
+		logrus.Debugln(username)       // $ hasTaintFlow="username"
+		logrus.Error(username)         // $ hasTaintFlow="username"
+		logrus.Errorf(username, "")    // $ hasTaintFlow="username"
+		logrus.Errorf("", username)    // $ hasTaintFlow="username"
+		logrus.Errorln(username)       // $ hasTaintFlow="username"
+		logrus.Fatal(username)         // $ hasTaintFlow="username"
+		logrus.Fatalf(username, "")    // $ hasTaintFlow="username"
+		logrus.Fatalf("", username)    // $ hasTaintFlow="username"
+		logrus.Fatalln(username)       // $ hasTaintFlow="username"
+		logrus.Info(username)          // $ hasTaintFlow="username"
+		logrus.Infof(username, "")     // $ hasTaintFlow="username"
+		logrus.Infof("", username)     // $ hasTaintFlow="username"
+		logrus.Infoln(username)        // $ hasTaintFlow="username"
+		logrus.Panic(username)         // $ hasTaintFlow="username"
+		logrus.Panicf(username, "")    // $ hasTaintFlow="username"
+		logrus.Panicf("", username)    // $ hasTaintFlow="username"
+		logrus.Panicln(username)       // $ hasTaintFlow="username"
+		logrus.Print(username)         // $ hasTaintFlow="username"
+		logrus.Printf(username, "")    // $ hasTaintFlow="username"
+		logrus.Printf("", username)    // $ hasTaintFlow="username"
+		logrus.Println(username)       // $ hasTaintFlow="username"
+		logrus.Trace(username)         // $ hasTaintFlow="username"
+		logrus.Tracef(username, "")    // $ hasTaintFlow="username"
+		logrus.Tracef("", username)    // $ hasTaintFlow="username"
+		logrus.Traceln(username)       // $ hasTaintFlow="username"
+		logrus.Warn(username)          // $ hasTaintFlow="username"
+		logrus.Warnf(username, "")     // $ hasTaintFlow="username"
+		logrus.Warnf("", username)     // $ hasTaintFlow="username"
+		logrus.Warnln(username)        // $ hasTaintFlow="username"
+		logrus.Warning(username)       // $ hasTaintFlow="username"
+		logrus.Warningf(username, "")  // $ hasTaintFlow="username"
+		logrus.Warningf("", username)  // $ hasTaintFlow="username"
+		logrus.Warningln(username)     // $ hasTaintFlow="username"
+		logrus.WithError(err)          // $ hasTaintFlow="err"
+		logrus.WithField(username, "") // $ hasTaintFlow="username"
+		logrus.WithField("", username) // $ hasTaintFlow="username"
+		logrus.WithFields(fields)      // $ hasTaintFlow="fields"
+
+		entry.Debug(username)         // $ hasTaintFlow="username"
+		entry.Debugf(username, "")    // $ hasTaintFlow="username"
+		entry.Debugf("", username)    // $ hasTaintFlow="username"
+		entry.Debugln(username)       // $ hasTaintFlow="username"
+		entry.Error(username)         // $ hasTaintFlow="username"
+		entry.Errorf(username, "")    // $ hasTaintFlow="username"
+		entry.Errorf("", username)    // $ hasTaintFlow="username"
+		entry.Errorln(username)       // $ hasTaintFlow="username"
+		entry.Fatal(username)         // $ hasTaintFlow="username"
+		entry.Fatalf(username, "")    // $ hasTaintFlow="username"
+		entry.Fatalf("", username)    // $ hasTaintFlow="username"
+		entry.Fatalln(username)       // $ hasTaintFlow="username"
+		entry.Info(username)          // $ hasTaintFlow="username"
+		entry.Infof(username, "")     // $ hasTaintFlow="username"
+		entry.Infof("", username)     // $ hasTaintFlow="username"
+		entry.Infoln(username)        // $ hasTaintFlow="username"
+		entry.Log(0, username)        // $ hasTaintFlow="username"
+		entry.Logf(0, username, "")   // $ hasTaintFlow="username"
+		entry.Logf(0, "", username)   // $ hasTaintFlow="username"
+		entry.Logln(0, username)      // $ hasTaintFlow="username"
+		entry.Panic(username)         // $ hasTaintFlow="username"
+		entry.Panicf(username, "")    // $ hasTaintFlow="username"
+		entry.Panicf("", username)    // $ hasTaintFlow="username"
+		entry.Panicln(username)       // $ hasTaintFlow="username"
+		entry.Print(username)         // $ hasTaintFlow="username"
+		entry.Printf(username, "")    // $ hasTaintFlow="username"
+		entry.Printf("", username)    // $ hasTaintFlow="username"
+		entry.Println(username)       // $ hasTaintFlow="username"
+		entry.Trace(username)         // $ hasTaintFlow="username"
+		entry.Tracef(username, "")    // $ hasTaintFlow="username"
+		entry.Tracef("", username)    // $ hasTaintFlow="username"
+		entry.Traceln(username)       // $ hasTaintFlow="username"
+		entry.Warn(username)          // $ hasTaintFlow="username"
+		entry.Warnf(username, "")     // $ hasTaintFlow="username"
+		entry.Warnf("", username)     // $ hasTaintFlow="username"
+		entry.Warnln(username)        // $ hasTaintFlow="username"
+		entry.Warning(username)       // $ hasTaintFlow="username"
+		entry.Warningf(username, "")  // $ hasTaintFlow="username"
+		entry.Warningf("", username)  // $ hasTaintFlow="username"
+		entry.Warningln(username)     // $ hasTaintFlow="username"
+		entry.WithError(err)          // $ hasTaintFlow="err"
+		entry.WithField(username, "") // $ hasTaintFlow="username"
+		entry.WithField("", username) // $ hasTaintFlow="username"
+		entry.WithFields(fields)      // $ hasTaintFlow="fields"
+
+		logger.Debug(username)         // $ hasTaintFlow="username"
+		logger.Debugf(username, "")    // $ hasTaintFlow="username"
+		logger.Debugf("", username)    // $ hasTaintFlow="username"
+		logger.Debugln(username)       // $ hasTaintFlow="username"
+		logger.Error(username)         // $ hasTaintFlow="username"
+		logger.Errorf(username, "")    // $ hasTaintFlow="username"
+		logger.Errorf("", username)    // $ hasTaintFlow="username"
+		logger.Errorln(username)       // $ hasTaintFlow="username"
+		logger.Fatal(username)         // $ hasTaintFlow="username"
+		logger.Fatalf(username, "")    // $ hasTaintFlow="username"
+		logger.Fatalf("", username)    // $ hasTaintFlow="username"
+		logger.Fatalln(username)       // $ hasTaintFlow="username"
+		logger.Info(username)          // $ hasTaintFlow="username"
+		logger.Infof(username, "")     // $ hasTaintFlow="username"
+		logger.Infof("", username)     // $ hasTaintFlow="username"
+		logger.Infoln(username)        // $ hasTaintFlow="username"
+		logger.Log(0, username)        // $ hasTaintFlow="username"
+		logger.Logf(0, username, "")   // $ hasTaintFlow="username"
+		logger.Logf(0, "", username)   // $ hasTaintFlow="username"
+		logger.Logln(0, username)      // $ hasTaintFlow="username"
+		logger.Panic(username)         // $ hasTaintFlow="username"
+		logger.Panicf(username, "")    // $ hasTaintFlow="username"
+		logger.Panicf("", username)    // $ hasTaintFlow="username"
+		logger.Panicln(username)       // $ hasTaintFlow="username"
+		logger.Print(username)         // $ hasTaintFlow="username"
+		logger.Printf(username, "")    // $ hasTaintFlow="username"
+		logger.Printf("", username)    // $ hasTaintFlow="username"
+		logger.Println(username)       // $ hasTaintFlow="username"
+		logger.Trace(username)         // $ hasTaintFlow="username"
+		logger.Tracef(username, "")    // $ hasTaintFlow="username"
+		logger.Tracef("", username)    // $ hasTaintFlow="username"
+		logger.Traceln(username)       // $ hasTaintFlow="username"
+		logger.Warn(username)          // $ hasTaintFlow="username"
+		logger.Warnf(username, "")     // $ hasTaintFlow="username"
+		logger.Warnf("", username)     // $ hasTaintFlow="username"
+		logger.Warnln(username)        // $ hasTaintFlow="username"
+		logger.Warning(username)       // $ hasTaintFlow="username"
+		logger.Warningf(username, "")  // $ hasTaintFlow="username"
+		logger.Warningf("", username)  // $ hasTaintFlow="username"
+		logger.Warningln(username)     // $ hasTaintFlow="username"
+		logger.WithError(err)          // $ hasTaintFlow="err"
+		logger.WithField(username, "") // $ hasTaintFlow="username"
+		logger.WithField("", username) // $ hasTaintFlow="username"
+		logger.WithFields(fields)      // $ hasTaintFlow="fields"
+
+		var fieldlogger logrus.FieldLogger = entry
+		fieldlogger.Debug(username)         // $ hasTaintFlow="username"
+		fieldlogger.Debugf(username, "")    // $ hasTaintFlow="username"
+		fieldlogger.Debugf("", username)    // $ hasTaintFlow="username"
+		fieldlogger.Debugln(username)       // $ hasTaintFlow="username"
+		fieldlogger.Error(username)         // $ hasTaintFlow="username"
+		fieldlogger.Errorf(username, "")    // $ hasTaintFlow="username"
+		fieldlogger.Errorf("", username)    // $ hasTaintFlow="username"
+		fieldlogger.Errorln(username)       // $ hasTaintFlow="username"
+		fieldlogger.Fatal(username)         // $ hasTaintFlow="username"
+		fieldlogger.Fatalf(username, "")    // $ hasTaintFlow="username"
+		fieldlogger.Fatalf("", username)    // $ hasTaintFlow="username"
+		fieldlogger.Fatalln(username)       // $ hasTaintFlow="username"
+		fieldlogger.Info(username)          // $ hasTaintFlow="username"
+		fieldlogger.Infof(username, "")     // $ hasTaintFlow="username"
+		fieldlogger.Infof("", username)     // $ hasTaintFlow="username"
+		fieldlogger.Infoln(username)        // $ hasTaintFlow="username"
+		fieldlogger.Panic(username)         // $ hasTaintFlow="username"
+		fieldlogger.Panicf(username, "")    // $ hasTaintFlow="username"
+		fieldlogger.Panicf("", username)    // $ hasTaintFlow="username"
+		fieldlogger.Panicln(username)       // $ hasTaintFlow="username"
+		fieldlogger.Print(username)         // $ hasTaintFlow="username"
+		fieldlogger.Printf(username, "")    // $ hasTaintFlow="username"
+		fieldlogger.Printf("", username)    // $ hasTaintFlow="username"
+		fieldlogger.Println(username)       // $ hasTaintFlow="username"
+		fieldlogger.Warn(username)          // $ hasTaintFlow="username"
+		fieldlogger.Warnf(username, "")     // $ hasTaintFlow="username"
+		fieldlogger.Warnf("", username)     // $ hasTaintFlow="username"
+		fieldlogger.Warnln(username)        // $ hasTaintFlow="username"
+		fieldlogger.Warning(username)       // $ hasTaintFlow="username"
+		fieldlogger.Warningf(username, "")  // $ hasTaintFlow="username"
+		fieldlogger.Warningf("", username)  // $ hasTaintFlow="username"
+		fieldlogger.Warningln(username)     // $ hasTaintFlow="username"
+		fieldlogger.WithError(err)          // $ hasTaintFlow="err"
+		fieldlogger.WithField(username, "") // $ hasTaintFlow="username"
+		fieldlogger.WithField("", username) // $ hasTaintFlow="username"
+		fieldlogger.WithFields(fields)      // $ hasTaintFlow="fields"
 	}
 	// davecgh/go-spew/spew
 	{
@@ -361,8 +413,34 @@ func handler(req *http.Request, ctx *goproxy.ProxyCtx) {
 		sLogger.Named(username) // $ hasTaintFlow="username"
 		sLogger.With(username)  // $ hasTaintFlow="username"
 	}
+	// heuristic logger interface
+	{
+		logger.Printf(username)                // $ hasTaintFlow="username"
+		logger.Printf("%s", username)          // $ hasTaintFlow="username"
+		simpleLogger.Tracew(username)          // $ hasTaintFlow="username"
+		simpleLogger.Tracew("%s", username)    // $ hasTaintFlow="username"
+		simpleLogger.Debugw("%s %s", slice...) // $ hasTaintFlow="slice"
+	}
+
 }
 
+type Logger interface {
+	Printf(string, ...interface{})
+}
+
+type SimpleLogger interface {
+	Debugw(msg string, keysAndValues ...any)
+	Infow(msg string, keysAndValues ...any)
+	Warnw(msg string, keysAndValues ...any)
+	Errorw(msg string, keysAndValues ...any)
+	Tracew(msg string, keysAndValues ...any)
+}
+
+var (
+	logger       Logger
+	simpleLogger SimpleLogger
+)
+
 // GOOD: The user-provided value is escaped before being written to the log.
 func handlerGood(req *http.Request) {
 	username := req.URL.Query()["username"][0]
@@ -598,5 +676,4 @@ func handlerGood4(req *http.Request, ctx *goproxy.ProxyCtx) {
 		}
 		sLogger.Warnf("user %#q logged in.\n", username) // $ hasTaintFlow="username"
 	}
-
 }
diff --git a/go/ql/test/query-tests/Security/CWE-117/go.mod b/go/ql/test/query-tests/Security/CWE-117/go.mod
index 57b2077a4ed..906d90f31b6 100644
--- a/go/ql/test/query-tests/Security/CWE-117/go.mod
+++ b/go/ql/test/query-tests/Security/CWE-117/go.mod
@@ -1,14 +1,33 @@
 module main
 
-go 1.14
+go 1.23
 
 require (
 	github.com/astaxie/beego v1.12.3
+	github.com/davecgh/go-spew v1.1.1
 	github.com/elazarl/goproxy v0.0.0-20211114080932-d06c3be7c11b
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
-	github.com/kr/text v0.2.0 // indirect
 	github.com/sirupsen/logrus v1.8.1
-	github.com/stretchr/testify v1.6.0 // indirect
-	golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f // indirect
+	go.uber.org/zap v1.27.0
 	k8s.io/klog v1.0.0
 )
+
+require (
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.1.1 // indirect
+	github.com/golang/protobuf v1.4.2 // indirect
+	github.com/hashicorp/golang-lru v0.5.4 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/prometheus/client_golang v1.7.0 // indirect
+	github.com/prometheus/client_model v0.2.0 // indirect
+	github.com/prometheus/common v0.10.0 // indirect
+	github.com/prometheus/procfs v0.1.3 // indirect
+	github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644 // indirect
+	go.uber.org/multierr v1.10.0 // indirect
+	golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 // indirect
+	golang.org/x/net v0.0.0-20190620200207-3b0461eec859 // indirect
+	golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f // indirect
+	golang.org/x/text v0.3.0 // indirect
+	google.golang.org/protobuf v1.23.0 // indirect
+	gopkg.in/yaml.v2 v2.2.8 // indirect
+)
diff --git a/go/ql/test/query-tests/Security/CWE-117/vendor/github.com/sirupsen/logrus/stub.go b/go/ql/test/query-tests/Security/CWE-117/vendor/github.com/sirupsen/logrus/stub.go
index e8f7bccc446..497d85559bb 100644
--- a/go/ql/test/query-tests/Security/CWE-117/vendor/github.com/sirupsen/logrus/stub.go
+++ b/go/ql/test/query-tests/Security/CWE-117/vendor/github.com/sirupsen/logrus/stub.go
@@ -2,7 +2,7 @@
 // This is a simple stub for github.com/sirupsen/logrus, strictly for use in testing.
 
 // See the LICENSE file for information about the licensing of the original library.
-// Source: github.com/sirupsen/logrus (exports: Fields,Entry,Logger,Level; functions: Debug,Debugf,Debugln,Error,Errorf,Errorln,Fatal,Fatalf,Fatalln,Info,Infof,Infoln,Panic,Panicf,Panicln,Print,Printf,Println,Trace,Tracef,Traceln,Warn,Warnf,Warnln,Warning,Warningf,Warningln,WithFields,WithField)
+// Source: github.com/sirupsen/logrus (exports: FieldLogger,Fields,Entry,Logger,Level; functions: Debug,Debugf,Debugln,Error,Errorf,Errorln,Fatal,Fatalf,Fatalln,Info,Infof,Infoln,New,NewEntry,Panic,Panicf,Panicln,Print,Printf,Println,Trace,Tracef,Traceln,Warn,Warnf,Warnln,Warning,Warningf,Warningln,WithError,WithFields,WithField)
 
 // Package logrus is a stub of github.com/sirupsen/logrus, generated by depstubber.
 package logrus
@@ -148,6 +148,36 @@ func Fatalf(_ string, _ ...interface{}) {}
 
 func Fatalln(_ ...interface{}) {}
 
+type FieldLogger interface {
+	Debug(_ ...interface{})
+	Debugf(_ string, _ ...interface{})
+	Debugln(_ ...interface{})
+	Error(_ ...interface{})
+	Errorf(_ string, _ ...interface{})
+	Errorln(_ ...interface{})
+	Fatal(_ ...interface{})
+	Fatalf(_ string, _ ...interface{})
+	Fatalln(_ ...interface{})
+	Info(_ ...interface{})
+	Infof(_ string, _ ...interface{})
+	Infoln(_ ...interface{})
+	Panic(_ ...interface{})
+	Panicf(_ string, _ ...interface{})
+	Panicln(_ ...interface{})
+	Print(_ ...interface{})
+	Printf(_ string, _ ...interface{})
+	Println(_ ...interface{})
+	Warn(_ ...interface{})
+	Warnf(_ string, _ ...interface{})
+	Warning(_ ...interface{})
+	Warningf(_ string, _ ...interface{})
+	Warningln(_ ...interface{})
+	Warnln(_ ...interface{})
+	WithError(_ error) *Entry
+	WithField(_ string, _ interface{}) *Entry
+	WithFields(_ Fields) *Entry
+}
+
 type Fields map[string]interface{}
 
 type Formatter interface {
@@ -332,6 +362,14 @@ func (_ *Logger) WriterLevel(_ Level) *io.PipeWriter {
 	return nil
 }
 
+func New() *Logger {
+	return nil
+}
+
+func NewEntry(_ *Logger) *Entry {
+	return nil
+}
+
 func Panic(_ ...interface{}) {}
 
 func Panicf(_ string, _ ...interface{}) {}
@@ -362,6 +400,10 @@ func Warningln(_ ...interface{}) {}
 
 func Warnln(_ ...interface{}) {}
 
+func WithError(_ error) *Entry {
+	return nil
+}
+
 func WithField(_ string, _ interface{}) *Entry {
 	return nil
 }
diff --git a/go/ql/test/query-tests/Security/CWE-117/vendor/modules.txt b/go/ql/test/query-tests/Security/CWE-117/vendor/modules.txt
index a6227c09a93..fa7cb0a9a82 100644
--- a/go/ql/test/query-tests/Security/CWE-117/vendor/modules.txt
+++ b/go/ql/test/query-tests/Security/CWE-117/vendor/modules.txt
@@ -1,24 +1,134 @@
 # github.com/astaxie/beego v1.12.3
-## explicit
+## explicit; go 1.13
 github.com/astaxie/beego
+github.com/astaxie/beego/config
+github.com/astaxie/beego/context
+github.com/astaxie/beego/context/param
+github.com/astaxie/beego/grace
+github.com/astaxie/beego/logs
+github.com/astaxie/beego/session
+github.com/astaxie/beego/toolbox
+github.com/astaxie/beego/utils
+# github.com/beorn7/perks v1.0.1
+## explicit; go 1.11
+github.com/beorn7/perks/quantile
+# github.com/cespare/xxhash/v2 v2.1.1
+## explicit; go 1.11
+github.com/cespare/xxhash/v2
+# github.com/davecgh/go-spew v1.1.1
+## explicit
+github.com/davecgh/go-spew/spew
 # github.com/elazarl/goproxy v0.0.0-20211114080932-d06c3be7c11b
 ## explicit
 github.com/elazarl/goproxy
 # github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
 ## explicit
 github.com/golang/glog
-# github.com/kr/text v0.2.0
+# github.com/golang/protobuf v1.4.2
+## explicit; go 1.9
+github.com/golang/protobuf/proto
+github.com/golang/protobuf/ptypes
+github.com/golang/protobuf/ptypes/any
+github.com/golang/protobuf/ptypes/duration
+github.com/golang/protobuf/ptypes/timestamp
+# github.com/hashicorp/golang-lru v0.5.4
+## explicit; go 1.12
+github.com/hashicorp/golang-lru
+github.com/hashicorp/golang-lru/simplelru
+# github.com/matttproud/golang_protobuf_extensions v1.0.1
 ## explicit
-github.com/kr/text
+github.com/matttproud/golang_protobuf_extensions/pbutil
+# github.com/prometheus/client_golang v1.7.0
+## explicit; go 1.11
+github.com/prometheus/client_golang/prometheus
+github.com/prometheus/client_golang/prometheus/internal
+github.com/prometheus/client_golang/prometheus/promhttp
+# github.com/prometheus/client_model v0.2.0
+## explicit; go 1.9
+github.com/prometheus/client_model/go
+# github.com/prometheus/common v0.10.0
+## explicit; go 1.11
+github.com/prometheus/common/expfmt
+github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg
+github.com/prometheus/common/model
+# github.com/prometheus/procfs v0.1.3
+## explicit; go 1.12
+github.com/prometheus/procfs
+github.com/prometheus/procfs/internal/fs
+github.com/prometheus/procfs/internal/util
+# github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644
+## explicit
+github.com/shiena/ansicolor
 # github.com/sirupsen/logrus v1.8.1
-## explicit
+## explicit; go 1.13
 github.com/sirupsen/logrus
-# github.com/stretchr/testify v1.6.0
+# go.uber.org/multierr v1.10.0
+## explicit; go 1.19
+go.uber.org/multierr
+# go.uber.org/zap v1.27.0
+## explicit; go 1.19
+go.uber.org/zap
+go.uber.org/zap/buffer
+go.uber.org/zap/internal
+go.uber.org/zap/internal/bufferpool
+go.uber.org/zap/internal/color
+go.uber.org/zap/internal/exit
+go.uber.org/zap/internal/pool
+go.uber.org/zap/internal/stacktrace
+go.uber.org/zap/zapcore
+# golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550
 ## explicit
-github.com/stretchr/testify
+golang.org/x/crypto/acme
+golang.org/x/crypto/acme/autocert
+# golang.org/x/net v0.0.0-20190620200207-3b0461eec859
+## explicit; go 1.11
+golang.org/x/net/idna
 # golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f
+## explicit; go 1.12
+golang.org/x/sys/internal/unsafeheader
+golang.org/x/sys/unix
+golang.org/x/sys/windows
+# golang.org/x/text v0.3.0
 ## explicit
-golang.org/x/sys
+golang.org/x/text/secure/bidirule
+golang.org/x/text/transform
+golang.org/x/text/unicode/bidi
+golang.org/x/text/unicode/norm
+# google.golang.org/protobuf v1.23.0
+## explicit; go 1.9
+google.golang.org/protobuf/encoding/prototext
+google.golang.org/protobuf/encoding/protowire
+google.golang.org/protobuf/internal/descfmt
+google.golang.org/protobuf/internal/descopts
+google.golang.org/protobuf/internal/detrand
+google.golang.org/protobuf/internal/encoding/defval
+google.golang.org/protobuf/internal/encoding/messageset
+google.golang.org/protobuf/internal/encoding/tag
+google.golang.org/protobuf/internal/encoding/text
+google.golang.org/protobuf/internal/errors
+google.golang.org/protobuf/internal/fieldnum
+google.golang.org/protobuf/internal/fieldsort
+google.golang.org/protobuf/internal/filedesc
+google.golang.org/protobuf/internal/filetype
+google.golang.org/protobuf/internal/flags
+google.golang.org/protobuf/internal/genname
+google.golang.org/protobuf/internal/impl
+google.golang.org/protobuf/internal/mapsort
+google.golang.org/protobuf/internal/pragma
+google.golang.org/protobuf/internal/set
+google.golang.org/protobuf/internal/strs
+google.golang.org/protobuf/internal/version
+google.golang.org/protobuf/proto
+google.golang.org/protobuf/reflect/protoreflect
+google.golang.org/protobuf/reflect/protoregistry
+google.golang.org/protobuf/runtime/protoiface
+google.golang.org/protobuf/runtime/protoimpl
+google.golang.org/protobuf/types/known/anypb
+google.golang.org/protobuf/types/known/durationpb
+google.golang.org/protobuf/types/known/timestamppb
+# gopkg.in/yaml.v2 v2.2.8
+## explicit
+gopkg.in/yaml.v2
 # k8s.io/klog v1.0.0
-## explicit
+## explicit; go 1.12
 k8s.io/klog
diff --git a/go/ql/test/query-tests/Security/CWE-681/IncorrectIntegerConversion.expected b/go/ql/test/query-tests/Security/CWE-681/IncorrectIntegerConversion.expected
index 105b7026d0c..42831abaf15 100644
--- a/go/ql/test/query-tests/Security/CWE-681/IncorrectIntegerConversion.expected
+++ b/go/ql/test/query-tests/Security/CWE-681/IncorrectIntegerConversion.expected
@@ -1,3 +1,2 @@
-failures
 invalidModelRow
 testFailures
diff --git a/java/ql/automodel/publish.sh b/java/ql/automodel/publish.sh
deleted file mode 100755
index 7304f0da180..00000000000
--- a/java/ql/automodel/publish.sh
+++ /dev/null
@@ -1,197 +0,0 @@
-#!/bin/bash
-set -e
-
-help="Usage: ./publish [--override-release] [--dry-run]
-Publish the automodel query pack.
-
-If no arguments are provided, publish the version of the codeql repo specified by the latest official release of the codeml-automodel repo.
-If the --override-release argument is provided, your current local HEAD is used (for unofficial releases or patching).
-If the --dry-run argument is provided, the release is not published (for testing purposes)."
-
-# Echo the help message
-if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
-  echo "$help"
-  exit 0
-fi
-
-# Check the number of arguments are valid
-if [ $# -gt 2 ]; then
-  echo "Error: Invalid arguments provided"
-  echo "$help"
-  exit 1
-fi
-
-OVERRIDE_RELEASE=0
-DRY_RUN=0
-for arg in "$@"
-do
-  case $arg in
-    --override-release)
-    OVERRIDE_RELEASE=1
-    shift # Remove --override-release from processing
-    ;;
-    --dry-run)
-    DRY_RUN=1
-    shift # Remove --dry-run from processing
-    ;;
-    *)
-    echo "Error: Invalid argument provided: $arg"
-    echo "$help"
-    exit 1
-    ;;
-  esac
-done
-
-# Describe what we're about to do based on the command-line arguments
-if [ $OVERRIDE_RELEASE = 1 ]; then
-  echo "Publishing the current HEAD of the automodel repo"
-else
-  echo "Publishing the version of the automodel repo specified by the latest official release of the codeml-automodel repo"
-fi
-if [ $DRY_RUN = 1 ]; then
-  echo "Dry run: we will step through the process but we won't publish the query pack"
-else
-  echo "Not a dry run! Publishing the query pack"
-fi
-
-# If we're publishing the codeml-automodel release then we will checkout the sha specified in the release.
-# So we need to check that there are no uncommitted changes in the local branch.
-# And, if we're publishing the current HEAD, it's cleaner to ensure that there are no uncommitted changes.
-if ! git diff --quiet; then
-  echo "Error: Uncommitted changes exist. Please commit or stash your changes before publishing."
-  exit 1
-fi
-
-# Check the above environment variables are set
-if [ -z "${GITHUB_TOKEN}" ]; then
-  echo "Error: GITHUB_TOKEN environment variable not set. Please set this to a token with package:write permissions to codeql."
-  exit 1
-fi
-if [ -z "${GH_TOKEN}" ]; then
-  echo "Error: GH_TOKEN environment variable not set. Please set this to a token with repo permissions to github/codeml-automodel."
-  exit 1
-fi
-
-# Get the sha of the previous release, i.e. the last commit to the main branch that updated the query pack version
-PREVIOUS_RELEASE_SHA=$(git rev-list -n 1 main -- ./src/qlpack.yml)
-if [ -z "$PREVIOUS_RELEASE_SHA" ]; then
-  echo "Error: Could not get the sha of the previous release of codeml-automodel query pack"
-  exit 1
-else
-  echo "Previous query-pack release sha: $PREVIOUS_RELEASE_SHA"
-fi
-
-CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
-CURRENT_SHA=$(git rev-parse HEAD)
-
-if [ $OVERRIDE_RELEASE = 1 ]; then
-  # Check that the current HEAD is downstream from PREVIOUS_RELEASE_SHA
-  if ! git merge-base --is-ancestor "$PREVIOUS_RELEASE_SHA" "$CURRENT_SHA"; then
-    echo "Error: The current HEAD is not downstream from the previous release"
-    exit 1
-  fi
-else
-  # Get the latest release of codeml-automodel
-  TAG_NAME=$(gh api -H 'Accept: application/vnd.github+json' -H 'X-GitHub-Api-Version: 2022-11-28' /repos/github/codeml-automodel/releases/latest | jq -r .tag_name)
-  # Check TAG_NAME is not empty
-  if [ -z "$TAG_NAME" ]; then
-      echo "Error: Could not get latest release of codeml-automodel"
-      exit 1
-  fi
-  echo "Updating to latest automodel release: $TAG_NAME"
-  # Before downloading, delete any existing release.zip, and ignore failure if not present
-  rm release.zip || true
-  gh release download $TAG_NAME -A zip -O release.zip --repo 'https://github.com/github/codeml-automodel'
-  # Before unzipping, delete any existing release directory, and ignore failure if not present
-  rm -rf release || true
-  unzip -o release.zip -d release 
-  REVISION=$(jq -r '.["codeql-sha"]' release/codeml-automodel*/codeml-automodel-release.json)
-  echo "The latest codeml-automodel release specifies the codeql sha $REVISION"
-  # Check that REVISION is downstream from PREVIOUS_RELEASE_SHA
-  if ! git merge-base --is-ancestor "$PREVIOUS_RELEASE_SHA" "$REVISION"; then
-    echo "Error: The codeql version $REVISION is not downstream of the query-pack version $PREVIOUS_RELEASE_SHA"
-    exit 1
-  fi
-  # Get the version of the codeql code specified by the codeml-automodel release
-  git checkout "$REVISION"
-fi
-
-# Get the absolute path of the automodel repo
-AUTOMODEL_ROOT="$(readlink -f "$(dirname $0)")"
-# Get the absolute path of the workspace root
-WORKSPACE_ROOT="$AUTOMODEL_ROOT/../../.."
-# Specify the groups of queries to test and publish
-GRPS="automodel,-test"
-
-# Install the codeql gh extension
-gh extensions install github/gh-codeql
-
-pushd "$AUTOMODEL_ROOT"
-echo Testing automodel queries
-gh codeql test run test
-popd
-
-pushd "$WORKSPACE_ROOT"
-echo "Preparing the release"
-gh codeql pack release --groups $GRPS -v
-
-if [ $DRY_RUN = 1 ]; then
-  echo "Dry run: not publishing the query pack"
-  gh codeql pack publish --groups $GRPS --dry-run -v
-else
-  echo "Not a dry run! Publishing the query pack"
-  gh codeql pack publish --groups $GRPS -v
-fi
-
-echo "Bumping versions"
-gh codeql pack post-release --groups $GRPS -v
-popd
-
-# The above commands update
-#  ./src/CHANGELOG.md
-#  ./src/codeql-pack.release.yml
-#  ./src/qlpack.yml
-# and add a new file
-#  ./src/change-notes/released/<version>.md
-
-# Get the filename of the most recently created file in ./src/change-notes/released/*.md
-# This will be the file for the new release
-NEW_CHANGE_NOTES_FILE=$(ls -t ./src/change-notes/released/*.md | head -n 1)
-
-# Make a copy of the modified files
-mv ./src/CHANGELOG.md ./src/CHANGELOG.md.dry-run
-mv ./src/codeql-pack.release.yml ./src/codeql-pack.release.yml.dry-run
-mv ./src/qlpack.yml ./src/qlpack.yml.dry-run
-mv "$NEW_CHANGE_NOTES_FILE" ./src/change-notes/released.md.dry-run
-
-if [ $OVERRIDE_RELEASE = 1 ]; then
-  # Restore the original files
-  git checkout ./src/CHANGELOG.md
-  git checkout ./src/codeql-pack.release.yml
-  git checkout ./src/qlpack.yml
-else
-  # Restore the original files
-  git checkout "$CURRENT_BRANCH" --force
-fi
-
-if [ $DRY_RUN = 1 ]; then
-  echo "Inspect the updated dry-run version files:"
-  ls -l ./src/*.dry-run
-  ls -l ./src/change-notes/*.dry-run
-else
-  # Add the updated files to the current branch
-  echo "Adding the version changes"
-  mv -f ./src/CHANGELOG.md.dry-run ./src/CHANGELOG.md
-  mv -f ./src/codeql-pack.release.yml.dry-run ./src/codeql-pack.release.yml
-  mv -f ./src/qlpack.yml.dry-run ./src/qlpack.yml
-  mv -f ./src/change-notes/released.md.dry-run "$NEW_CHANGE_NOTES_FILE"
-  git add ./src/CHANGELOG.md
-  git add ./src/codeql-pack.release.yml
-  git add ./src/qlpack.yml
-  git add "$NEW_CHANGE_NOTES_FILE"
-  echo "Added the following updated version files to the current branch:"
-  git status -s
-  echo "To complete the release, please commit these files and merge to the main branch"
-fi
-
-echo "Done"
\ No newline at end of file
diff --git a/java/ql/automodel/src/AutomodelAlertSinkUtil.qll b/java/ql/automodel/src/AutomodelAlertSinkUtil.qll
deleted file mode 100644
index f20c8e57b6c..00000000000
--- a/java/ql/automodel/src/AutomodelAlertSinkUtil.qll
+++ /dev/null
@@ -1,183 +0,0 @@
-private import java
-private import semmle.code.java.dataflow.ExternalFlow as ExternalFlow
-private import semmle.code.java.dataflow.TaintTracking
-private import semmle.code.java.security.RequestForgeryConfig
-private import semmle.code.java.security.CommandLineQuery
-private import semmle.code.java.security.SqlConcatenatedQuery
-private import semmle.code.java.security.SqlInjectionQuery
-private import semmle.code.java.security.UrlRedirectQuery
-private import semmle.code.java.security.TaintedPathQuery
-private import semmle.code.java.security.SqlInjectionQuery
-private import AutomodelJavaUtil
-
-private newtype TSinkModel =
-  MkSinkModel(
-    string package, string type, boolean subtypes, string name, string signature, string ext,
-    string input, string kind, string provenance
-  ) {
-    ExternalFlow::sinkModel(package, type, subtypes, name, signature, ext, input, kind, provenance,
-      _)
-  }
-
-class SinkModel extends TSinkModel {
-  string package;
-  string type;
-  boolean subtypes;
-  string name;
-  string signature;
-  string ext;
-  string input;
-  string kind;
-  string provenance;
-
-  SinkModel() {
-    this = MkSinkModel(package, type, subtypes, name, signature, ext, input, kind, provenance)
-  }
-
-  /** Gets the package for this sink model. */
-  string getPackage() { result = package }
-
-  /** Gets the type for this sink model. */
-  string getType() { result = type }
-
-  /** Gets whether this sink model considers subtypes. */
-  boolean getSubtypes() { result = subtypes }
-
-  /** Gets the name for this sink model. */
-  string getName() { result = name }
-
-  /** Gets the signature for this sink model. */
-  string getSignature() { result = signature }
-
-  /** Gets the input for this sink model. */
-  string getInput() { result = input }
-
-  /** Gets the extension for this sink model. */
-  string getExt() { result = ext }
-
-  /** Gets the kind for this sink model. */
-  string getKind() { result = kind }
-
-  /** Gets the provenance for this sink model. */
-  string getProvenance() { result = provenance }
-
-  /** Gets the number of instances of this sink model. */
-  int getInstanceCount() { result = count(PotentialSinkModelExpr p | p.getSinkModel() = this) }
-
-  /** Gets a string representation of this sink model. */
-  string toString() {
-    result =
-      "SinkModel(" + package + ", " + type + ", " + subtypes + ", " + name + ", " + signature + ", "
-        + ext + ", " + input + ", " + kind + ", " + provenance + ")"
-  }
-
-  /** Gets a string representation of this sink model as it would appear in a Models-as-Data file. */
-  string getRepr() {
-    result =
-      "\"" + package + "\", \"" + type + "\", " + pyBool(subtypes) + ", \"" + name + "\", \"" +
-        signature + "\", \"" + ext + "\", \"" + input + "\", \"" + kind + "\", \"" + provenance +
-        "\""
-  }
-}
-
-/** An expression that may correspond to a sink model. */
-class PotentialSinkModelExpr extends Expr {
-  /**
-   *  Holds if this expression has the given signature. The signature should contain enough
-   *  information to determine a corresponding sink model, if one exists.
-   */
-  pragma[nomagic]
-  predicate hasSignature(
-    string package, string type, boolean subtypes, string name, string signature, string input
-  ) {
-    exists(Call call, Callable callable, int argIdx |
-      call.getCallee().getSourceDeclaration() = callable and
-      (
-        this = call.getArgument(argIdx)
-        or
-        this = call.getQualifier() and argIdx = -1
-      ) and
-      (if argIdx = -1 then input = "Argument[this]" else input = "Argument[" + argIdx + "]") and
-      package = callable.getDeclaringType().getPackage().getName() and
-      type = callable.getDeclaringType().getErasure().(RefType).getNestedName() and
-      subtypes = considerSubtypes(callable) and
-      name = callable.getName() and
-      signature = ExternalFlow::paramsString(callable)
-    )
-  }
-
-  /** Gets a sink model that corresponds to this expression. */
-  SinkModel getSinkModel() {
-    this.hasSignature(result.getPackage(), result.getType(), result.getSubtypes(), result.getName(),
-      result.getSignature(), result.getInput())
-  }
-}
-
-private string pyBool(boolean b) {
-  b = true and result = "True"
-  or
-  b = false and result = "False"
-}
-
-/**
- * Gets a string representation of the existing sink model at the expression `e`, in the format in
- * which it would appear in a Models-as-Data file. Also restricts the provenance of the sink model
- * to be `ai-generated`.
- */
-string getSinkModelRepr(PotentialSinkModelExpr e) {
-  result = e.getSinkModel().getRepr() and
-  e.getSinkModel().getProvenance() = "ai-generated"
-}
-
-/**
- * Gets the string representation of a sink model in a format suitable for appending to an alert
- * message.
- */
-string getSinkModelQueryRepr(PotentialSinkModelExpr e) {
-  result = "\nsinkModel: " + getSinkModelRepr(e)
-}
-
-/**
- * A parameterised module that takes a dataflow config, and exposes a predicate for counting the
- * number of AI-generated sink models that appear in alerts for that query.
- */
-private module SinkTallier<DataFlow::ConfigSig Config> {
-  module ConfigFlow = TaintTracking::Global<Config>;
-
-  predicate getSinkModelCount(int c, SinkModel s) {
-    s = any(ConfigFlow::PathNode sink).getNode().asExpr().(PotentialSinkModelExpr).getSinkModel() and
-    c =
-      strictcount(ConfigFlow::PathNode sink |
-        ConfigFlow::flowPath(_, sink) and
-        s = sink.getNode().asExpr().(PotentialSinkModelExpr).getSinkModel()
-      )
-  }
-}
-
-predicate sinkModelTallyPerQuery(string queryName, int alertCount, SinkModel sinkModel) {
-  queryName = "java/request-forgery" and
-  SinkTallier<RequestForgeryConfig>::getSinkModelCount(alertCount, sinkModel)
-  or
-  queryName = "java/command-line-injection" and
-  SinkTallier<InputToArgumentToExecFlowConfig>::getSinkModelCount(alertCount, sinkModel)
-  or
-  queryName = "java/concatenated-sql-query" and
-  SinkTallier<UncontrolledStringBuilderSourceFlowConfig>::getSinkModelCount(alertCount, sinkModel)
-  or
-  queryName = "java/ssrf" and
-  SinkTallier<RequestForgeryConfig>::getSinkModelCount(alertCount, sinkModel)
-  or
-  queryName = "java/path-injection" and
-  SinkTallier<TaintedPathConfig>::getSinkModelCount(alertCount, sinkModel)
-  or
-  queryName = "java/unvalidated-url-redirection" and
-  SinkTallier<UrlRedirectConfig>::getSinkModelCount(alertCount, sinkModel)
-  or
-  queryName = "java/sql-injection" and
-  SinkTallier<QueryInjectionFlowConfig>::getSinkModelCount(alertCount, sinkModel)
-}
-
-predicate sinkModelTally(int alertCount, SinkModel sinkModel) {
-  sinkModelTallyPerQuery(_, _, sinkModel) and
-  alertCount = sum(int c | sinkModelTallyPerQuery(_, c, sinkModel))
-}
diff --git a/java/ql/automodel/src/AutomodelAlertSinks.ql b/java/ql/automodel/src/AutomodelAlertSinks.ql
deleted file mode 100644
index e9af51b4d63..00000000000
--- a/java/ql/automodel/src/AutomodelAlertSinks.ql
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * @name Number of alerts per sink model
- * @description Counts the number of alerts using `ai-generated` sink models.
- * @kind table
- * @id java/ml/metrics-count-alerts-per-sink-model
- * @tags internal automodel metrics
- */
-
-private import java
-private import AutomodelAlertSinkUtil
-
-from int alertCount, SinkModel s
-where sinkModelTally(alertCount, s) and s.getProvenance() = "ai-generated"
-select alertCount, s.getPackage() as package, s.getType() as type, s.getSubtypes() as subtypes,
-  s.getName() as name, s.getSignature() as signature, s.getInput() as input, s.getExt() as ext,
-  s.getKind() as kind, s.getProvenance() as provenance order by alertCount desc
diff --git a/java/ql/automodel/src/AutomodelAlertSinksPerQuery.ql b/java/ql/automodel/src/AutomodelAlertSinksPerQuery.ql
deleted file mode 100644
index 64a5038d116..00000000000
--- a/java/ql/automodel/src/AutomodelAlertSinksPerQuery.ql
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @name Number of alerts per sink model and query
- * @description Counts the number of alerts per query using `ai-generated` sink models.
- * @kind table
- * @id java/ml/metrics-count-alerts-per-sink-model-and-query
- * @tags internal automodel metrics
- */
-
-private import java
-private import AutomodelAlertSinkUtil
-
-from string queryId, int alertCount, SinkModel s
-where
-  sinkModelTallyPerQuery(queryId, alertCount, s) and
-  s.getProvenance() = "ai-generated"
-select queryId, alertCount, s.getPackage() as package, s.getType() as type,
-  s.getSubtypes() as subtypes, s.getName() as name, s.getSignature() as signature,
-  s.getInput() as input, s.getExt() as ext, s.getKind() as kind, s.getProvenance() as provenance
-  order by queryId, alertCount desc
diff --git a/java/ql/automodel/src/AutomodelApplicationModeCharacteristics.qll b/java/ql/automodel/src/AutomodelApplicationModeCharacteristics.qll
deleted file mode 100644
index 750d776891f..00000000000
--- a/java/ql/automodel/src/AutomodelApplicationModeCharacteristics.qll
+++ /dev/null
@@ -1,677 +0,0 @@
-/**
- * For internal use only.
- */
-
-private import java
-private import semmle.code.Location as Location
-private import semmle.code.java.dataflow.DataFlow
-private import semmle.code.java.dataflow.TaintTracking
-private import semmle.code.java.dataflow.ExternalFlow as ExternalFlow
-private import semmle.code.java.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl
-private import semmle.code.java.security.ExternalAPIs as ExternalAPIs
-private import semmle.code.java.Expr as Expr
-private import semmle.code.java.security.QueryInjection
-private import semmle.code.java.dataflow.internal.ModelExclusions as ModelExclusions
-private import AutomodelJavaUtil as AutomodelJavaUtil
-private import semmle.code.java.security.PathSanitizer as PathSanitizer
-import AutomodelSharedCharacteristics as SharedCharacteristics
-import AutomodelEndpointTypes as AutomodelEndpointTypes
-
-newtype JavaRelatedLocationType =
-  CallContext() or
-  MethodDoc() or
-  ClassDoc()
-
-newtype TApplicationModeEndpoint =
-  TExplicitArgument(Call call, DataFlow::Node arg) {
-    AutomodelJavaUtil::isFromSource(call) and
-    exists(Argument argExpr |
-      arg.asExpr() = argExpr and call = argExpr.getCall() and not argExpr.isVararg()
-    ) and
-    not AutomodelJavaUtil::isUnexploitableType(arg.getType())
-  } or
-  TInstanceArgument(Call call, DataFlow::Node arg) {
-    AutomodelJavaUtil::isFromSource(call) and
-    arg = DataFlow::getInstanceArgument(call) and
-    not call instanceof ConstructorCall and
-    not AutomodelJavaUtil::isUnexploitableType(arg.getType())
-  } or
-  TImplicitVarargsArray(Call call, DataFlow::ImplicitVarargsArray arg, int idx) {
-    AutomodelJavaUtil::isFromSource(call) and
-    call = arg.getCall() and
-    idx = call.getCallee().getVaragsParameterIndex() and
-    not AutomodelJavaUtil::isUnexploitableType(arg.getType())
-  } or
-  TMethodReturnValue(MethodCall call) {
-    AutomodelJavaUtil::isFromSource(call) and
-    not AutomodelJavaUtil::isUnexploitableType(call.getType())
-  } or
-  TOverriddenParameter(Parameter p, Method overriddenMethod) {
-    AutomodelJavaUtil::isFromSource(p) and
-    p.getCallable().(Method).overrides(overriddenMethod)
-  }
-
-/**
- * An endpoint is a node that is a candidate for modeling.
- */
-abstract private class ApplicationModeEndpoint extends TApplicationModeEndpoint {
-  /**
-   * Gets the callable to be modeled that this endpoint represents.
-   */
-  abstract Callable getCallable();
-
-  /**
-   * Gets the input (if any) for this endpoint, eg.: `Argument[0]`.
-   *
-   * For endpoints that are source candidates, this will be `none()`.
-   */
-  abstract string getMaDInput();
-
-  /**
-   * Gets the output (if any) for this endpoint, eg.: `ReturnValue`.
-   *
-   * For endpoints that are sink candidates, this will be `none()`.
-   */
-  abstract string getMaDOutput();
-
-  abstract Top asTop();
-
-  /**
-   * Converts the endpoint to a node that can be used in a data flow graph.
-   */
-  abstract DataFlow::Node asNode();
-
-  string getExtensibleType() {
-    if not exists(this.getMaDInput()) and exists(this.getMaDOutput())
-    then result = "sourceModel"
-    else
-      if exists(this.getMaDInput()) and not exists(this.getMaDOutput())
-      then result = "sinkModel"
-      else none() // if both exist, it would be a summaryModel (not yet supported)
-  }
-
-  abstract string toString();
-}
-
-class TCallArgument = TExplicitArgument or TInstanceArgument or TImplicitVarargsArray;
-
-/**
- * An endpoint that represents an "argument" to a call in a broad sense, including
- * both explicit arguments and the instance argument.
- */
-abstract class CallArgument extends ApplicationModeEndpoint, TCallArgument {
-  Call call;
-  DataFlow::Node arg;
-
-  override Callable getCallable() { result = call.getCallee().getSourceDeclaration() }
-
-  override string getMaDOutput() { none() }
-
-  override DataFlow::Node asNode() { result = arg }
-
-  Call getCall() { result = call }
-
-  override string toString() { result = arg.toString() }
-}
-
-/**
- * An endpoint that represents an explicit argument to a call.
- */
-class ExplicitArgument extends CallArgument, TExplicitArgument {
-  ExplicitArgument() { this = TExplicitArgument(call, arg) }
-
-  private int getArgIndex() { this.asTop() = call.getArgument(result) }
-
-  override string getMaDInput() { result = "Argument[" + this.getArgIndex() + "]" }
-
-  override Top asTop() { result = arg.asExpr() }
-}
-
-/**
- * An endpoint that represents the instance argument to a call.
- */
-class InstanceArgument extends CallArgument, TInstanceArgument {
-  InstanceArgument() { this = TInstanceArgument(call, arg) }
-
-  override string getMaDInput() { result = "Argument[this]" }
-
-  override Top asTop() { if exists(arg.asExpr()) then result = arg.asExpr() else result = call }
-
-  override string toString() { result = arg.toString() }
-}
-
-/**
- * An endpoint that represents an implicit varargs array.
- * We choose to represent the varargs array as a single endpoint, rather than as multiple endpoints.
- *
- * This avoids the problem of having to deal with redundant endpoints downstream.
- *
- * In order to be able to distinguish between varargs endpoints and regular endpoints, we export the `isVarargsArray`
- * meta data field in the extraction queries.
- */
-class ImplicitVarargsArray extends CallArgument, TImplicitVarargsArray {
-  int idx;
-
-  ImplicitVarargsArray() { this = TImplicitVarargsArray(call, arg, idx) }
-
-  override string getMaDInput() { result = "Argument[" + idx + "]" }
-
-  override Top asTop() { result = call }
-}
-
-/**
- * An endpoint that represents a method call. The `ReturnValue` of a method call
- * may be a source.
- */
-class MethodReturnValue extends ApplicationModeEndpoint, TMethodReturnValue {
-  MethodCall call;
-
-  MethodReturnValue() { this = TMethodReturnValue(call) }
-
-  override Callable getCallable() { result = call.getCallee().getSourceDeclaration() }
-
-  override string getMaDInput() { none() }
-
-  override string getMaDOutput() { result = "ReturnValue" }
-
-  override Top asTop() { result = call }
-
-  override DataFlow::Node asNode() { result.asExpr() = call }
-
-  override string toString() { result = call.toString() }
-}
-
-/**
- * An endpoint that represents a parameter of an overridden method that may be
- * a source.
- */
-class OverriddenParameter extends ApplicationModeEndpoint, TOverriddenParameter {
-  Parameter p;
-  Method overriddenMethod;
-
-  OverriddenParameter() { this = TOverriddenParameter(p, overriddenMethod) }
-
-  override Callable getCallable() {
-    // NB: we're returning the overridden callable here. This means that the
-    // candidate model will be about the overridden method, not the overriding
-    // method. This is a more general model, that also applies to other
-    // subclasses of the overridden class.
-    result = overriddenMethod.getSourceDeclaration()
-  }
-
-  private int getArgIndex() { p.getCallable().getParameter(result) = p }
-
-  override string getMaDInput() { none() }
-
-  override string getMaDOutput() { result = "Parameter[" + this.getArgIndex() + "]" }
-
-  override Top asTop() { result = p }
-
-  override DataFlow::Node asNode() { result.(DataFlow::ParameterNode).asParameter() = p }
-
-  override string toString() { result = p.toString() }
-}
-
-/**
- * A candidates implementation.
- *
- * Some important notes:
- *  - This mode is using arguments as endpoints.
- *  - We use the `CallContext` (the surrounding call expression) as related location.
- */
-module ApplicationCandidatesImpl implements SharedCharacteristics::CandidateSig {
-  // for documentation of the implementations here, see the QLDoc in the CandidateSig signature module.
-  class Endpoint = ApplicationModeEndpoint;
-
-  class EndpointType = AutomodelEndpointTypes::EndpointType;
-
-  class SinkType = AutomodelEndpointTypes::SinkType;
-
-  class SourceType = AutomodelEndpointTypes::SourceType;
-
-  class RelatedLocation = Location::Top;
-
-  class RelatedLocationType = JavaRelatedLocationType;
-
-  // Sanitizers are currently not modeled in MaD. TODO: check if this has large negative impact.
-  predicate isSanitizer(Endpoint e, EndpointType t) {
-    exists(t) and
-    AutomodelJavaUtil::isUnexploitableType([
-        // for most endpoints, we can get the type from the node
-        e.asNode().getType(),
-        // but not for calls to void methods, where we need to go via the AST
-        e.asTop().(Expr).getType()
-      ])
-    or
-    t instanceof AutomodelEndpointTypes::PathInjectionSinkType and
-    e.asNode() instanceof PathSanitizer::PathInjectionSanitizer
-  }
-
-  RelatedLocation asLocation(Endpoint e) { result = e.asTop() }
-
-  predicate isKnownKind = AutomodelJavaUtil::isKnownKind/2;
-
-  predicate isSink(Endpoint e, string kind, string provenance) {
-    exists(
-      string package, string type, boolean subtypes, string name, string signature, string ext,
-      string input
-    |
-      sinkSpec(e, package, type, subtypes, name, signature, ext, input) and
-      ExternalFlow::sinkModel(package, type, subtypes, name, [signature, ""], ext, input, kind,
-        provenance, _)
-    )
-    or
-    isCustomSink(e, kind) and provenance = "custom-sink"
-  }
-
-  predicate isSource(Endpoint e, string kind, string provenance) {
-    exists(
-      string package, string type, boolean subtypes, string name, string signature, string ext,
-      string output
-    |
-      sourceSpec(e, package, type, subtypes, name, signature, ext, output) and
-      ExternalFlow::sourceModel(package, type, subtypes, name, [signature, ""], ext, output, kind,
-        provenance, _)
-    )
-  }
-
-  predicate isNeutral(Endpoint e) {
-    exists(string package, string type, string name, string signature, string endpointType |
-      sinkSpec(e, package, type, _, name, signature, _, _) and
-      endpointType = "sink"
-      or
-      sourceSpec(e, package, type, _, name, signature, _, _) and
-      endpointType = "source"
-    |
-      ExternalFlow::neutralModel(package, type, name, [signature, ""], endpointType, _)
-    )
-  }
-
-  /**
-   * Holds if the endpoint concerns a callable with the given package, type, name and signature.
-   *
-   * If `subtypes` is `false`, only the exact callable is considered. If `true`, the callable and
-   * all its overrides are considered.
-   */
-  additional predicate endpointCallable(
-    Endpoint e, string package, string type, boolean subtypes, string name, string signature
-  ) {
-    exists(Callable c |
-      c = e.getCallable() and subtypes in [true, false]
-      or
-      e.getCallable().(Method).getSourceDeclaration().overrides+(c) and subtypes = true
-    |
-      c.hasQualifiedName(package, type, name) and
-      signature = ExternalFlow::paramsString(c)
-    )
-  }
-
-  additional predicate sinkSpec(
-    Endpoint e, string package, string type, boolean subtypes, string name, string signature,
-    string ext, string input
-  ) {
-    endpointCallable(e, package, type, subtypes, name, signature) and
-    ext = "" and
-    input = e.getMaDInput()
-  }
-
-  additional predicate sourceSpec(
-    Endpoint e, string package, string type, boolean subtypes, string name, string signature,
-    string ext, string output
-  ) {
-    endpointCallable(e, package, type, subtypes, name, signature) and
-    ext = "" and
-    output = e.getMaDOutput()
-  }
-
-  /**
-   * Gets the related location for the given endpoint.
-   *
-   * The only related location we model is the the call expression surrounding to
-   * which the endpoint is either argument or qualifier (known as the call context).
-   */
-  RelatedLocation getRelatedLocation(Endpoint e, RelatedLocationType type) {
-    type = CallContext() and
-    result = e.(CallArgument).getCall()
-    or
-    type = MethodDoc() and
-    result = e.getCallable().(Documentable).getJavadoc()
-    or
-    type = ClassDoc() and
-    result = e.getCallable().getDeclaringType().(Documentable).getJavadoc()
-  }
-}
-
-/**
- * Contains endpoints that are defined in QL code rather than as a MaD model. Ideally this predicate
- * should be empty.
- */
-private predicate isCustomSink(Endpoint e, string kind) {
-  e.asNode() instanceof QueryInjectionSink and kind = "sql"
-}
-
-module CharacteristicsImpl =
-  SharedCharacteristics::SharedCharacteristics<ApplicationCandidatesImpl>;
-
-class EndpointCharacteristic = CharacteristicsImpl::EndpointCharacteristic;
-
-class Endpoint = ApplicationCandidatesImpl::Endpoint;
-
-/*
- * Predicates that are used to surface prompt examples and candidates for classification with an ML model.
- */
-
-/**
- * A MetadataExtractor that extracts metadata for application mode.
- */
-class ApplicationModeMetadataExtractor extends string {
-  ApplicationModeMetadataExtractor() { this = "ApplicationModeMetadataExtractor" }
-
-  predicate hasMetadata(
-    Endpoint e, string package, string type, string subtypes, string name, string signature,
-    string input, string output, string isVarargsArray, string alreadyAiModeled,
-    string extensibleType
-  ) {
-    exists(Callable callable | e.getCallable() = callable |
-      (if exists(e.getMaDInput()) then input = e.getMaDInput() else input = "") and
-      (if exists(e.getMaDOutput()) then output = e.getMaDOutput() else output = "") and
-      package = callable.getDeclaringType().getPackage().getName() and
-      // we're using the erased types because the MaD convention is to not specify type parameters.
-      // Whether something is or isn't a sink doesn't usually depend on the type parameters.
-      type = callable.getDeclaringType().getErasure().(RefType).getNestedName() and
-      subtypes = AutomodelJavaUtil::considerSubtypes(callable).toString() and
-      name = callable.getName() and
-      signature = ExternalFlow::paramsString(callable) and
-      (
-        if e instanceof ImplicitVarargsArray
-        then isVarargsArray = "true"
-        else isVarargsArray = "false"
-      ) and
-      extensibleType = e.getExtensibleType()
-    ) and
-    (
-      not CharacteristicsImpl::isModeled(e, _, extensibleType, _) and alreadyAiModeled = ""
-      or
-      CharacteristicsImpl::isModeled(e, _, extensibleType, alreadyAiModeled)
-    )
-  }
-}
-
-/**
- * Holds if the given `endpoint` should be considered a candidate for the `extensibleType`.
- *
- * The other parameters record various other properties of interest.
- */
-predicate isCandidate(
-  Endpoint endpoint, string package, string type, string subtypes, string name, string signature,
-  string input, string output, string isVarargs, string extensibleType, string alreadyAiModeled
-) {
-  CharacteristicsImpl::isCandidate(endpoint, _) and
-  not exists(CharacteristicsImpl::UninterestingToModelCharacteristic u |
-    u.appliesToEndpoint(endpoint)
-  ) and
-  any(ApplicationModeMetadataExtractor meta)
-      .hasMetadata(endpoint, package, type, subtypes, name, signature, input, output, isVarargs,
-        alreadyAiModeled, extensibleType) and
-  // If a node is already modeled in MaD, we don't include it as a candidate. Otherwise, we might include it as a
-  // candidate for query A, but the model will label it as a sink for one of the sink types of query B, for which it's
-  // already a known sink. This would result in overlap between our detected sinks and the pre-existing modeling. We
-  // assume that, if a sink has already been modeled in a MaD model, then it doesn't belong to any additional sink
-  // types, and we don't need to reexamine it.
-  alreadyAiModeled.matches(["", "%ai-%"]) and
-  AutomodelJavaUtil::includeAutomodelCandidate(package, type, name, signature)
-}
-
-/**
- * Holds if the given `endpoint` is a negative example for the `extensibleType`
- * because of the `characteristic`.
- *
- * The other parameters record various other properties of interest.
- */
-predicate isNegativeExample(
-  Endpoint endpoint, EndpointCharacteristic characteristic, float confidence, string package,
-  string type, string subtypes, string name, string signature, string input, string output,
-  string isVarargsArray, string extensibleType
-) {
-  characteristic.appliesToEndpoint(endpoint) and
-  // the node is known not to be an endpoint of any appropriate type
-  forall(AutomodelEndpointTypes::EndpointType tp |
-    tp = CharacteristicsImpl::getAPotentialType(endpoint)
-  |
-    characteristic.hasImplications(tp, false, _)
-  ) and
-  // the lowest confidence across all endpoint types should be at least highConfidence
-  confidence =
-    min(float c |
-      characteristic.hasImplications(CharacteristicsImpl::getAPotentialType(endpoint), false, c)
-    ) and
-  confidence >= SharedCharacteristics::highConfidence() and
-  any(ApplicationModeMetadataExtractor meta)
-      .hasMetadata(endpoint, package, type, subtypes, name, signature, input, output,
-        isVarargsArray, _, extensibleType) and
-  // It's valid for a node to be both a potential source/sanitizer and a sink. We don't want to include such nodes
-  // as negative examples in the prompt, because they're ambiguous and might confuse the model, so we explicitly exclude them here.
-  not exists(EndpointCharacteristic characteristic2, float confidence2 |
-    characteristic2 != characteristic
-  |
-    characteristic2.appliesToEndpoint(endpoint) and
-    confidence2 >= SharedCharacteristics::maximalConfidence() and
-    characteristic2
-        .hasImplications(CharacteristicsImpl::getAPotentialType(endpoint), true, confidence2)
-  )
-}
-
-/**
- * Holds if the given `endpoint` is a positive example for the `endpointType`.
- *
- * The other parameters record various other properties of interest.
- */
-predicate isPositiveExample(
-  Endpoint endpoint, string endpointType, string package, string type, string subtypes, string name,
-  string signature, string input, string output, string isVarargsArray, string extensibleType
-) {
-  any(ApplicationModeMetadataExtractor meta)
-      .hasMetadata(endpoint, package, type, subtypes, name, signature, input, output,
-        isVarargsArray, _, extensibleType) and
-  CharacteristicsImpl::isKnownAs(endpoint, endpointType, _) and
-  exists(CharacteristicsImpl::getRelatedLocationOrCandidate(endpoint, CallContext()))
-}
-
-/*
- * EndpointCharacteristic classes that are specific to Automodel for Java.
- */
-
-/**
- * A negative characteristic that indicates that parameters of an is-style boolean method should not be considered sinks.
- *
- * A sink is highly unlikely to be exploitable if its callable's name starts with `is` and the callable has a boolean return
- * type (e.g. `isDirectory`). These kinds of calls normally do only checks, and appear before the proper call that does
- * the dangerous/interesting thing, so we want the latter to be modeled as the sink.
- *
- * TODO: this might filter too much, it's possible that methods with more than one parameter contain interesting sinks
- */
-private class UnexploitableIsCharacteristic extends CharacteristicsImpl::NotASinkCharacteristic {
-  UnexploitableIsCharacteristic() { this = "argument of is-style boolean method" }
-
-  override predicate appliesToEndpoint(Endpoint e) {
-    e.getCallable().getName().matches("is%") and
-    e.getCallable().getReturnType() instanceof BooleanType and
-    not ApplicationCandidatesImpl::isSink(e, _, _)
-  }
-}
-
-/**
- * A negative characteristic that indicates that parameters of an existence-checking boolean method should not be
- * considered sinks.
- *
- * A sink is highly unlikely to be exploitable if its callable's name is `exists` or `notExists` and the callable has a
- * boolean return type. These kinds of calls normally do only checks, and appear before the proper call that does the
- * dangerous/interesting thing, so we want the latter to be modeled as the sink.
- */
-private class UnexploitableExistsCharacteristic extends CharacteristicsImpl::NotASinkCharacteristic {
-  UnexploitableExistsCharacteristic() { this = "argument of existence-checking boolean method" }
-
-  override predicate appliesToEndpoint(Endpoint e) {
-    exists(Callable callable | callable = e.getCallable() |
-      callable.getName().toLowerCase() = ["exists", "notexists"] and
-      callable.getReturnType() instanceof BooleanType
-    )
-  }
-}
-
-/**
- * A negative characteristic that indicates that parameters of an exception method or constructor should not be considered sinks,
- * and its return value should not be considered a source.
- */
-private class ExceptionCharacteristic extends CharacteristicsImpl::NeitherSourceNorSinkCharacteristic
-{
-  ExceptionCharacteristic() { this = "argument/result of exception-related method" }
-
-  override predicate appliesToEndpoint(Endpoint e) {
-    e.getCallable().getDeclaringType().getASupertype*() instanceof TypeThrowable and
-    (
-      e.getExtensibleType() = "sinkModel" and
-      not ApplicationCandidatesImpl::isSink(e, _, _)
-      or
-      e.getExtensibleType() = "sourceModel" and
-      not ApplicationCandidatesImpl::isSource(e, _, _) and
-      e.getMaDOutput() = "ReturnValue"
-    )
-  }
-}
-
-/**
- * A negative characteristic that indicates that an endpoint is a MaD taint step. MaD modeled taint steps are global,
- * so they are not sinks for any query. Non-MaD taint steps might be specific to a particular query, so we don't
- * filter those out.
- */
-private class IsMaDTaintStepCharacteristic extends CharacteristicsImpl::NotASinkCharacteristic {
-  IsMaDTaintStepCharacteristic() { this = "taint step" }
-
-  override predicate appliesToEndpoint(Endpoint e) {
-    FlowSummaryImpl::Private::Steps::summaryThroughStepValue(e.asNode(), _, _)
-    or
-    FlowSummaryImpl::Private::Steps::summaryThroughStepTaint(e.asNode(), _, _)
-    or
-    FlowSummaryImpl::Private::Steps::summaryGetterStep(e.asNode(), _, _, _)
-    or
-    FlowSummaryImpl::Private::Steps::summarySetterStep(e.asNode(), _, _, _)
-  }
-}
-
-/**
- * A call to a method that's known locally will not be considered as a candidate to model.
- *
- * The reason is that we would expect data/taint flow into the method implementation to uncover
- * any sinks that are present there.
- */
-private class LocalCall extends CharacteristicsImpl::UninterestingToModelCharacteristic {
-  LocalCall() { this = "local call" }
-
-  override predicate appliesToEndpoint(Endpoint e) {
-    e.(CallArgument).getCallable().fromSource()
-    or
-    e.(MethodReturnValue).getCallable().fromSource()
-  }
-}
-
-/**
- * A characteristic that marks endpoints as uninteresting to model, according to the Java ModelExclusions module.
- */
-private class ExcludedFromModeling extends CharacteristicsImpl::UninterestingToModelCharacteristic {
-  ExcludedFromModeling() { this = "excluded from modeling" }
-
-  override predicate appliesToEndpoint(Endpoint e) {
-    ModelExclusions::isUninterestingForModels(e.getCallable())
-  }
-}
-
-/**
- * A negative characteristic that filters out non-public methods. Non-public methods are not interesting to include in
- * the standard Java modeling, because they cannot be called from outside the package.
- */
-private class NonPublicMethodCharacteristic extends CharacteristicsImpl::UninterestingToModelCharacteristic
-{
-  NonPublicMethodCharacteristic() { this = "non-public method" }
-
-  override predicate appliesToEndpoint(Endpoint e) {
-    exists(Callable c | c = e.getCallable() | not c.isPublic())
-  }
-}
-
-/**
- * A negative characteristic that indicates that an endpoint is a non-sink argument to a method whose sinks have already
- * been modeled _manually_. This is restricted to manual sinks only, because only during the manual process do we have
- * the expectation that all sinks present in a method have been considered.
- *
- * WARNING: These endpoints should not be used as negative samples for training, because some sinks may have been missed
- * when the method was modeled. Specifically, as we start using ATM to merge in new declarations, we can be less sure
- * that a method with one argument modeled as a MaD sink has also had its remaining arguments manually reviewed. The
- * ML model might have predicted argument 0 of some method to be a sink but not argument 1, when in fact argument 1 is
- * also a sink.
- */
-private class OtherArgumentToModeledMethodCharacteristic extends CharacteristicsImpl::LikelyNotASinkCharacteristic
-{
-  OtherArgumentToModeledMethodCharacteristic() {
-    this = "other argument to a method that has already been modeled manually"
-  }
-
-  override predicate appliesToEndpoint(Endpoint e) {
-    not ApplicationCandidatesImpl::isSink(e, _, _) and
-    exists(CallArgument otherSink |
-      ApplicationCandidatesImpl::isSink(otherSink, _, "manual") and
-      e.(CallArgument).getCall() = otherSink.getCall() and
-      e != otherSink
-    )
-  }
-}
-
-/**
- * Holds if the type of the given expression is annotated with `@FunctionalInterface`.
- */
-predicate hasFunctionalInterfaceType(Expr e) {
-  exists(RefType tp | tp = e.getType().getErasure() |
-    tp.getAnAssociatedAnnotation().getType().hasQualifiedName("java.lang", "FunctionalInterface")
-  )
-}
-
-/**
- * A characteristic that marks functional expression as likely not sinks.
- *
- * These expressions may well _contain_ sinks, but rarely are sinks themselves.
- */
-private class FunctionValueCharacteristic extends CharacteristicsImpl::LikelyNotASinkCharacteristic {
-  FunctionValueCharacteristic() { this = "function value" }
-
-  override predicate appliesToEndpoint(Endpoint e) {
-    exists(Expr expr | expr = e.asNode().asExpr() |
-      expr instanceof FunctionalExpr or hasFunctionalInterfaceType(expr)
-    )
-  }
-}
-
-/**
- * A negative characteristic that indicates that an endpoint is not a `to` node for any known taint step. Such a node
- * cannot be tainted, because taint can't flow into it.
- *
- * WARNING: These endpoints should not be used as negative samples for training, because they may include sinks for
- * which our taint tracking modeling is incomplete.
- */
-private class CannotBeTaintedCharacteristic extends CharacteristicsImpl::LikelyNotASinkCharacteristic
-{
-  CannotBeTaintedCharacteristic() { this = "cannot be tainted" }
-
-  override predicate appliesToEndpoint(Endpoint e) { not this.isKnownOutNodeForStep(e) }
-
-  /**
-   * Holds if the node `n` is known as the predecessor in a modeled flow step.
-   */
-  private predicate isKnownOutNodeForStep(Endpoint e) {
-    e.asNode().asExpr() instanceof Call or // we just assume flow in that case
-    TaintTracking::localTaintStep(_, e.asNode()) or
-    FlowSummaryImpl::Private::Steps::summaryThroughStepValue(_, e.asNode(), _) or
-    FlowSummaryImpl::Private::Steps::summaryThroughStepTaint(_, e.asNode(), _) or
-    FlowSummaryImpl::Private::Steps::summaryGetterStep(_, _, e.asNode(), _) or
-    FlowSummaryImpl::Private::Steps::summarySetterStep(_, _, e.asNode(), _)
-  }
-}
diff --git a/java/ql/automodel/src/AutomodelApplicationModeExtractCandidates.ql b/java/ql/automodel/src/AutomodelApplicationModeExtractCandidates.ql
deleted file mode 100644
index a3fa8b9b46f..00000000000
--- a/java/ql/automodel/src/AutomodelApplicationModeExtractCandidates.ql
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * Surfaces the endpoints that are not already known to be sinks, and are therefore used as candidates for
- * classification with an ML model.
- *
- * Note: This query does not actually classify the endpoints using the model.
- *
- * @name Automodel candidates (application mode)
- * @description A query to extract automodel candidates in application mode.
- * @kind problem
- * @problem.severity recommendation
- * @id java/ml/extract-automodel-application-candidates
- * @tags internal extract automodel application-mode candidates
- */
-
-import java
-private import AutomodelApplicationModeCharacteristics
-private import AutomodelJavaUtil
-
-/**
- * Gets a sample of endpoints (of at most `limit` samples) with the given method signature.
- *
- * The main purpose of this helper predicate is to avoid selecting too many candidates, as this may
- * cause the SARIF file to exceed the maximum size limit.
- */
-bindingset[limit]
-private Endpoint getSampleForSignature(
-  int limit, string package, string type, string subtypes, string name, string signature,
-  string input, string output, string isVarargs, string extensibleType, string alreadyAiModeled
-) {
-  exists(int n, int num_endpoints, ApplicationModeMetadataExtractor meta |
-    num_endpoints =
-      count(Endpoint e |
-        meta.hasMetadata(e, package, type, subtypes, name, signature, input, output, isVarargs,
-          alreadyAiModeled, extensibleType)
-      )
-  |
-    result =
-      rank[n](Endpoint e, Location loc |
-        loc = e.asTop().getLocation() and
-        meta.hasMetadata(e, package, type, subtypes, name, signature, input, output, isVarargs,
-          alreadyAiModeled, extensibleType)
-      |
-        e
-        order by
-          loc.getFile().getAbsolutePath(), loc.getStartLine(), loc.getStartColumn(),
-          loc.getEndLine(), loc.getEndColumn()
-      ) and
-    // To avoid selecting samples that are too close together (as the ranking above goes by file
-    // path first), we select `limit` evenly spaced samples from the ranked list of endpoints. By
-    // default this would always include the first sample, so we add a random-chosen prime offset
-    // to the first sample index, and reduce modulo the number of endpoints.
-    // Finally, we add 1 to the result, as ranking results in a 1-indexed relation.
-    n = 1 + (([0 .. limit - 1] * (num_endpoints / limit).floor() + 46337) % num_endpoints)
-  )
-}
-
-from
-  Endpoint endpoint, DollarAtString package, DollarAtString type, DollarAtString subtypes,
-  DollarAtString name, DollarAtString signature, DollarAtString input, DollarAtString output,
-  DollarAtString isVarargsArray, DollarAtString alreadyAiModeled, DollarAtString extensibleType
-where
-  isCandidate(endpoint, package, type, subtypes, name, signature, input, output, isVarargsArray,
-    extensibleType, alreadyAiModeled) and
-  endpoint =
-    getSampleForSignature(9, package, type, subtypes, name, signature, input, output,
-      isVarargsArray, extensibleType, alreadyAiModeled)
-select endpoint.asNode(),
-  "Related locations: $@, $@, $@." + "\nmetadata: $@, $@, $@, $@, $@, $@, $@, $@, $@, $@.", //
-  CharacteristicsImpl::getRelatedLocationOrCandidate(endpoint, CallContext()), "CallContext", //
-  CharacteristicsImpl::getRelatedLocationOrCandidate(endpoint, MethodDoc()), "MethodDoc", //
-  CharacteristicsImpl::getRelatedLocationOrCandidate(endpoint, ClassDoc()), "ClassDoc", //
-  package, "package", //
-  type, "type", //
-  subtypes, "subtypes", //
-  name, "name", // method name
-  signature, "signature", //
-  input, "input", //
-  output, "output", //
-  isVarargsArray, "isVarargsArray", //
-  alreadyAiModeled, "alreadyAiModeled", //
-  extensibleType, "extensibleType"
diff --git a/java/ql/automodel/src/AutomodelApplicationModeExtractNegativeExamples.ql b/java/ql/automodel/src/AutomodelApplicationModeExtractNegativeExamples.ql
deleted file mode 100644
index a399c413fa4..00000000000
--- a/java/ql/automodel/src/AutomodelApplicationModeExtractNegativeExamples.ql
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Surfaces endpoints that are non-sinks with high confidence, for use as negative examples in the prompt.
- *
- * @name Negative examples (application mode)
- * @kind problem
- * @problem.severity recommendation
- * @id java/ml/extract-automodel-application-negative-examples
- * @tags internal extract automodel application-mode negative examples
- */
-
-private import java
-private import AutomodelApplicationModeCharacteristics
-private import AutomodelEndpointTypes
-private import AutomodelJavaUtil
-
-/**
- * Gets a sample of endpoints (of at most `limit` samples) for which the given characteristic applies.
- *
- * The main purpose of this helper predicate is to avoid selecting too many samples, as this may
- * cause the SARIF file to exceed the maximum size limit.
- */
-bindingset[limit]
-Endpoint getSampleForCharacteristic(EndpointCharacteristic c, int limit) {
-  exists(int n, int num_endpoints | num_endpoints = count(Endpoint e | c.appliesToEndpoint(e)) |
-    result =
-      rank[n](Endpoint e, Location loc |
-        loc = e.asTop().getLocation() and c.appliesToEndpoint(e)
-      |
-        e
-        order by
-          loc.getFile().getAbsolutePath(), loc.getStartLine(), loc.getStartColumn(),
-          loc.getEndLine(), loc.getEndColumn()
-      ) and
-    // To avoid selecting samples that are too close together (as the ranking above goes by file
-    // path first), we select `limit` evenly spaced samples from the ranked list of endpoints. By
-    // default this would always include the first sample, so we add a random-chosen prime offset
-    // to the first sample index, and reduce modulo the number of endpoints.
-    // Finally, we add 1 to the result, as ranking results in a 1-indexed relation.
-    n = 1 + (([0 .. limit - 1] * (num_endpoints / limit).floor() + 46337) % num_endpoints)
-  )
-}
-
-from
-  Endpoint endpoint, EndpointCharacteristic characteristic, float confidence, string message,
-  DollarAtString package, DollarAtString type, DollarAtString subtypes, DollarAtString name,
-  DollarAtString signature, DollarAtString input, DollarAtString output,
-  DollarAtString isVarargsArray, DollarAtString extensibleType
-where
-  endpoint = getSampleForCharacteristic(characteristic, 100) and
-  isNegativeExample(endpoint, characteristic, confidence, package, type, subtypes, name, signature,
-    input, output, isVarargsArray, extensibleType) and
-  message = characteristic
-select endpoint.asNode(),
-  message + "\nrelated locations: $@, $@, $@." + "\nmetadata: $@, $@, $@, $@, $@, $@, $@, $@, $@.", //
-  CharacteristicsImpl::getRelatedLocationOrCandidate(endpoint, CallContext()), "CallContext", //
-  CharacteristicsImpl::getRelatedLocationOrCandidate(endpoint, MethodDoc()), "MethodDoc", //
-  CharacteristicsImpl::getRelatedLocationOrCandidate(endpoint, ClassDoc()), "ClassDoc", //
-  package, "package", //
-  type, "type", //
-  subtypes, "subtypes", //
-  name, "name", //
-  signature, "signature", //
-  input, "input", //
-  output, "output", //
-  isVarargsArray, "isVarargsArray", //
-  extensibleType, "extensibleType"
diff --git a/java/ql/automodel/src/AutomodelApplicationModeExtractPositiveExamples.ql b/java/ql/automodel/src/AutomodelApplicationModeExtractPositiveExamples.ql
deleted file mode 100644
index faf49b73fc1..00000000000
--- a/java/ql/automodel/src/AutomodelApplicationModeExtractPositiveExamples.ql
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * Surfaces endpoints that are sinks with high confidence, for use as positive examples in the prompt.
- *
- * @name Positive examples (application mode)
- * @kind problem
- * @problem.severity recommendation
- * @id java/ml/extract-automodel-application-positive-examples
- * @tags internal extract automodel application-mode positive examples
- */
-
-private import AutomodelApplicationModeCharacteristics
-private import AutomodelEndpointTypes
-private import AutomodelJavaUtil
-
-from
-  Endpoint endpoint, EndpointType endpointType, ApplicationModeMetadataExtractor meta,
-  DollarAtString package, DollarAtString type, DollarAtString subtypes, DollarAtString name,
-  DollarAtString signature, DollarAtString input, DollarAtString output,
-  DollarAtString isVarargsArray, DollarAtString extensibleType
-where
-  isPositiveExample(endpoint, endpointType, package, type, subtypes, name, signature, input, output,
-    isVarargsArray, extensibleType)
-select endpoint.asNode(),
-  endpointType + "\nrelated locations: $@, $@, $@." +
-    "\nmetadata: $@, $@, $@, $@, $@, $@, $@, $@, $@.", //
-  CharacteristicsImpl::getRelatedLocationOrCandidate(endpoint, CallContext()), "CallContext", //
-  CharacteristicsImpl::getRelatedLocationOrCandidate(endpoint, MethodDoc()), "MethodDoc", //
-  CharacteristicsImpl::getRelatedLocationOrCandidate(endpoint, ClassDoc()), "ClassDoc", //
-  package, "package", //
-  type, "type", //
-  subtypes, "subtypes", //
-  name, "name", //
-  signature, "signature", //
-  input, "input", //
-  output, "output", //
-  isVarargsArray, "isVarargsArray", //
-  extensibleType, "extensibleType"
diff --git a/java/ql/automodel/src/AutomodelCandidateFilter.yml b/java/ql/automodel/src/AutomodelCandidateFilter.yml
deleted file mode 100644
index c945ae3206f..00000000000
--- a/java/ql/automodel/src/AutomodelCandidateFilter.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-extensions:
-  - addsTo:
-      pack: codeql/java-automodel-queries
-      extensible: automodelCandidateFilter
-    data: []
diff --git a/java/ql/automodel/src/AutomodelCountGeneratedSinks.ql b/java/ql/automodel/src/AutomodelCountGeneratedSinks.ql
deleted file mode 100644
index 475e3753810..00000000000
--- a/java/ql/automodel/src/AutomodelCountGeneratedSinks.ql
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @name Number of instances of each sink model
- * @description Counts the number of instances of `ai-generated` sink models.
- * @kind table
- * @id java/ml/metrics-count-instances-per-sink-model
- * @tags internal automodel metrics
- */
-
-private import java
-private import AutomodelAlertSinkUtil
-
-from int instanceCount, SinkModel s
-where
-  instanceCount = s.getInstanceCount() and
-  instanceCount > 0 and
-  s.getProvenance() = "ai-generated"
-select instanceCount, s.getPackage() as package, s.getType() as type, s.getSubtypes() as subtypes,
-  s.getName() as name, s.getSignature() as signature, s.getInput() as input, s.getExt() as ext,
-  s.getKind() as kind, s.getProvenance() as provenance order by instanceCount desc
diff --git a/java/ql/automodel/src/AutomodelEndpointTypes.qll b/java/ql/automodel/src/AutomodelEndpointTypes.qll
deleted file mode 100644
index f4f7bc8eb7b..00000000000
--- a/java/ql/automodel/src/AutomodelEndpointTypes.qll
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * For internal use only.
- *
- * Defines the set of classes that endpoint scoring models can predict. Endpoint scoring models must
- * only predict classes defined within this file. This file is the source of truth for the integer
- * representation of each of these classes.
- */
-
-/** A class that can be predicted by a classifier. */
-abstract class EndpointType extends string {
-  /**
-   * Holds when the string matches the name of the sink / source type.
-   */
-  bindingset[this]
-  EndpointType() { any() }
-
-  /**
-   * Gets the name of the sink/source kind for this endpoint type as used in models-as-data.
-   *
-   * See https://github.com/github/codeql/blob/44213f0144fdd54bb679ca48d68b28dcf820f7a8/java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll#LL353C11-L357C31
-   * for sink types, and https://github.com/github/codeql/blob/44213f0144fdd54bb679ca48d68b28dcf820f7a8/java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll#L365
-   * for source types.
-   */
-  final string getKind() { result = this }
-}
-
-/** A class for sink types that can be predicted by a classifier. */
-abstract class SinkType extends EndpointType {
-  bindingset[this]
-  SinkType() { any() }
-}
-
-/** A sink relevant to the SQL injection query */
-class SqlInjectionSinkType extends SinkType {
-  SqlInjectionSinkType() { this = "sql-injection" }
-}
-
-/** A sink relevant to the tainted path injection query. */
-class PathInjectionSinkType extends SinkType {
-  PathInjectionSinkType() { this = "path-injection" }
-}
-
-/** A sink relevant to the SSRF query. */
-class RequestForgerySinkType extends SinkType {
-  RequestForgerySinkType() { this = "request-forgery" }
-}
-
-/** A sink relevant to the command injection query. */
-class CommandInjectionSinkType extends SinkType {
-  CommandInjectionSinkType() { this = "command-injection" }
-}
-
-/** A sink relevant to file storage. */
-class FileContentStoreSinkType extends SinkType {
-  FileContentStoreSinkType() { this = "file-content-store" }
-}
-
-/** A sink relevant to HTML injection. */
-class HtmlInjectionSinkType extends SinkType {
-  HtmlInjectionSinkType() { this = "html-injection" }
-}
-
-/** A sink relevant to LDAP injection. */
-class LdapInjectionSinkType extends SinkType {
-  LdapInjectionSinkType() { this = "ldap-injection" }
-}
-
-/** A sink relevant to URL redirection. */
-class UrlRedirectionSinkType extends SinkType {
-  UrlRedirectionSinkType() { this = "url-redirection" }
-}
-
-/** A class for source types that can be predicted by a classifier. */
-abstract class SourceType extends EndpointType {
-  bindingset[this]
-  SourceType() { any() }
-}
-
-/** A source of remote data. */
-class RemoteSourceType extends SourceType {
-  RemoteSourceType() { this = "remote" }
-}
diff --git a/java/ql/automodel/src/AutomodelFrameworkModeCharacteristics.qll b/java/ql/automodel/src/AutomodelFrameworkModeCharacteristics.qll
deleted file mode 100644
index 7f385a41d1e..00000000000
--- a/java/ql/automodel/src/AutomodelFrameworkModeCharacteristics.qll
+++ /dev/null
@@ -1,507 +0,0 @@
-/**
- * For internal use only.
- */
-
-private import java
-private import semmle.code.Location as Location
-private import semmle.code.java.dataflow.DataFlow
-private import semmle.code.java.dataflow.TaintTracking
-private import semmle.code.java.dataflow.ExternalFlow as ExternalFlow
-private import semmle.code.java.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl
-private import semmle.code.java.security.ExternalAPIs as ExternalAPIs
-private import semmle.code.java.Expr as Expr
-private import semmle.code.java.security.QueryInjection
-private import semmle.code.java.security.RequestForgery
-private import semmle.code.java.dataflow.internal.ModelExclusions as ModelExclusions
-private import AutomodelJavaUtil as AutomodelJavaUtil
-import AutomodelSharedCharacteristics as SharedCharacteristics
-import AutomodelEndpointTypes as AutomodelEndpointTypes
-
-newtype JavaRelatedLocationType =
-  MethodDoc() or
-  ClassDoc()
-
-newtype TFrameworkModeEndpoint =
-  TExplicitParameter(Parameter p) {
-    AutomodelJavaUtil::isFromSource(p) and
-    not AutomodelJavaUtil::isUnexploitableType(p.getType())
-  } or
-  TQualifier(Callable c) { AutomodelJavaUtil::isFromSource(c) and not c instanceof Constructor } or
-  TReturnValue(Callable c) {
-    AutomodelJavaUtil::isFromSource(c) and
-    c instanceof Constructor
-    or
-    AutomodelJavaUtil::isFromSource(c) and
-    c instanceof Method and
-    not AutomodelJavaUtil::isUnexploitableType(c.getReturnType())
-  } or
-  TOverridableParameter(Method m, Parameter p) {
-    AutomodelJavaUtil::isFromSource(p) and
-    not AutomodelJavaUtil::isUnexploitableType(p.getType()) and
-    p.getCallable() = m and
-    m instanceof ModelExclusions::ModelApi and
-    AutomodelJavaUtil::isOverridable(m)
-  } or
-  TOverridableQualifier(Method m) {
-    AutomodelJavaUtil::isFromSource(m) and
-    m instanceof ModelExclusions::ModelApi and
-    AutomodelJavaUtil::isOverridable(m)
-  }
-
-/**
- * A framework mode endpoint.
- */
-abstract class FrameworkModeEndpoint extends TFrameworkModeEndpoint {
-  /**
-   * Gets the input (if any) for this endpoint, eg.: `Argument[0]`.
-   *
-   * For endpoints that are source candidates, this will be `none()`.
-   */
-  abstract string getMaDInput();
-
-  /**
-   * Gets the output (if any) for this endpoint, eg.: `ReturnValue`.
-   *
-   * For endpoints that are sink candidates, this will be `none()`.
-   */
-  abstract string getMaDOutput();
-
-  /**
-   * Returns the name of the parameter of the endpoint.
-   */
-  abstract string getParamName();
-
-  /**
-   * Returns the callable that contains the endpoint.
-   */
-  abstract Callable getCallable();
-
-  abstract Top asTop();
-
-  abstract string getExtensibleType();
-
-  string toString() { result = this.asTop().toString() }
-
-  Location getLocation() { result = this.asTop().getLocation() }
-}
-
-class ExplicitParameterEndpoint extends FrameworkModeEndpoint, TExplicitParameter {
-  Parameter param;
-
-  ExplicitParameterEndpoint() { this = TExplicitParameter(param) and param.fromSource() }
-
-  override string getMaDInput() { result = "Argument[" + param.getPosition() + "]" }
-
-  override string getMaDOutput() { none() }
-
-  override string getParamName() { result = param.getName() }
-
-  override Callable getCallable() { result = param.getCallable() }
-
-  override Top asTop() { result = param }
-
-  override string getExtensibleType() { result = "sinkModel" }
-}
-
-class QualifierEndpoint extends FrameworkModeEndpoint, TQualifier {
-  Callable callable;
-
-  QualifierEndpoint() {
-    this = TQualifier(callable) and not callable.isStatic() and callable.fromSource()
-  }
-
-  override string getMaDInput() { result = "Argument[this]" }
-
-  override string getMaDOutput() { none() }
-
-  override string getParamName() { result = "this" }
-
-  override Callable getCallable() { result = callable }
-
-  override Top asTop() { result = callable }
-
-  override string getExtensibleType() { result = "sinkModel" }
-}
-
-class ReturnValue extends FrameworkModeEndpoint, TReturnValue {
-  Callable callable;
-
-  ReturnValue() { this = TReturnValue(callable) and callable.fromSource() }
-
-  override string getMaDInput() { none() }
-
-  override string getMaDOutput() { result = "ReturnValue" }
-
-  override string getParamName() { none() }
-
-  override Callable getCallable() { result = callable }
-
-  override Top asTop() { result = callable }
-
-  override string getExtensibleType() { result = "sourceModel" }
-}
-
-class OverridableParameter extends FrameworkModeEndpoint, TOverridableParameter {
-  Method method;
-  Parameter param;
-
-  OverridableParameter() { this = TOverridableParameter(method, param) }
-
-  override string getMaDInput() { none() }
-
-  override string getMaDOutput() { result = "Parameter[" + param.getPosition() + "]" }
-
-  override string getParamName() { result = param.getName() }
-
-  override Callable getCallable() { result = method }
-
-  override Top asTop() { result = param }
-
-  override string getExtensibleType() { result = "sourceModel" }
-}
-
-class OverridableQualifier extends FrameworkModeEndpoint, TOverridableQualifier {
-  Method m;
-
-  OverridableQualifier() { this = TOverridableQualifier(m) }
-
-  override string getMaDInput() { none() }
-
-  override string getMaDOutput() { result = "Parameter[this]" }
-
-  override string getParamName() { result = "this" }
-
-  override Callable getCallable() { result = m }
-
-  override Top asTop() { result = m }
-
-  override string getExtensibleType() { result = "sourceModel" }
-}
-
-/**
- * A candidates implementation for framework mode.
- *
- * Some important notes:
- *  - This mode is using parameters as endpoints.
- *  - Sink- and neutral-information is being used from MaD models.
- *  - When available, we use method- and class-java-docs as related locations.
- */
-module FrameworkCandidatesImpl implements SharedCharacteristics::CandidateSig {
-  // for documentation of the implementations here, see the QLDoc in the CandidateSig signature module.
-  class Endpoint = FrameworkModeEndpoint;
-
-  class EndpointType = AutomodelEndpointTypes::EndpointType;
-
-  class SinkType = AutomodelEndpointTypes::SinkType;
-
-  class SourceType = AutomodelEndpointTypes::SourceType;
-
-  class RelatedLocation = Location::Top;
-
-  class RelatedLocationType = JavaRelatedLocationType;
-
-  // Sanitizers are currently not modeled in MaD. TODO: check if this has large negative impact.
-  predicate isSanitizer(Endpoint e, EndpointType t) { none() }
-
-  RelatedLocation asLocation(Endpoint e) { result = e.asTop() }
-
-  predicate isKnownKind = AutomodelJavaUtil::isKnownKind/2;
-
-  predicate isSink(Endpoint e, string kind, string provenance) {
-    exists(
-      string package, string type, boolean subtypes, string name, string signature, string ext,
-      string input
-    |
-      sinkSpec(e, package, type, subtypes, name, signature, ext, input) and
-      ExternalFlow::sinkModel(package, type, subtypes, name, [signature, ""], ext, input, kind,
-        provenance, _)
-    )
-  }
-
-  predicate isSource(Endpoint e, string kind, string provenance) {
-    exists(
-      string package, string type, boolean subtypes, string name, string signature, string ext,
-      string output
-    |
-      sourceSpec(e, package, type, subtypes, name, signature, ext, output) and
-      ExternalFlow::sourceModel(package, type, subtypes, name, [signature, ""], ext, output, kind,
-        provenance, _)
-    )
-  }
-
-  predicate isNeutral(Endpoint e) {
-    exists(string package, string type, string name, string signature, string endpointType |
-      sinkSpec(e, package, type, _, name, signature, _, _) and
-      endpointType = "sink"
-      or
-      sourceSpec(e, package, type, _, name, signature, _, _) and
-      endpointType = "source"
-    |
-      ExternalFlow::neutralModel(package, type, name, [signature, ""], endpointType, _)
-    )
-  }
-
-  /**
-   * Holds if the endpoint concerns a callable with the given package, type, name and signature.
-   *
-   * If `subtypes` is `false`, only the exact callable is considered. If `true`, the callable and
-   * all its overrides are considered.
-   */
-  additional predicate endpointCallable(
-    Endpoint e, string package, string type, boolean subtypes, string name, string signature
-  ) {
-    exists(Callable c |
-      c = e.getCallable() and subtypes in [true, false]
-      or
-      e.getCallable().(Method).getSourceDeclaration().overrides+(c) and subtypes = true
-    |
-      c.hasQualifiedName(package, type, name) and
-      signature = ExternalFlow::paramsString(c)
-    )
-  }
-
-  additional predicate sinkSpec(
-    Endpoint e, string package, string type, boolean subtypes, string name, string signature,
-    string ext, string input
-  ) {
-    endpointCallable(e, package, type, subtypes, name, signature) and
-    ext = "" and
-    input = e.getMaDInput()
-  }
-
-  additional predicate sourceSpec(
-    Endpoint e, string package, string type, boolean subtypes, string name, string signature,
-    string ext, string output
-  ) {
-    endpointCallable(e, package, type, subtypes, name, signature) and
-    ext = "" and
-    output = e.getMaDOutput()
-  }
-
-  /**
-   * Gets the related location for the given endpoint.
-   *
-   * Related locations can be JavaDoc comments of the class or the method.
-   */
-  RelatedLocation getRelatedLocation(Endpoint e, RelatedLocationType type) {
-    type = MethodDoc() and
-    result = e.getCallable().(Documentable).getJavadoc()
-    or
-    type = ClassDoc() and
-    result = e.getCallable().getDeclaringType().(Documentable).getJavadoc()
-  }
-}
-
-module CharacteristicsImpl = SharedCharacteristics::SharedCharacteristics<FrameworkCandidatesImpl>;
-
-class EndpointCharacteristic = CharacteristicsImpl::EndpointCharacteristic;
-
-class Endpoint = FrameworkCandidatesImpl::Endpoint;
-
-/*
- * Predicates that are used to surface prompt examples and candidates for classification with an ML model.
- */
-
-/**
- * A MetadataExtractor that extracts metadata for framework mode.
- */
-class FrameworkModeMetadataExtractor extends string {
-  FrameworkModeMetadataExtractor() { this = "FrameworkModeMetadataExtractor" }
-
-  predicate hasMetadata(
-    Endpoint e, string package, string type, string subtypes, string name, string signature,
-    string input, string output, string parameterName, string alreadyAiModeled,
-    string extensibleType
-  ) {
-    exists(Callable callable | e.getCallable() = callable |
-      (if exists(e.getMaDInput()) then input = e.getMaDInput() else input = "") and
-      (if exists(e.getMaDOutput()) then output = e.getMaDOutput() else output = "") and
-      package = callable.getDeclaringType().getPackage().getName() and
-      // we're using the erased types because the MaD convention is to not specify type parameters.
-      // Whether something is or isn't a sink doesn't usually depend on the type parameters.
-      type = callable.getDeclaringType().getErasure().(RefType).getNestedName() and
-      subtypes = AutomodelJavaUtil::considerSubtypes(callable).toString() and
-      name = callable.getName() and
-      signature = ExternalFlow::paramsString(callable) and
-      (if exists(e.getParamName()) then parameterName = e.getParamName() else parameterName = "") and
-      e.getExtensibleType() = extensibleType
-    ) and
-    (
-      not CharacteristicsImpl::isModeled(e, _, extensibleType, _) and alreadyAiModeled = ""
-      or
-      CharacteristicsImpl::isModeled(e, _, extensibleType, alreadyAiModeled)
-    )
-  }
-}
-
-/**
- * Holds if the given `endpoint` should be considered a candidate for the `extensibleType`.
- *
- * The other parameters record various other properties of interest.
- */
-predicate isCandidate(
-  Endpoint endpoint, string package, string type, string subtypes, string name, string signature,
-  string input, string output, string parameterName, string extensibleType, string alreadyAiModeled
-) {
-  CharacteristicsImpl::isCandidate(endpoint, _) and
-  not exists(CharacteristicsImpl::UninterestingToModelCharacteristic u |
-    u.appliesToEndpoint(endpoint)
-  ) and
-  any(FrameworkModeMetadataExtractor meta)
-      .hasMetadata(endpoint, package, type, subtypes, name, signature, input, output, parameterName,
-        alreadyAiModeled, extensibleType) and
-  // If a node is already modeled in MaD, we don't include it as a candidate. Otherwise, we might include it as a
-  // candidate for query A, but the model will label it as a sink for one of the sink types of query B, for which it's
-  // already a known sink. This would result in overlap between our detected sinks and the pre-existing modeling. We
-  // assume that, if a sink has already been modeled in a MaD model, then it doesn't belong to any additional sink
-  // types, and we don't need to reexamine it.
-  alreadyAiModeled.matches(["", "%ai-%"]) and
-  AutomodelJavaUtil::includeAutomodelCandidate(package, type, name, signature)
-}
-
-/**
- * Holds if the given `endpoint` is a negative example for the `extensibleType`
- * because of the `characteristic`.
- *
- * The other parameters record various other properties of interest.
- */
-predicate isNegativeExample(
-  Endpoint endpoint, EndpointCharacteristic characteristic, float confidence, string package,
-  string type, string subtypes, string name, string signature, string input, string output,
-  string parameterName, string extensibleType
-) {
-  characteristic.appliesToEndpoint(endpoint) and
-  // the node is known not to be an endpoint of any appropriate type
-  forall(AutomodelEndpointTypes::EndpointType tp |
-    tp = CharacteristicsImpl::getAPotentialType(endpoint)
-  |
-    characteristic.hasImplications(tp, false, _)
-  ) and
-  // the lowest confidence across all endpoint types should be at least highConfidence
-  confidence =
-    min(float c |
-      characteristic.hasImplications(CharacteristicsImpl::getAPotentialType(endpoint), false, c)
-    ) and
-  confidence >= SharedCharacteristics::highConfidence() and
-  any(FrameworkModeMetadataExtractor meta)
-      .hasMetadata(endpoint, package, type, subtypes, name, signature, input, output, parameterName,
-        _, extensibleType) and
-  // It's valid for a node to be both a potential source/sanitizer and a sink. We don't want to include such nodes
-  // as negative examples in the prompt, because they're ambiguous and might confuse the model, so we explicitly exclude them here.
-  not exists(EndpointCharacteristic characteristic2, float confidence2 |
-    characteristic2 != characteristic
-  |
-    characteristic2.appliesToEndpoint(endpoint) and
-    confidence2 >= SharedCharacteristics::maximalConfidence() and
-    characteristic2
-        .hasImplications(CharacteristicsImpl::getAPotentialType(endpoint), true, confidence2)
-  )
-}
-
-/**
- * Holds if the given `endpoint` is a positive example for the `endpointType`.
- *
- * The other parameters record various other properties of interest.
- */
-predicate isPositiveExample(
-  Endpoint endpoint, string endpointType, string package, string type, string subtypes, string name,
-  string signature, string input, string output, string parameterName, string extensibleType
-) {
-  any(FrameworkModeMetadataExtractor meta)
-      .hasMetadata(endpoint, package, type, subtypes, name, signature, input, output, parameterName,
-        _, extensibleType) and
-  CharacteristicsImpl::isKnownAs(endpoint, endpointType, _)
-}
-
-/*
- * EndpointCharacteristic classes that are specific to Automodel for Java.
- */
-
-/**
- * A negative characteristic that indicates that parameters of an is-style boolean method should not be considered sinks,
- * and its return value should not be considered a source.
- *
- * A sink is highly unlikely to be exploitable if its callable's name starts with `is` and the callable has a boolean return
- * type (e.g. `isDirectory`). These kinds of calls normally do only checks, and appear before the proper call that does
- * the dangerous/interesting thing, so we want the latter to be modeled as the sink.
- *
- * TODO: this might filter too much, it's possible that methods with more than one parameter contain interesting sinks
- */
-private class UnexploitableIsCharacteristic extends CharacteristicsImpl::NeitherSourceNorSinkCharacteristic
-{
-  UnexploitableIsCharacteristic() { this = "argument of is-style boolean method" }
-
-  override predicate appliesToEndpoint(Endpoint e) {
-    e.getCallable().getName().matches("is%") and
-    e.getCallable().getReturnType() instanceof BooleanType and
-    (
-      e.getExtensibleType() = "sinkModel" and
-      not FrameworkCandidatesImpl::isSink(e, _, _)
-      or
-      e.getExtensibleType() = "sourceModel" and
-      not FrameworkCandidatesImpl::isSource(e, _, _) and
-      e.getMaDOutput() = "ReturnValue"
-    )
-  }
-}
-
-/**
- * A negative characteristic that indicates that parameters of an existence-checking boolean method should not be
- * considered sinks, and its return value should not be considered a source.
- *
- * A sink is highly unlikely to be exploitable if its callable's name is `exists` or `notExists` and the callable has a
- * boolean return type. These kinds of calls normally do only checks, and appear before the proper call that does the
- * dangerous/interesting thing, so we want the latter to be modeled as the sink.
- */
-private class UnexploitableExistsCharacteristic extends CharacteristicsImpl::NeitherSourceNorSinkCharacteristic
-{
-  UnexploitableExistsCharacteristic() { this = "argument of existence-checking boolean method" }
-
-  override predicate appliesToEndpoint(Endpoint e) {
-    exists(Callable callable |
-      callable = e.getCallable() and
-      callable.getName().toLowerCase() = ["exists", "notexists"] and
-      callable.getReturnType() instanceof BooleanType
-    |
-      e.getExtensibleType() = "sinkModel" and
-      not FrameworkCandidatesImpl::isSink(e, _, _)
-      or
-      e.getExtensibleType() = "sourceModel" and
-      not FrameworkCandidatesImpl::isSource(e, _, _) and
-      e.getMaDOutput() = "ReturnValue"
-    )
-  }
-}
-
-/**
- * A negative characteristic that indicates that parameters of an exception method or constructor should not be considered sinks,
- * and its return value should not be considered a source.
- */
-private class ExceptionCharacteristic extends CharacteristicsImpl::NeitherSourceNorSinkCharacteristic
-{
-  ExceptionCharacteristic() { this = "argument/result of exception-related method" }
-
-  override predicate appliesToEndpoint(Endpoint e) {
-    e.getCallable().getDeclaringType().getASupertype*() instanceof TypeThrowable and
-    (
-      e.getExtensibleType() = "sinkModel" and
-      not FrameworkCandidatesImpl::isSink(e, _, _)
-      or
-      e.getExtensibleType() = "sourceModel" and
-      not FrameworkCandidatesImpl::isSource(e, _, _) and
-      e.getMaDOutput() = "ReturnValue"
-    )
-  }
-}
-
-/**
- * A characteristic that limits candidates to parameters of methods that are recognized as `ModelApi`, iow., APIs that
- * are considered worth modeling.
- */
-private class NotAModelApi extends CharacteristicsImpl::UninterestingToModelCharacteristic {
-  NotAModelApi() { this = "not a model API" }
-
-  override predicate appliesToEndpoint(Endpoint e) {
-    not e.getCallable() instanceof ModelExclusions::ModelApi
-  }
-}
diff --git a/java/ql/automodel/src/AutomodelFrameworkModeExtractCandidates.ql b/java/ql/automodel/src/AutomodelFrameworkModeExtractCandidates.ql
deleted file mode 100644
index 83683b4e78f..00000000000
--- a/java/ql/automodel/src/AutomodelFrameworkModeExtractCandidates.ql
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Surfaces the endpoints that are not already known to be sinks, and are therefore used as candidates for
- * classification with an ML model.
- *
- * Note: This query does not actually classify the endpoints using the model.
- *
- * @name Automodel candidates (framework mode)
- * @description A query to extract automodel candidates in framework mode.
- * @kind problem
- * @problem.severity recommendation
- * @id java/ml/extract-automodel-framework-candidates
- * @tags internal extract automodel framework-mode candidates
- */
-
-private import AutomodelFrameworkModeCharacteristics
-private import AutomodelJavaUtil
-
-from
-  Endpoint endpoint, DollarAtString package, DollarAtString type, DollarAtString subtypes,
-  DollarAtString name, DollarAtString signature, DollarAtString input, DollarAtString output,
-  DollarAtString parameterName, DollarAtString alreadyAiModeled, DollarAtString extensibleType
-where
-  isCandidate(endpoint, package, type, subtypes, name, signature, input, output, parameterName,
-    extensibleType, alreadyAiModeled)
-select endpoint,
-  "Related locations: $@, $@." + "\nmetadata: $@, $@, $@, $@, $@, $@, $@, $@, $@, $@.", //
-  CharacteristicsImpl::getRelatedLocationOrCandidate(endpoint, MethodDoc()), "MethodDoc", //
-  CharacteristicsImpl::getRelatedLocationOrCandidate(endpoint, ClassDoc()), "ClassDoc", //
-  package, "package", //
-  type, "type", //
-  subtypes, "subtypes", //
-  name, "name", //
-  signature, "signature", //
-  input, "input", //
-  output, "output", //
-  parameterName, "parameterName", //
-  alreadyAiModeled, "alreadyAiModeled", //
-  extensibleType, "extensibleType"
diff --git a/java/ql/automodel/src/AutomodelFrameworkModeExtractNegativeExamples.ql b/java/ql/automodel/src/AutomodelFrameworkModeExtractNegativeExamples.ql
deleted file mode 100644
index 05e5951b061..00000000000
--- a/java/ql/automodel/src/AutomodelFrameworkModeExtractNegativeExamples.ql
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Surfaces endpoints that are non-sinks with high confidence, for use as negative examples in the prompt.
- *
- * @name Negative examples (framework mode)
- * @kind problem
- * @problem.severity recommendation
- * @id java/ml/extract-automodel-framework-negative-examples
- * @tags internal extract automodel framework-mode negative examples
- */
-
-private import AutomodelFrameworkModeCharacteristics
-private import AutomodelEndpointTypes
-private import AutomodelJavaUtil
-
-from
-  Endpoint endpoint, EndpointCharacteristic characteristic, float confidence,
-  DollarAtString package, DollarAtString type, DollarAtString subtypes, DollarAtString name,
-  DollarAtString signature, DollarAtString input, DollarAtString output,
-  DollarAtString parameterName, DollarAtString extensibleType
-where
-  isNegativeExample(endpoint, characteristic, confidence, package, type, subtypes, name, signature,
-    input, output, parameterName, extensibleType)
-select endpoint,
-  characteristic + "\nrelated locations: $@, $@." +
-    "\nmetadata: $@, $@, $@, $@, $@, $@, $@, $@, $@.", //
-  CharacteristicsImpl::getRelatedLocationOrCandidate(endpoint, MethodDoc()), "MethodDoc", //
-  CharacteristicsImpl::getRelatedLocationOrCandidate(endpoint, ClassDoc()), "ClassDoc", //
-  package, "package", //
-  type, "type", //
-  subtypes, "subtypes", //
-  name, "name", //
-  signature, "signature", //
-  input, "input", //
-  output, "output", //
-  parameterName, "parameterName", //
-  extensibleType, "extensibleType"
diff --git a/java/ql/automodel/src/AutomodelFrameworkModeExtractPositiveExamples.ql b/java/ql/automodel/src/AutomodelFrameworkModeExtractPositiveExamples.ql
deleted file mode 100644
index 7cb023949ed..00000000000
--- a/java/ql/automodel/src/AutomodelFrameworkModeExtractPositiveExamples.ql
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Surfaces endpoints that are sinks with high confidence, for use as positive examples in the prompt.
- *
- * @name Positive examples (framework mode)
- * @kind problem
- * @problem.severity recommendation
- * @id java/ml/extract-automodel-framework-positive-examples
- * @tags internal extract automodel framework-mode positive examples
- */
-
-private import AutomodelFrameworkModeCharacteristics
-private import AutomodelEndpointTypes
-private import AutomodelJavaUtil
-
-from
-  Endpoint endpoint, EndpointType endpointType, DollarAtString package, DollarAtString type,
-  DollarAtString subtypes, DollarAtString name, DollarAtString signature, DollarAtString input,
-  DollarAtString output, DollarAtString parameterName, DollarAtString extensibleType
-where
-  isPositiveExample(endpoint, endpointType, package, type, subtypes, name, signature, input, output,
-    parameterName, extensibleType)
-select endpoint,
-  endpointType + "\nrelated locations: $@, $@." + "\nmetadata: $@, $@, $@, $@, $@, $@, $@, $@, $@.", //
-  CharacteristicsImpl::getRelatedLocationOrCandidate(endpoint, MethodDoc()), "MethodDoc", //
-  CharacteristicsImpl::getRelatedLocationOrCandidate(endpoint, ClassDoc()), "ClassDoc", //
-  package, "package", //
-  type, "type", //
-  subtypes, "subtypes", //
-  name, "name", //
-  signature, "signature", //
-  input, "input", //
-  output, "output", //
-  parameterName, "parameterName", //
-  extensibleType, "extensibleType"
diff --git a/java/ql/automodel/src/AutomodelJavaUtil.qll b/java/ql/automodel/src/AutomodelJavaUtil.qll
deleted file mode 100644
index 368fb172483..00000000000
--- a/java/ql/automodel/src/AutomodelJavaUtil.qll
+++ /dev/null
@@ -1,111 +0,0 @@
-private import java
-private import AutomodelEndpointTypes as AutomodelEndpointTypes
-
-/**
- * A helper class to represent a string value that can be returned by a query using $@ notation.
- *
- * It extends `string`, but adds a mock `hasLocationInfo` method that returns the string itself as the file name.
- *
- * Use this, when you want to return a string value from a query using $@ notation - the string value
- * will be included in the sarif file.
- *
- *
- * Background information on `hasLocationInfo`:
- * https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/#providing-location-information
- */
-class DollarAtString extends string {
-  bindingset[this]
-  DollarAtString() { any() }
-
-  bindingset[this]
-  predicate hasLocationInfo(string path, int sl, int sc, int el, int ec) {
-    path = this and sl = 1 and sc = 1 and el = 1 and ec = 1
-  }
-}
-
-/**
- * Holds for all combinations of MaD kinds (`kind`) and their human readable
- * descriptions.
- */
-predicate isKnownKind(string kind, AutomodelEndpointTypes::EndpointType type) {
-  kind = type.getKind()
-}
-
-/**
- * By convention, the subtypes property of the MaD declaration should only be
- * true when there _can_ exist any subtypes with a different implementation.
- *
- * It would technically be ok to always use the value 'true', but this would
- * break convention.
- */
-pragma[nomagic]
-boolean considerSubtypes(Callable callable) {
-  if
-    callable.isStatic() or
-    callable.getDeclaringType().isStatic() or
-    callable.isFinal() or
-    callable.getDeclaringType().isFinal()
-  then result = false
-  else result = true
-}
-
-/**
- * Holds if the given package, type, name and signature is a candidate for automodeling.
- *
- * This predicate is extensible, so that different endpoints can be selected at runtime.
- */
-extensible predicate automodelCandidateFilter(
-  string package, string type, string name, string signature
-);
-
-/**
- * Holds if the given package, type, name and signature is a candidate for automodeling.
- *
- * This relies on an extensible predicate, and if that is not supplied then
- * all endpoints are considered candidates.
- */
-bindingset[package, type, name, signature]
-predicate includeAutomodelCandidate(string package, string type, string name, string signature) {
-  not automodelCandidateFilter(_, _, _, _) or
-  automodelCandidateFilter(package, type, name, signature)
-}
-
-/**
- * Holds if the given program element corresponds to a piece of source code,
- * that is, it is not compiler-generated.
- *
- * Note: This is a stricter check than `Element::fromSource`, which simply
- * checks whether the element is in a source file as opposed to a JAR file.
- * There can be compiler-generated elements in source files (especially for
- * Kotlin), which we also want to exclude.
- */
-predicate isFromSource(Element e) {
-  // from a source file (not a JAR)
-  e.fromSource() and
-  // not explicitly marked as compiler-generated
-  not e.isCompilerGenerated() and
-  // does not have a dummy location
-  not e.hasLocationInfo(_, 0, 0, 0, 0)
-}
-
-/**
- * Holds if taint cannot flow through the given type (because it is a numeric
- * type or some other type with a fixed set of values).
- */
-predicate isUnexploitableType(Type tp) {
-  tp instanceof PrimitiveType or
-  tp instanceof BoxedType or
-  tp instanceof NumberType or
-  tp instanceof VoidType
-}
-
-/**
- * Holds if the given method can be overridden, that is, it is not final,
- * static, or private.
- */
-predicate isOverridable(Method m) {
-  not m.getDeclaringType().isFinal() and
-  not m.isFinal() and
-  not m.isStatic() and
-  not m.isPrivate()
-}
diff --git a/java/ql/automodel/src/AutomodelSharedCharacteristics.qll b/java/ql/automodel/src/AutomodelSharedCharacteristics.qll
deleted file mode 100644
index 273c5d30dec..00000000000
--- a/java/ql/automodel/src/AutomodelSharedCharacteristics.qll
+++ /dev/null
@@ -1,412 +0,0 @@
-float maximalConfidence() { result = 1.0 }
-
-float highConfidence() { result = 0.9 }
-
-float mediumConfidence() { result = 0.6 }
-
-/**
- * A specification of how to  instantiate the shared characteristics for a given candidate class.
- *
- * The `CandidateSig` implementation specifies a type to use for Endpoints (eg., `ParameterNode`), as well as a type
- * to label endpoint classes (the `EndpointType`). One of the endpoint classes needs to be a 'negative' class, meaning
- *   "not any of the other known endpoint types".
- */
-signature module CandidateSig {
-  /**
-   * An endpoint is a potential candidate for modeling. This will typically be bound to the language's
-   * DataFlow node class, or a subtype thereof.
-   */
-  class Endpoint {
-    /**
-     * Gets the kind of this endpoint, either "sourceModel" or "sinkModel".
-     */
-    string getExtensibleType();
-
-    /**
-     * Gets a string representation of this endpoint.
-     */
-    string toString();
-  }
-
-  /**
-   * A related location for an endpoint. This will typically be bound to the supertype of all AST nodes (eg., `Top`).
-   */
-  class RelatedLocation;
-
-  /**
-   * A label for a related location.
-   *
-   * Eg., method-doc, class-doc, etc.
-   */
-  class RelatedLocationType;
-
-  /**
-   * An endpoint type considered by this specification.
-   */
-  class EndpointType extends string;
-
-  /**
-   * A sink endpoint type considered by this specification.
-   */
-  class SinkType extends EndpointType;
-
-  /**
-   * A source endpoint type considered by this specification.
-   */
-  class SourceType extends EndpointType;
-
-  /**
-   * Gets the endpoint as a location.
-   *
-   * This is a utility function to convert an endpoint to its corresponding location.
-   */
-  RelatedLocation asLocation(Endpoint e);
-
-  /**
-   * Defines what MaD kinds are known, and what endpoint type they correspond to.
-   */
-  predicate isKnownKind(string kind, EndpointType type);
-
-  /**
-   * Holds if `e` is a flow sanitizer, and has type `t`.
-   */
-  predicate isSanitizer(Endpoint e, EndpointType t);
-
-  /**
-   * Holds if `e` is a sink with the label `kind`, and provenance `provenance`.
-   */
-  predicate isSink(Endpoint e, string kind, string provenance);
-
-  /**
-   * Holds if `e` is a source with the label `kind`, and provenance `provenance`.
-   */
-  predicate isSource(Endpoint e, string kind, string provenance);
-
-  /**
-   * Holds if `e` is not a source or sink of any kind.
-   */
-  predicate isNeutral(Endpoint e);
-
-  /**
-   * Gets a related location.
-   *
-   * A related location is a source code location that may hold extra information about an endpoint that can be useful
-   * to the machine learning model.
-   *
-   * For example, a related location for a method call may be the documentation comment of a method.
-   */
-  RelatedLocation getRelatedLocation(Endpoint e, RelatedLocationType name);
-}
-
-/**
- * A set of shared characteristics for a given candidate class.
- *
- * This module is language-agnostic, although the `CandidateSig` module will be language-specific.
- *
- * The language specific implementation can also further extend the behavior of this module by adding additional
- *   implementations of endpoint characteristics exported by this module.
- */
-module SharedCharacteristics<CandidateSig Candidate> {
-  predicate isSink = Candidate::isSink/3;
-
-  predicate isNeutral = Candidate::isNeutral/1;
-
-  predicate isModeled(Candidate::Endpoint e, string kind, string extensibleKind, string provenance) {
-    Candidate::isSink(e, kind, provenance) and extensibleKind = "sinkModel"
-    or
-    Candidate::isSource(e, kind, provenance) and extensibleKind = "sourceModel"
-  }
-
-  /**
-   * Holds if `endpoint` is modeled as `endpointType`.
-   */
-  predicate isKnownAs(
-    Candidate::Endpoint endpoint, Candidate::EndpointType endpointType,
-    EndpointCharacteristic characteristic
-  ) {
-    // If the list of characteristics includes positive indicators with maximal confidence for this class, then it's a
-    // known sink for the class.
-    characteristic.appliesToEndpoint(endpoint) and
-    characteristic.hasImplications(endpointType, true, maximalConfidence())
-  }
-
-  /**
-   * Gets a potential type of this endpoint to make sure that sources are
-   * associated with source types and sinks with sink types.
-   */
-  Candidate::EndpointType getAPotentialType(Candidate::Endpoint endpoint) {
-    endpoint.getExtensibleType() = "sourceModel" and
-    result instanceof Candidate::SourceType
-    or
-    endpoint.getExtensibleType() = "sinkModel" and
-    result instanceof Candidate::SinkType
-  }
-
-  /**
-   * Holds if the given `endpoint` should be considered as a candidate for type `endpointType`,
-   * and classified by the ML model.
-   *
-   * A candidate is an endpoint that cannot be excluded from `endpointType` based on its characteristics.
-   */
-  predicate isCandidate(Candidate::Endpoint endpoint, Candidate::EndpointType endpointType) {
-    endpointType = getAPotentialType(endpoint) and
-    not exists(getAnExcludingCharacteristic(endpoint, endpointType))
-  }
-
-  /**
-   * Gets the related location of `e` with name `name`, if it exists.
-   * Otherwise, gets the candidate itself.
-   */
-  Candidate::RelatedLocation getRelatedLocationOrCandidate(
-    Candidate::Endpoint e, Candidate::RelatedLocationType type
-  ) {
-    if exists(Candidate::getRelatedLocation(e, type))
-    then result = Candidate::getRelatedLocation(e, type)
-    else result = Candidate::asLocation(e)
-  }
-
-  /**
-   * Gets a characteristics that disbar `endpoint` from being a candidate for `endpointType`
-   * with at least medium confidence.
-   */
-  EndpointCharacteristic getAnExcludingCharacteristic(
-    Candidate::Endpoint endpoint, Candidate::EndpointType endpointType
-  ) {
-    result.appliesToEndpoint(endpoint) and
-    exists(float confidence |
-      confidence >= mediumConfidence() and
-      result.hasImplications(endpointType, false, confidence)
-    )
-  }
-
-  /**
-   * A set of characteristics that a particular endpoint might have. This set of characteristics is used to make decisions
-   * about whether to include the endpoint in the training set and with what kind, as well as whether to score the
-   * endpoint at inference time.
-   */
-  abstract class EndpointCharacteristic extends string {
-    /**
-     * Holds for the string that is the name of the characteristic. This should describe some property of an endpoint
-     * that is meaningful for determining whether it's a sink, and if so, of which sink type.
-     */
-    bindingset[this]
-    EndpointCharacteristic() { any() }
-
-    /**
-     * Holds for endpoints that have this characteristic.
-     */
-    abstract predicate appliesToEndpoint(Candidate::Endpoint n);
-
-    /**
-     * This predicate describes what the characteristic tells us about an endpoint.
-     *
-     * Params:
-     * endpointType: The sink/source type.
-     * isPositiveIndicator: If true, this characteristic indicates that this endpoint _is_ a member of the class; if
-     * false, it indicates that it _isn't_ a member of the class.
-     * confidence: A float in [0, 1], which tells us how strong an indicator this characteristic is for the endpoint
-     * belonging / not belonging to the given class. A confidence near zero means this characteristic is a very weak
-     * indicator of whether or not the endpoint belongs to the class. A confidence of 1 means that all endpoints with
-     * this characteristic definitively do/don't belong to the class.
-     */
-    abstract predicate hasImplications(
-      Candidate::EndpointType endpointType, boolean isPositiveIndicator, float confidence
-    );
-
-    /** Indicators with confidence at or above this threshold are considered to be high-confidence indicators. */
-    final float getHighConfidenceThreshold() { result = 0.8 }
-  }
-
-  /**
-   * A high-confidence characteristic that indicates that an endpoint is a sink of a specified type. These endpoints can
-   * be used as positive samples for training or for a few-shot prompt.
-   */
-  abstract class SinkCharacteristic extends EndpointCharacteristic {
-    bindingset[this]
-    SinkCharacteristic() { any() }
-
-    abstract Candidate::EndpointType getSinkType();
-
-    final override predicate hasImplications(
-      Candidate::EndpointType endpointType, boolean isPositiveIndicator, float confidence
-    ) {
-      endpointType = this.getSinkType() and
-      isPositiveIndicator = true and
-      confidence = maximalConfidence()
-    }
-  }
-
-  /**
-   * A high-confidence characteristic that indicates that an endpoint is a source of a specified type. These endpoints can
-   * be used as positive samples for training or for a few-shot prompt.
-   */
-  abstract class SourceCharacteristic extends EndpointCharacteristic {
-    bindingset[this]
-    SourceCharacteristic() { any() }
-
-    abstract Candidate::EndpointType getSourceType();
-
-    final override predicate hasImplications(
-      Candidate::EndpointType endpointType, boolean isPositiveIndicator, float confidence
-    ) {
-      endpointType = this.getSourceType() and
-      isPositiveIndicator = true and
-      confidence = maximalConfidence()
-    }
-  }
-
-  /**
-   * A high-confidence characteristic that indicates that an endpoint is not a sink of any type. These endpoints can be
-   * used as negative samples for training or for a few-shot prompt.
-   */
-  abstract class NotASinkCharacteristic extends EndpointCharacteristic {
-    bindingset[this]
-    NotASinkCharacteristic() { any() }
-
-    override predicate hasImplications(
-      Candidate::EndpointType endpointType, boolean isPositiveIndicator, float confidence
-    ) {
-      endpointType instanceof Candidate::SinkType and
-      isPositiveIndicator = false and
-      confidence = highConfidence()
-    }
-  }
-
-  /**
-   * A high-confidence characteristic that indicates that an endpoint is not a source of any type. These endpoints can be
-   * used as negative samples for training or for a few-shot prompt.
-   */
-  abstract class NotASourceCharacteristic extends EndpointCharacteristic {
-    bindingset[this]
-    NotASourceCharacteristic() { any() }
-
-    override predicate hasImplications(
-      Candidate::EndpointType endpointType, boolean isPositiveIndicator, float confidence
-    ) {
-      endpointType instanceof Candidate::SourceType and
-      isPositiveIndicator = false and
-      confidence = highConfidence()
-    }
-  }
-
-  /**
-   * A high-confidence characteristic that indicates that an endpoint is neither a source nor a sink of any type.
-   */
-  abstract class NeitherSourceNorSinkCharacteristic extends NotASinkCharacteristic,
-    NotASourceCharacteristic
-  {
-    bindingset[this]
-    NeitherSourceNorSinkCharacteristic() { any() }
-
-    final override predicate hasImplications(
-      Candidate::EndpointType endpointType, boolean isPositiveIndicator, float confidence
-    ) {
-      NotASinkCharacteristic.super.hasImplications(endpointType, isPositiveIndicator, confidence) or
-      NotASourceCharacteristic.super.hasImplications(endpointType, isPositiveIndicator, confidence)
-    }
-  }
-
-  /**
-   * A medium-confidence characteristic that indicates that an endpoint is unlikely to be a sink of any type. These
-   * endpoints can be excluded from scoring at inference time, both to save time and to avoid false positives. They should
-   * not, however, be used as negative samples for training or for a few-shot prompt, because they may include a small
-   * number of sinks.
-   */
-  abstract class LikelyNotASinkCharacteristic extends EndpointCharacteristic {
-    bindingset[this]
-    LikelyNotASinkCharacteristic() { any() }
-
-    override predicate hasImplications(
-      Candidate::EndpointType endpointType, boolean isPositiveIndicator, float confidence
-    ) {
-      endpointType instanceof Candidate::SinkType and
-      isPositiveIndicator = false and
-      confidence = mediumConfidence()
-    }
-  }
-
-  /**
-   * A characteristic that indicates not necessarily that an endpoint is not a sink, but rather that it is not a sink
-   * that's interesting to model in the standard Java libraries. These filters should be removed when extracting sink
-   * candidates within a user's codebase for customized modeling.
-   *
-   * These endpoints should not be used as negative samples for training or for a few-shot prompt, because they are not
-   * necessarily non-sinks.
-   */
-  abstract class UninterestingToModelCharacteristic extends EndpointCharacteristic {
-    bindingset[this]
-    UninterestingToModelCharacteristic() { any() }
-
-    override predicate hasImplications(
-      Candidate::EndpointType endpointType, boolean isPositiveIndicator, float confidence
-    ) {
-      endpointType instanceof Candidate::SinkType and
-      isPositiveIndicator = false and
-      confidence = mediumConfidence()
-    }
-  }
-
-  /**
-   * Contains default implementations that are derived solely from the `CandidateSig` implementation.
-   */
-  private module DefaultCharacteristicImplementations {
-    /**
-     * Endpoints identified as sinks by the `CandidateSig` implementation are sinks with maximal confidence.
-     */
-    private class KnownSinkCharacteristic extends SinkCharacteristic {
-      string madKind;
-      Candidate::EndpointType endpointType;
-      string provenance;
-
-      KnownSinkCharacteristic() {
-        Candidate::isKnownKind(madKind, endpointType) and
-        // bind "this" to a unique string differing from that of the SinkType classes
-        this = madKind + "_" + provenance + "_characteristic" and
-        Candidate::isSink(_, madKind, provenance)
-      }
-
-      override predicate appliesToEndpoint(Candidate::Endpoint e) {
-        Candidate::isSink(e, madKind, provenance)
-      }
-
-      override Candidate::EndpointType getSinkType() { result = endpointType }
-    }
-
-    private class KnownSourceCharacteristic extends SourceCharacteristic {
-      string madKind;
-      Candidate::EndpointType endpointType;
-      string provenance;
-
-      KnownSourceCharacteristic() {
-        Candidate::isKnownKind(madKind, endpointType) and
-        // bind "this" to a unique string differing from that of the SinkType classes
-        this = madKind + "_" + provenance + "_characteristic" and
-        Candidate::isSource(_, madKind, provenance)
-      }
-
-      override predicate appliesToEndpoint(Candidate::Endpoint e) {
-        Candidate::isSource(e, madKind, provenance)
-      }
-
-      override Candidate::EndpointType getSourceType() { result = endpointType }
-    }
-
-    /**
-     * A negative characteristic that indicates that an endpoint was manually modeled as a neutral model.
-     */
-    private class NeutralModelCharacteristic extends NeitherSourceNorSinkCharacteristic {
-      NeutralModelCharacteristic() { this = "known non-sink" }
-
-      override predicate appliesToEndpoint(Candidate::Endpoint e) { Candidate::isNeutral(e) }
-    }
-
-    /**
-     * A negative characteristic that indicates that an endpoint is a sanitizer, and thus not a source.
-     */
-    private class IsSanitizerCharacteristic extends NotASourceCharacteristic {
-      IsSanitizerCharacteristic() { this = "known sanitizer" }
-
-      override predicate appliesToEndpoint(Candidate::Endpoint e) { Candidate::isSanitizer(e, _) }
-    }
-  }
-}
diff --git a/java/ql/automodel/src/AutomodelSinkModelMrvaQueries.ql b/java/ql/automodel/src/AutomodelSinkModelMrvaQueries.ql
deleted file mode 100644
index ed61ccfbbfd..00000000000
--- a/java/ql/automodel/src/AutomodelSinkModelMrvaQueries.ql
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * This file contains query predicates for use when gathering metrics at scale using Multi Repo
- * Variant Analysis.
- */
-
-private import java
-private import AutomodelAlertSinkUtil
-
-/**
- * Holds if `alertCount` is the number of alerts for the query with ID `queryId` for which the
- * sinks correspond to the given `ai-generated` sink model.
- */
-query predicate sinkModelCountPerQuery(
-  string queryId, int alertCount, string package, string type, boolean subtypes, string name,
-  string signature, string input, string ext, string kind, string provenance
-) {
-  exists(SinkModel s |
-    sinkModelTallyPerQuery(queryId, alertCount, s) and
-    s.getProvenance() = "ai-generated" and
-    s.getPackage() = package and
-    s.getType() = type and
-    s.getSubtypes() = subtypes and
-    s.getName() = name and
-    s.getSignature() = signature and
-    s.getInput() = input and
-    s.getExt() = ext and
-    s.getKind() = kind and
-    s.getProvenance() = provenance
-  )
-}
-
-/**
- * Holds if `instanceCount` is the number of instances corresponding to the given `ai-generated`
- * sink model (as identified by the `package`, `name`, `input`, etc.).
- */
-query predicate instanceCount(
-  int instanceCount, string package, string type, boolean subtypes, string name, string signature,
-  string input, string ext, string kind, string provenance
-) {
-  exists(SinkModel s |
-    instanceCount = s.getInstanceCount() and
-    instanceCount > 0 and
-    s.getProvenance() = "ai-generated" and
-    s.getPackage() = package and
-    s.getType() = type and
-    s.getSubtypes() = subtypes and
-    s.getName() = name and
-    s.getSignature() = signature and
-    s.getInput() = input and
-    s.getExt() = ext and
-    s.getKind() = kind and
-    s.getProvenance() = provenance
-  )
-}
-
-// MRVA requires a select clause, so we repurpose it to tell us which query predicates had results.
-from string hadResults
-where
-  sinkModelCountPerQuery(_, _, _, _, _, _, _, _, _, _, _) and hadResults = "sinkModelCountPerQuery"
-  or
-  instanceCount(_, _, _, _, _, _, _, _, _, _) and hadResults = "instanceCount"
-select hadResults
diff --git a/java/ql/automodel/src/change-notes/2024-11-19-drop-automodel.md b/java/ql/automodel/src/change-notes/2024-11-19-drop-automodel.md
new file mode 100644
index 00000000000..2b554d6de20
--- /dev/null
+++ b/java/ql/automodel/src/change-notes/2024-11-19-drop-automodel.md
@@ -0,0 +1,4 @@
+---
+category: breaking
+---
+* Dropped the Java Automodel queries.
diff --git a/java/ql/automodel/src/codeql-pack.release.yml b/java/ql/automodel/src/codeql-pack.release.yml
deleted file mode 100644
index 2036690b201..00000000000
--- a/java/ql/automodel/src/codeql-pack.release.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-lastReleaseVersion: 1.0.12
diff --git a/java/ql/automodel/src/qlpack.yml b/java/ql/automodel/src/qlpack.yml
deleted file mode 100644
index da81981956b..00000000000
--- a/java/ql/automodel/src/qlpack.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-name: codeql/java-automodel-queries
-version: 1.0.13-dev
-groups:
-    - java
-    - automodel
-dependencies:
-  codeql/java-all: ${workspace}
-dataExtensions:
-  - AutomodelCandidateFilter.yml
-warnOnImplicitThis: true
\ No newline at end of file
diff --git a/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractionTests.expected b/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractionTests.expected
deleted file mode 100644
index 8ec8033d086..00000000000
--- a/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractionTests.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractionTests.ql b/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractionTests.ql
deleted file mode 100644
index b7e1efc4532..00000000000
--- a/java/ql/automodel/test/AutomodelApplicationModeExtraction/AutomodelApplicationModeExtractionTests.ql
+++ /dev/null
@@ -1,35 +0,0 @@
-import java
-import AutomodelApplicationModeCharacteristics as Characteristics
-import AutomodelExtractionTests
-
-module TestHelper implements TestHelperSig<Characteristics::ApplicationCandidatesImpl> {
-  Location getEndpointLocation(Characteristics::Endpoint endpoint) {
-    result = endpoint.asTop().getLocation()
-  }
-
-  predicate isCandidate(
-    Characteristics::Endpoint endpoint, string name, string signature, string input, string output,
-    string extensibleType
-  ) {
-    Characteristics::isCandidate(endpoint, _, _, _, name, signature, input, output, _,
-      extensibleType, _)
-  }
-
-  predicate isPositiveExample(
-    Characteristics::Endpoint endpoint, string endpointType, string name, string signature,
-    string input, string output, string extensibleType
-  ) {
-    Characteristics::isPositiveExample(endpoint, endpointType, _, _, _, name, signature, input,
-      output, _, extensibleType)
-  }
-
-  predicate isNegativeExample(
-    Characteristics::Endpoint endpoint, string name, string signature, string input, string output,
-    string extensibleType
-  ) {
-    Characteristics::isNegativeExample(endpoint, _, _, _, _, _, name, signature, input, output, _,
-      extensibleType)
-  }
-}
-
-import MakeTest<Extraction<Characteristics::ApplicationCandidatesImpl, TestHelper>>
diff --git a/java/ql/automodel/test/AutomodelApplicationModeExtraction/PluginImpl.java b/java/ql/automodel/test/AutomodelApplicationModeExtraction/PluginImpl.java
deleted file mode 100644
index b0f3482a732..00000000000
--- a/java/ql/automodel/test/AutomodelApplicationModeExtraction/PluginImpl.java
+++ /dev/null
@@ -1,8 +0,0 @@
-import hudson.Plugin;
-
-public class PluginImpl extends Plugin {
-    @Override
-    public void configure(String name, String value) { // $ sourceModelCandidate=configure(String,String):Parameter[0] sourceModelCandidate=configure(String,String):Parameter[1]
-        // ...
-    }
-}
diff --git a/java/ql/automodel/test/AutomodelApplicationModeExtraction/Test.java b/java/ql/automodel/test/AutomodelApplicationModeExtraction/Test.java
deleted file mode 100644
index 9691cf86c15..00000000000
--- a/java/ql/automodel/test/AutomodelApplicationModeExtraction/Test.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package com.github.codeql.test;
-
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.nio.file.CopyOption;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Supplier;
-import java.io.File;
-import java.io.FileFilter;
-import java.nio.file.FileVisitOption;
-import java.net.URLConnection;
-import java.util.concurrent.FutureTask;
-
-class Test {
-	public static void main(String[] args) throws Exception {
-		AtomicReference<String> reference = new AtomicReference<>(); // uninteresting (parameterless constructor)
-		reference.set( // $ sinkModelCandidate=set(Object):Argument[this]
-			args[0] // $ negativeSinkExample=set(Object):Argument[0] // modeled as a flow step
-		);  // not a source candidate (return type is void)
-	}
-
-	public static void callSupplier(Supplier<String> supplier) {
-		supplier.get(); // not a source candidate (lambda flow)
-	}
-
-	public static void copyFiles(Path source, Path target, CopyOption option) throws Exception {
-		Files.copy(
-			source, // $ positiveSinkExample=copy(Path,Path,CopyOption[]):Argument[0](path-injection)
-			target, // $ positiveSinkExample=copy(Path,Path,CopyOption[]):Argument[1](path-injection)
-			option // no candidate (not modeled, but source and target are modeled)
-		); // $ sourceModelCandidate=copy(Path,Path,CopyOption[]):ReturnValue
-	}
-
-	public static InputStream getInputStream(Path openPath) throws Exception {
-		return Files.newInputStream(
-			openPath // $ sinkModelCandidate=newInputStream(Path,OpenOption[]):Argument[0] positiveSinkExample=newInputStream(Path,OpenOption[]):Argument[0](path-injection) // sink candidate because "only" ai-modeled, and useful as a candidate in regression testing
-		); // $ sourceModelCandidate=newInputStream(Path,OpenOption[]):ReturnValue
-	}
-
-	public static InputStream getInputStream(String openPath, String otherPath) throws Exception {
-		return Test.getInputStream( // the call is not a source candidate (argument to local call)
-			Paths.get(
-				openPath, // $ negativeSinkExample=get(String,String[]):Argument[0] // modeled as a flow step
-				otherPath
-			) // $ sourceModelCandidate=get(String,String[]):ReturnValue negativeSinkExample=get(String,String[]):Argument[1]
-		);
-	}
-
-	public static int compareFiles(File f1, File f2) {
-		return f1.compareTo( // $ negativeSinkExample=compareTo(File):Argument[this]
-			f2 // $ negativeSinkExample=compareTo(File):Argument[0] // modeled as not a sink
-		); // not a source candidate (return type is int)
-	}
-
-	public static void FilesWalkExample(Path p, FileVisitOption o) throws Exception {
-		Files.walk(
-			p, // $ negativeSinkExample=walk(Path,FileVisitOption[]):Argument[0] // modeled as a flow step
-			o, // the implicit varargs array is a candidate, annotated on the last line of the call
-			o // not a candidate (only the first arg corresponding to a varargs array
-			  // is extracted)
-		); // $ sourceModelCandidate=walk(Path,FileVisitOption[]):ReturnValue sinkModelCandidate=walk(Path,FileVisitOption[]):Argument[1]
-	}
-
-	public static void WebSocketExample(URLConnection c) throws Exception {
-		c.getInputStream(); // $ sinkModelCandidate=getInputStream():Argument[this] positiveSourceExample=getInputStream():ReturnValue(remote) // not a source candidate (manual modeling)
-		c.connect(); // $ sinkModelCandidate=connect():Argument[this] // not a source candidate (return type is void)
-	}
-
-	public static void fileFilterExample(File f, FileFilter ff) {
-		f.listFiles( // $ sinkModelCandidate=listFiles(FileFilter):Argument[this]
-			ff
-		); // $ sourceModelCandidate=listFiles(FileFilter):ReturnValue
-	}
-}
-
-class OverrideTest extends Exception {
-	public void printStackTrace(PrintWriter writer) { // $ sourceModelCandidate=printStackTrace(PrintWriter):Parameter[0]
-		return;
-	}
-
-}
-
-class TaskUtils {
-	public FutureTask getTask() {
-		FutureTask ft = new FutureTask(() -> {
-			//           ^-- no sink candidate for the `this` qualifier of a constructor
-			return 42;
-		});
-		return ft;
-	}
-}
-
-class MoreTests {
-	public static void FilesListExample(Path p) throws Exception {
-		Files.list(
-			Files.createDirectories(
-				p // $ positiveSinkExample=createDirectories(Path,FileAttribute[]):Argument[0](path-injection)
-			) // $ sourceModelCandidate=createDirectories(Path,FileAttribute[]):ReturnValue negativeSinkExample=list(Path):Argument[0] // modeled as a flow step
-		); // $ sourceModelCandidate=list(Path):ReturnValue
-
-		Files.delete(
-			p // $ sinkModelCandidate=delete(Path):Argument[0] positiveSinkExample=delete(Path):Argument[0](path-injection)
-		); // not a source candidate (return type is void)
-
-		Files.deleteIfExists(
-			p // $ sinkModelCandidate=deleteIfExists(Path):Argument[0] positiveSinkExample=deleteIfExists(Path):Argument[0](path-injection)
-		); // not a source candidate (return type is boolean)
-	}
-}
\ No newline at end of file
diff --git a/java/ql/automodel/test/AutomodelApplicationModeExtraction/hudson/Plugin.java b/java/ql/automodel/test/AutomodelApplicationModeExtraction/hudson/Plugin.java
deleted file mode 100644
index 3ad79abb8df..00000000000
--- a/java/ql/automodel/test/AutomodelApplicationModeExtraction/hudson/Plugin.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package hudson;
-
-/** Plugin doc */
-public class Plugin {
-    /** Configure method doc */
-    public void configure(String name, String value) {}
-}
diff --git a/java/ql/automodel/test/AutomodelExtractionTests.qll b/java/ql/automodel/test/AutomodelExtractionTests.qll
deleted file mode 100644
index fbc407c67f0..00000000000
--- a/java/ql/automodel/test/AutomodelExtractionTests.qll
+++ /dev/null
@@ -1,77 +0,0 @@
-import java
-import TestUtilities.InlineExpectationsTest
-import AutomodelSharedCharacteristics
-
-signature module TestHelperSig<CandidateSig Candidate> {
-  Location getEndpointLocation(Candidate::Endpoint e);
-
-  predicate isCandidate(
-    Candidate::Endpoint e, string name, string signature, string input, string output,
-    string extensibleType
-  );
-
-  predicate isPositiveExample(
-    Candidate::Endpoint e, string endpointType, string name, string signature, string input,
-    string output, string extensibleType
-  );
-
-  predicate isNegativeExample(
-    Candidate::Endpoint e, string name, string signature, string input, string output,
-    string extensibleType
-  );
-}
-
-module Extraction<CandidateSig Candidate, TestHelperSig<Candidate> TestHelper> implements TestSig {
-  string getARelevantTag() {
-    result in [
-        "sourceModelCandidate", "sinkModelCandidate", // a candidate source/sink
-        "positiveSourceExample", "positiveSinkExample", // a known source/sink
-        "negativeSourceExample", "negativeSinkExample" // a known non-source/non-sink
-      ]
-  }
-
-  /**
-   * If `extensibleType` is `sourceModel` then the result is `ifSource`, if it
-   * is `sinkModel` then the result is `ifSink`.
-   */
-  bindingset[extensibleType, ifSource, ifSink]
-  private string ifSource(string extensibleType, string ifSource, string ifSink) {
-    extensibleType = "sourceModel" and result = ifSource
-    or
-    extensibleType = "sinkModel" and result = ifSink
-  }
-
-  additional predicate selectEndpoint(
-    Candidate::Endpoint endpoint, string name, string signature, string input, string output,
-    string extensibleType, string tag, string suffix
-  ) {
-    TestHelper::isCandidate(endpoint, name, signature, input, output, extensibleType) and
-    tag = ifSource(extensibleType, "sourceModelCandidate", "sinkModelCandidate") and
-    suffix = ""
-    or
-    TestHelper::isNegativeExample(endpoint, name, signature, input, output, extensibleType) and
-    tag = "negative" + ifSource(extensibleType, "Source", "Sink") + "Example" and
-    suffix = ""
-    or
-    exists(string endpointType |
-      TestHelper::isPositiveExample(endpoint, endpointType, name, signature, input, output,
-        extensibleType) and
-      tag = "positive" + ifSource(extensibleType, "Source", "Sink") + "Example" and
-      suffix = "(" + endpointType + ")"
-    )
-  }
-
-  predicate hasActualResult(Location location, string element, string tag, string value) {
-    exists(
-      Candidate::Endpoint endpoint, string name, string signature, string input, string output,
-      string extensibleType, string suffix
-    |
-      selectEndpoint(endpoint, name, signature, input, output, extensibleType, tag, suffix)
-    |
-      TestHelper::getEndpointLocation(endpoint) = location and
-      endpoint.toString() = element and
-      // for source models only the output is relevant, and vice versa for sink models
-      value = name + signature + ":" + ifSource(extensibleType, output, input) + suffix
-    )
-  }
-}
diff --git a/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractionTests.expected b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractionTests.expected
deleted file mode 100644
index 8ec8033d086..00000000000
--- a/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractionTests.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractionTests.ql b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractionTests.ql
deleted file mode 100644
index 0d5e8611870..00000000000
--- a/java/ql/automodel/test/AutomodelFrameworkModeExtraction/AutomodelFrameworkModeExtractionTests.ql
+++ /dev/null
@@ -1,35 +0,0 @@
-import java
-import AutomodelFrameworkModeCharacteristics as Characteristics
-import AutomodelExtractionTests
-
-module TestHelper implements TestHelperSig<Characteristics::FrameworkCandidatesImpl> {
-  Location getEndpointLocation(Characteristics::Endpoint endpoint) {
-    result = endpoint.asTop().getLocation()
-  }
-
-  predicate isCandidate(
-    Characteristics::Endpoint endpoint, string name, string signature, string input, string output,
-    string extensibleType
-  ) {
-    Characteristics::isCandidate(endpoint, _, _, _, name, signature, input, output, _,
-      extensibleType, _)
-  }
-
-  predicate isPositiveExample(
-    Characteristics::Endpoint endpoint, string endpointType, string name, string signature,
-    string input, string output, string extensibleType
-  ) {
-    Characteristics::isPositiveExample(endpoint, endpointType, _, _, _, name, signature, input,
-      output, _, extensibleType)
-  }
-
-  predicate isNegativeExample(
-    Characteristics::Endpoint endpoint, string name, string signature, string input, string output,
-    string extensibleType
-  ) {
-    Characteristics::isNegativeExample(endpoint, _, _, _, _, _, name, signature, input, output, _,
-      extensibleType)
-  }
-}
-
-import MakeTest<Extraction<Characteristics::FrameworkCandidatesImpl, TestHelper>>
diff --git a/java/ql/automodel/test/AutomodelFrameworkModeExtraction/com/github/codeql/test/MyWriter.java b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/com/github/codeql/test/MyWriter.java
deleted file mode 100644
index 62bd773cc2e..00000000000
--- a/java/ql/automodel/test/AutomodelFrameworkModeExtraction/com/github/codeql/test/MyWriter.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.github.codeql.test;
-
-public class MyWriter extends java.io.Writer {
-    @Override
-    public void write(char[] cbuf, int off, int len) { // $ sinkModelCandidate=write(char[],int,int):Argument[this] positiveSinkExample=write(char[],int,int):Argument[0](file-content-store) sourceModelCandidate=write(char[],int,int):Parameter[this] sourceModelCandidate=write(char[],int,int):Parameter[0]
-    }
-
-    @Override
-    public void close() { // $ sinkModelCandidate=close():Argument[this] sourceModelCandidate=close():Parameter[this]
-    }
-
-    @Override
-    public void flush() { // $ sinkModelCandidate=flush():Argument[this] sourceModelCandidate=flush():Parameter[this]
-    }
-}
diff --git a/java/ql/automodel/test/AutomodelFrameworkModeExtraction/com/github/codeql/test/NonPublicClass.java b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/com/github/codeql/test/NonPublicClass.java
deleted file mode 100644
index b106d3da594..00000000000
--- a/java/ql/automodel/test/AutomodelFrameworkModeExtraction/com/github/codeql/test/NonPublicClass.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.github.codeql.test;
-
-/**
- * No candidates in this class, as it's not public!
- */
-class NonPublicClass {
-  public void noCandidates(String here) {
-    System.out.println(here);
-  }
-}
diff --git a/java/ql/automodel/test/AutomodelFrameworkModeExtraction/com/github/codeql/test/PublicClass.java b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/com/github/codeql/test/PublicClass.java
deleted file mode 100644
index 79fabff0664..00000000000
--- a/java/ql/automodel/test/AutomodelFrameworkModeExtraction/com/github/codeql/test/PublicClass.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.github.codeql.test;
-
-public class PublicClass {
-  public void stuff(String arg) { // $ sinkModelCandidate=stuff(String):Argument[this] sourceModelCandidate=stuff(String):Parameter[this] sinkModelCandidate=stuff(String):Argument[0] sourceModelCandidate=stuff(String):Parameter[0] // source candidates because it is an overrideable method
-    System.out.println(arg);
-  }
-
-  public static void staticStuff(String arg) { // $ sinkModelCandidate=staticStuff(String):Argument[0] // `arg` is not a source candidate (not overrideabe); `this` is not a candidate (static method)
-    System.out.println(arg);
-  }
-
-  protected void nonPublicStuff(String arg) { // $ sinkModelCandidate=nonPublicStuff(String):Argument[this] sourceModelCandidate=nonPublicStuff(String):Parameter[this] sinkModelCandidate=nonPublicStuff(String):Argument[0] sourceModelCandidate=nonPublicStuff(String):Parameter[0]
-    System.out.println(arg);
-  }
-
-  void packagePrivateStuff(String arg) { // no candidates because the method is not public
-    System.out.println(arg);
-  }
-
-  public PublicClass(Object input) { // $ sourceModelCandidate=PublicClass(Object):ReturnValue sinkModelCandidate=PublicClass(Object):Argument[0] // `this` is not a candidate because it is a constructor
-  }
-
-   // `input` and `input` are source candidates, but not sink candidates (is-style method)
-  public Boolean isIgnored(Object input) { // $ negativeSinkExample=isIgnored(Object):Argument[this] sourceModelCandidate=isIgnored(Object):Parameter[this] negativeSinkExample=isIgnored(Object):Argument[0] sourceModelCandidate=isIgnored(Object):Parameter[0]
-    return false;
-  }
-}
diff --git a/java/ql/automodel/test/AutomodelFrameworkModeExtraction/com/github/codeql/test/PublicInterface.java b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/com/github/codeql/test/PublicInterface.java
deleted file mode 100644
index d4f80b3c698..00000000000
--- a/java/ql/automodel/test/AutomodelFrameworkModeExtraction/com/github/codeql/test/PublicInterface.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.github.codeql.test;
-
-public interface PublicInterface {
-    public int stuff(String arg); // $ sinkModelCandidate=stuff(String):Argument[this] sourceModelCandidate=stuff(String):Parameter[this] sinkModelCandidate=stuff(String):Argument[0] sourceModelCandidate=stuff(String):Parameter[0]  // result is _not_ a source candidate source (primitive return type)
-
-    public static void staticStuff(String arg) { // $ sinkModelCandidate=staticStuff(String):Argument[0] // not a source candidate (static method)
-      System.out.println(arg);
-    }
-}
diff --git a/java/ql/automodel/test/AutomodelFrameworkModeExtraction/java/io/File.java b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/java/io/File.java
deleted file mode 100644
index 8bfe83e2339..00000000000
--- a/java/ql/automodel/test/AutomodelFrameworkModeExtraction/java/io/File.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package java.io;
-
-public class File {
-    public int compareTo( // $ negativeSinkExample=compareTo(File):Argument[this] sourceModelCandidate=compareTo(File):Parameter[this] // modeled as neutral for sinks
-        File pathname // $ negativeSinkExample=compareTo(File):Argument[0] sourceModelCandidate=compareTo(File):Parameter[0] // modeled as neutral for sinks
-    ) {
-        return 0;
-    }
-
-    public boolean setLastModified(long time) { // $ sinkModelCandidate=setLastModified(long):Argument[this] sourceModelCandidate=setLastModified(long):Parameter[this] // time is not a candidate (primitive type)
-        return false;
-    } // return value is not a source candidate because it's a primitive
-}
diff --git a/java/ql/automodel/test/AutomodelFrameworkModeExtraction/java/nio/file/Files.java b/java/ql/automodel/test/AutomodelFrameworkModeExtraction/java/nio/file/Files.java
deleted file mode 100644
index a833ba5f6e2..00000000000
--- a/java/ql/automodel/test/AutomodelFrameworkModeExtraction/java/nio/file/Files.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package java.nio.file;
-
-import java.io.InputStream;
-import java.io.FileInputStream;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.file.OpenOption;
-
-public class Files {
-    public static void copy( // method result is not a candidate source (void)
-        Path source, // $ positiveSinkExample=copy(Path,OutputStream):Argument[0](path-injection) // manual model exists
-        OutputStream out // $ sinkModelCandidate=copy(Path,OutputStream):Argument[1]
-        /* NB: may be worthwhile to implement the
-           same behavior as in application mode where out would not be a
-           candidate because there already is a model for another parameter of
-           the same method and we assume that methods are always modeled
-           completely.
-         */
-    ) throws IOException {
-        // ...
-    }
-
-    public static InputStream newInputStream( // $ sourceModelCandidate=newInputStream(Path,OpenOption[]):ReturnValue
-        Path openPath, // $ positiveSinkExample=newInputStream(Path,OpenOption[]):Argument[0](path-injection) sinkModelCandidate=newInputStream(Path,OpenOption[]):Argument[0] // known sink, but still a candidate (ai-modeled, and useful as a candidate in regression testing)
-        OpenOption... options // $ sinkModelCandidate=newInputStream(Path,OpenOption[]):Argument[1]
-    ) throws IOException {
-        return  new FileInputStream(openPath.toFile());
-    }
-}
diff --git a/java/ql/automodel/test/change-notes/2024-05-23-Version1.md b/java/ql/automodel/test/change-notes/2024-05-23-Version1.md
deleted file mode 100644
index 5840e51017b..00000000000
--- a/java/ql/automodel/test/change-notes/2024-05-23-Version1.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: breaking
----
-* CodeQL package management is now generally available, and all GitHub-produced CodeQL packages have had their version numbers increased to 1.0.0.
diff --git a/java/ql/automodel/test/qlpack.yml b/java/ql/automodel/test/qlpack.yml
deleted file mode 100644
index 46138d9435c..00000000000
--- a/java/ql/automodel/test/qlpack.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: codeql/java-automodel-tests
-version: 1.0.0-dev
-groups:
-    - java
-    - automodel
-    - test
-dependencies:
-  codeql/java-all: ${workspace}
-  codeql/java-automodel-queries: ${workspace}
-  codeql/java-tests: ${workspace}
-extractor: java
-tests: .
-warnOnImplicitThis: true
\ No newline at end of file
diff --git a/java/ql/integration-tests/kotlin/all-platforms/default-parameter-mad-flow/test.expected b/java/ql/integration-tests/kotlin/all-platforms/default-parameter-mad-flow/test.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/java/ql/integration-tests/kotlin/all-platforms/default-parameter-mad-flow/test.expected
+++ b/java/ql/integration-tests/kotlin/all-platforms/default-parameter-mad-flow/test.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/java/ql/lib/change-notes/2024-11-04-list-of-constants-sanitizer.md b/java/ql/lib/change-notes/2024-11-04-list-of-constants-sanitizer.md
new file mode 100644
index 00000000000..dea1e7ff81e
--- /dev/null
+++ b/java/ql/lib/change-notes/2024-11-04-list-of-constants-sanitizer.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Calling `coll.contains(x)` is now a taint sanitizer (for any query) for the value `x`, where `coll` is a collection of constants.
diff --git a/java/ql/lib/change-notes/2024-12-03-remove-dataflow-config-class-api.md b/java/ql/lib/change-notes/2024-12-03-remove-dataflow-config-class-api.md
new file mode 100644
index 00000000000..d09ec528c99
--- /dev/null
+++ b/java/ql/lib/change-notes/2024-12-03-remove-dataflow-config-class-api.md
@@ -0,0 +1,4 @@
+---
+category: breaking
+---
+* Deleted the old deprecated data flow API that was based on extending a configuration class. See https://github.blog/changelog/2023-08-14-new-dataflow-api-for-writing-custom-codeql-queries for instructions on migrating your queries to use the new API.
diff --git a/java/ql/lib/semmle/code/java/dataflow/DataFlow.qll b/java/ql/lib/semmle/code/java/dataflow/DataFlow.qll
index 66a7a847c33..ab48577c02e 100644
--- a/java/ql/lib/semmle/code/java/dataflow/DataFlow.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/DataFlow.qll
@@ -9,5 +9,5 @@ module DataFlow {
   private import semmle.code.java.dataflow.internal.DataFlowImplSpecific
   private import codeql.dataflow.DataFlow
   import DataFlowMake<Location, JavaDataFlow>
-  import semmle.code.java.dataflow.internal.DataFlowImpl1
+  import Public
 }
diff --git a/java/ql/lib/semmle/code/java/dataflow/DataFlow2.qll b/java/ql/lib/semmle/code/java/dataflow/DataFlow2.qll
deleted file mode 100644
index 92003314778..00000000000
--- a/java/ql/lib/semmle/code/java/dataflow/DataFlow2.qll
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) data flow analyses.
- */
-
-import java
-
-module DataFlow2 {
-  import semmle.code.java.dataflow.internal.DataFlowImpl2
-}
diff --git a/java/ql/lib/semmle/code/java/dataflow/DataFlow3.qll b/java/ql/lib/semmle/code/java/dataflow/DataFlow3.qll
deleted file mode 100644
index c8d614e0879..00000000000
--- a/java/ql/lib/semmle/code/java/dataflow/DataFlow3.qll
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) data flow analyses.
- */
-
-import java
-
-module DataFlow3 {
-  import semmle.code.java.dataflow.internal.DataFlowImpl3
-}
diff --git a/java/ql/lib/semmle/code/java/dataflow/DataFlow4.qll b/java/ql/lib/semmle/code/java/dataflow/DataFlow4.qll
deleted file mode 100644
index 852cfd9f813..00000000000
--- a/java/ql/lib/semmle/code/java/dataflow/DataFlow4.qll
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) data flow analyses.
- */
-
-import java
-
-module DataFlow4 {
-  import semmle.code.java.dataflow.internal.DataFlowImpl4
-}
diff --git a/java/ql/lib/semmle/code/java/dataflow/DataFlow5.qll b/java/ql/lib/semmle/code/java/dataflow/DataFlow5.qll
deleted file mode 100644
index f8986a03524..00000000000
--- a/java/ql/lib/semmle/code/java/dataflow/DataFlow5.qll
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) data flow analyses.
- */
-
-import java
-
-module DataFlow5 {
-  import semmle.code.java.dataflow.internal.DataFlowImpl5
-}
diff --git a/java/ql/lib/semmle/code/java/dataflow/DataFlow6.qll b/java/ql/lib/semmle/code/java/dataflow/DataFlow6.qll
deleted file mode 100644
index 28fa11da475..00000000000
--- a/java/ql/lib/semmle/code/java/dataflow/DataFlow6.qll
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) data flow analyses.
- */
-
-import java
-
-module DataFlow6 {
-  import semmle.code.java.dataflow.internal.DataFlowImpl6
-}
diff --git a/java/ql/lib/semmle/code/java/dataflow/FlowSteps.qll b/java/ql/lib/semmle/code/java/dataflow/FlowSteps.qll
index e7d34d166b1..c931817e00b 100644
--- a/java/ql/lib/semmle/code/java/dataflow/FlowSteps.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/FlowSteps.qll
@@ -28,6 +28,7 @@ private module Frameworks {
   private import semmle.code.java.frameworks.ThreadLocal
   private import semmle.code.java.frameworks.ratpack.RatpackExec
   private import semmle.code.java.frameworks.stapler.Stapler
+  private import semmle.code.java.security.ListOfConstantsSanitizer
 }
 
 /**
@@ -189,3 +190,8 @@ private class NumberTaintPreservingCallable extends TaintPreservingCallable {
  * map-key and map-value content, so that e.g. a tainted `Map` is assumed to have tainted keys and values.
  */
 abstract class TaintInheritingContent extends DataFlow::Content { }
+
+/**
+ * A sanitizer in all global taint flow configurations but not in local taint.
+ */
+abstract class DefaultTaintSanitizer extends DataFlow::Node { }
diff --git a/java/ql/lib/semmle/code/java/dataflow/TaintTracking.qll b/java/ql/lib/semmle/code/java/dataflow/TaintTracking.qll
index ed13837a312..e62850fbc38 100644
--- a/java/ql/lib/semmle/code/java/dataflow/TaintTracking.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/TaintTracking.qll
@@ -4,14 +4,12 @@
  */
 
 import semmle.code.java.dataflow.DataFlow
-import semmle.code.java.dataflow.DataFlow2
 import semmle.code.java.dataflow.internal.TaintTrackingUtil::StringBuilderVarModule
 
 module TaintTracking {
-  import semmle.code.java.dataflow.internal.tainttracking1.TaintTrackingParameter::Public
+  import semmle.code.java.dataflow.internal.TaintTrackingUtil
   private import semmle.code.java.dataflow.internal.DataFlowImplSpecific
   private import semmle.code.java.dataflow.internal.TaintTrackingImplSpecific
   private import codeql.dataflow.TaintTracking
   import TaintFlowMake<Location, JavaDataFlow, JavaTaintTracking>
-  import semmle.code.java.dataflow.internal.tainttracking1.TaintTrackingImpl
 }
diff --git a/java/ql/lib/semmle/code/java/dataflow/TaintTracking2.qll b/java/ql/lib/semmle/code/java/dataflow/TaintTracking2.qll
deleted file mode 100644
index abd909dba2b..00000000000
--- a/java/ql/lib/semmle/code/java/dataflow/TaintTracking2.qll
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) taint-tracking analyses.
- */
-module TaintTracking2 {
-  import semmle.code.java.dataflow.internal.tainttracking2.TaintTrackingImpl
-}
diff --git a/java/ql/lib/semmle/code/java/dataflow/TaintTracking3.qll b/java/ql/lib/semmle/code/java/dataflow/TaintTracking3.qll
deleted file mode 100644
index 49c43ed1418..00000000000
--- a/java/ql/lib/semmle/code/java/dataflow/TaintTracking3.qll
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) taint-tracking analyses.
- */
-module TaintTracking3 {
-  import semmle.code.java.dataflow.internal.tainttracking3.TaintTrackingImpl
-}
diff --git a/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll b/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll
index c548c5db38b..9e05b69db4a 100644
--- a/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/TypeFlow.qll
@@ -13,24 +13,27 @@ private import semmle.code.java.dispatch.VirtualDispatch
 private import semmle.code.java.dataflow.internal.BaseSSA
 private import semmle.code.java.controlflow.Guards
 private import codeql.typeflow.TypeFlow
+private import codeql.typeflow.UniversalFlow as UniversalFlow
 
-private module Input implements TypeFlowInput<Location> {
-  private newtype TTypeFlowNode =
+/** Gets `t` if it is a `RefType` or the boxed type if `t` is a primitive type. */
+private RefType boxIfNeeded(J::Type t) {
+  t.(PrimitiveType).getBoxedType() = result or
+  result = t
+}
+
+/** Provides the input types and predicates for instantiation of `UniversalFlow`. */
+module FlowStepsInput implements UniversalFlow::UniversalFlowInput<Location> {
+  private newtype TFlowNode =
     TField(Field f) { not f.getType() instanceof PrimitiveType } or
     TSsa(BaseSsaVariable ssa) { not ssa.getSourceVariable().getType() instanceof PrimitiveType } or
     TExpr(Expr e) or
     TMethod(Method m) { not m.getReturnType() instanceof PrimitiveType }
 
-  /** Gets `t` if it is a `RefType` or the boxed type if `t` is a primitive type. */
-  private RefType boxIfNeeded(J::Type t) {
-    t.(PrimitiveType).getBoxedType() = result or
-    result = t
-  }
-
   /**
    * A `Field`, `BaseSsaVariable`, `Expr`, or `Method`.
    */
-  class TypeFlowNode extends TTypeFlowNode {
+  class FlowNode extends TFlowNode {
+    /** Gets a textual representation of this element. */
     string toString() {
       result = this.asField().toString() or
       result = this.asSsa().toString() or
@@ -38,6 +41,7 @@ private module Input implements TypeFlowInput<Location> {
       result = this.asMethod().toString()
     }
 
+    /** Gets the source location for this element. */
     Location getLocation() {
       result = this.asField().getLocation() or
       result = this.asSsa().getLocation() or
@@ -45,14 +49,19 @@ private module Input implements TypeFlowInput<Location> {
       result = this.asMethod().getLocation()
     }
 
+    /** Gets the field corresponding to this node, if any. */
     Field asField() { this = TField(result) }
 
+    /** Gets the SSA variable corresponding to this node, if any. */
     BaseSsaVariable asSsa() { this = TSsa(result) }
 
+    /** Gets the expression corresponding to this node, if any. */
     Expr asExpr() { this = TExpr(result) }
 
+    /** Gets the method corresponding to this node, if any. */
     Method asMethod() { this = TMethod(result) }
 
+    /** Gets the type of this node. */
     RefType getType() {
       result = this.asField().getType() or
       result = this.asSsa().getSourceVariable().getType() or
@@ -61,8 +70,6 @@ private module Input implements TypeFlowInput<Location> {
     }
   }
 
-  class Type = RefType;
-
   private SrcCallable viableCallable_v1(Call c) {
     result = viableImpl_v1(c)
     or
@@ -88,7 +95,7 @@ private module Input implements TypeFlowInput<Location> {
    *
    * For a given `n2`, this predicate must include all possible `n1` that can flow to `n2`.
    */
-  predicate step(TypeFlowNode n1, TypeFlowNode n2) {
+  predicate step(FlowNode n1, FlowNode n2) {
     n2.asExpr().(ChooseExpr).getAResultExpr() = n1.asExpr()
     or
     exists(Field f, Expr e |
@@ -134,7 +141,7 @@ private module Input implements TypeFlowInput<Location> {
   /**
    * Holds if `null` is the only value that flows to `n`.
    */
-  predicate isNullValue(TypeFlowNode n) {
+  predicate isNullValue(FlowNode n) {
     n.asExpr() instanceof NullLiteral
     or
     exists(LocalVariableDeclExpr decl |
@@ -144,11 +151,21 @@ private module Input implements TypeFlowInput<Location> {
     )
   }
 
-  predicate isExcludedFromNullAnalysis(TypeFlowNode n) {
+  predicate isExcludedFromNullAnalysis(FlowNode n) {
     // Fields that are never assigned a non-null value are probably set by
     // reflection and are thus not always null.
     exists(n.asField())
   }
+}
+
+private module Input implements TypeFlowInput<Location> {
+  import FlowStepsInput
+
+  class TypeFlowNode = FlowNode;
+
+  predicate isExcludedFromNullAnalysis = FlowStepsInput::isExcludedFromNullAnalysis/1;
+
+  class Type = RefType;
 
   predicate exactTypeBase(TypeFlowNode n, RefType t) {
     exists(ClassInstanceExpr e |
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 f33a6d7195f..79f12e57f6a 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/BaseSSA.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/BaseSSA.qll
@@ -38,6 +38,7 @@ class BaseSsaSourceVariable extends TBaseSsaSourceVariable {
   /** Gets the `Callable` in which this `BaseSsaSourceVariable` is defined. */
   Callable getEnclosingCallable() { this = TLocalVar(result, _) }
 
+  /** Gets a textual representation of this element. */
   string toString() {
     exists(LocalScopeVariable v, Callable c | this = TLocalVar(c, v) |
       if c = v.getCallable()
@@ -46,6 +47,7 @@ class BaseSsaSourceVariable extends TBaseSsaSourceVariable {
     )
   }
 
+  /** Gets the source location for this element. */
   Location getLocation() {
     exists(LocalScopeVariable v | this = TLocalVar(_, v) and result = v.getLocation())
   }
@@ -482,8 +484,10 @@ class BaseSsaVariable extends TBaseSsaVariable {
     this = TSsaEntryDef(_, result)
   }
 
+  /** Gets a textual representation of this element. */
   string toString() { none() }
 
+  /** Gets the source location for this element. */
   Location getLocation() { result = this.getCfgNode().getLocation() }
 
   /** Gets the `BasicBlock` in which this SSA variable is defined. */
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl1.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl1.qll
deleted file mode 100644
index 17def0c431d..00000000000
--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl1.qll
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides a `Configuration` class backwards-compatible interface to the data
- * flow library.
- */
-
-private import DataFlowImplCommon
-private import DataFlowImplSpecific::Private
-import DataFlowImplSpecific::Public
-private import DataFlowImpl
-import DataFlowImplCommonPublic
-deprecated import FlowStateString
-private import codeql.util.Unit
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural data flow analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the global data flow library must define its own unique extension
- * of this abstract class. To create a configuration, extend this class with
- * a subclass whose characteristic predicate is a unique singleton string.
- * For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends DataFlow::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isBarrier`.
- *   // Optionally override `isAdditionalFlowStep`.
- * }
- * ```
- * Conceptually, this defines a graph where the nodes are `DataFlow::Node`s and
- * the edges are those data-flow steps that preserve the value of the node
- * along with any additional edges defined by `isAdditionalFlowStep`.
- * Specifying nodes in `isBarrier` will remove those nodes from the graph, and
- * specifying nodes in `isBarrierIn` and/or `isBarrierOut` will remove in-going
- * and/or out-going edges from those nodes, respectively.
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but two classes extending
- * `DataFlow::Configuration` should never depend on each other. One of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`.
- */
-abstract deprecated class Configuration extends string {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant data flow source.
-   */
-  predicate isSource(Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant data flow source with the given initial
-   * `state`.
-   */
-  predicate isSource(Node source, FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink.
-   */
-  predicate isSink(Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink accepting `state`.
-   */
-  predicate isSink(Node sink, FlowState state) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited. This completely removes
-   * `node` from the data flow graph.
-   */
-  predicate isBarrier(Node node) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited when the flow state is
-   * `state`.
-   */
-  predicate isBarrier(Node node, FlowState state) { none() }
-
-  /** Holds if data flow into `node` is prohibited. */
-  predicate isBarrierIn(Node node) { none() }
-
-  /** Holds if data flow out of `node` is prohibited. */
-  predicate isBarrierOut(Node node) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   */
-  predicate isAdditionalFlowStep(Node node1, Node node2) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
-    none()
-  }
-
-  /**
-   * Holds if an arbitrary number of implicit read steps of content `c` may be
-   * taken at `node`.
-   */
-  predicate allowImplicitRead(Node node, ContentSet c) { none() }
-
-  /**
-   * Gets the virtual dispatch branching limit when calculating field flow.
-   * This can be overridden to a smaller value to improve performance (a
-   * value of 0 disables field flow), or a larger value to get more results.
-   */
-  int fieldFlowBranchLimit() { result = 2 }
-
-  /**
-   * Gets a data flow configuration feature to add restrictions to the set of
-   * valid flow paths.
-   *
-   * - `FeatureHasSourceCallContext`:
-   *    Assume that sources have some existing call context to disallow
-   *    conflicting return-flow directly following the source.
-   * - `FeatureHasSinkCallContext`:
-   *    Assume that sinks have some existing call context to disallow
-   *    conflicting argument-to-parameter flow directly preceding the sink.
-   * - `FeatureEqualSourceSinkCallContext`:
-   *    Implies both of the above and additionally ensures that the entire flow
-   *    path preserves the call context.
-   *
-   * These features are generally not relevant for typical end-to-end data flow
-   * queries, but should only be used for constructing paths that need to
-   * somehow be pluggable in another path context.
-   */
-  FlowFeature getAFeature() { none() }
-
-  /** Holds if sources should be grouped in the result of `hasFlowPath`. */
-  predicate sourceGrouping(Node source, string sourceGroup) { none() }
-
-  /** Holds if sinks should be grouped in the result of `hasFlowPath`. */
-  predicate sinkGrouping(Node sink, string sinkGroup) { none() }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   */
-  predicate hasFlow(Node source, Node sink) { hasFlow(source, sink, this) }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   *
-   * The corresponding paths are generated from the end-points and the graph
-   * included in the module `PathGraph`.
-   */
-  predicate hasFlowPath(PathNode source, PathNode sink) { hasFlowPath(source, sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowTo(Node sink) { hasFlowTo(sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowToExpr(DataFlowExpr sink) { this.hasFlowTo(exprNode(sink)) }
-
-  /**
-   * Holds if hidden nodes should be included in the data flow graph.
-   *
-   * This feature should only be used for debugging or when the data flow graph
-   * is not visualized (for example in a `path-problem` query).
-   */
-  predicate includeHiddenNodes() { none() }
-}
-
-/**
- * This class exists to prevent mutual recursion between the user-overridden
- * member predicates of `Configuration` and the rest of the data-flow library.
- * Good performance cannot be guaranteed in the presence of such recursion, so
- * it should be replaced by using more than one copy of the data flow library.
- */
-abstract deprecated private class ConfigurationRecursionPrevention extends Configuration {
-  bindingset[this]
-  ConfigurationRecursionPrevention() { any() }
-
-  override predicate hasFlow(Node source, Node sink) {
-    strictcount(Node n | this.isSource(n)) < 0
-    or
-    strictcount(Node n | this.isSource(n, _)) < 0
-    or
-    strictcount(Node n | this.isSink(n)) < 0
-    or
-    strictcount(Node n | this.isSink(n, _)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, _, n2, _)) < 0
-    or
-    super.hasFlow(source, sink)
-  }
-}
-
-deprecated private FlowState relevantState(Configuration config) {
-  config.isSource(_, result) or
-  config.isSink(_, result) or
-  config.isBarrier(_, result) or
-  config.isAdditionalFlowStep(_, result, _, _) or
-  config.isAdditionalFlowStep(_, _, _, result)
-}
-
-private newtype TConfigState =
-  deprecated TMkConfigState(Configuration config, FlowState state) {
-    state = relevantState(config) or state instanceof FlowStateEmpty
-  }
-
-deprecated private Configuration getConfig(TConfigState state) { state = TMkConfigState(result, _) }
-
-deprecated private FlowState getState(TConfigState state) { state = TMkConfigState(_, result) }
-
-deprecated private predicate singleConfiguration() { 1 = strictcount(Configuration c) }
-
-deprecated private module Config implements FullStateConfigSig {
-  class FlowState = TConfigState;
-
-  predicate isSource(Node source, FlowState state) {
-    getConfig(state).isSource(source, getState(state))
-    or
-    getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isSink(Node sink) { none() }
-
-  predicate isSink(Node sink, FlowState state) {
-    getConfig(state).isSink(sink, getState(state))
-    or
-    getConfig(state).isSink(sink) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isBarrier(Node node) { none() }
-
-  predicate isBarrier(Node node, FlowState state) {
-    getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node)
-  }
-
-  predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
-
-  predicate isBarrierOut(Node node) { any(Configuration config).isBarrierOut(node) }
-
-  predicate isBarrierIn(Node node, FlowState state) { none() }
-
-  predicate isBarrierOut(Node node, FlowState state) { none() }
-
-  predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
-    singleConfiguration() and
-    any(Configuration config).isAdditionalFlowStep(node1, node2) and
-    model = ""
-  }
-
-  predicate isAdditionalFlowStep(
-    Node node1, FlowState state1, Node node2, FlowState state2, string model
-  ) {
-    getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1) and
-    model = ""
-    or
-    not singleConfiguration() and
-    getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1 and
-    model = ""
-  }
-
-  predicate allowImplicitRead(Node node, ContentSet c) {
-    any(Configuration config).allowImplicitRead(node, c)
-  }
-
-  predicate neverSkip(Node node) { none() }
-
-  int fieldFlowBranchLimit() { result = min(any(Configuration config).fieldFlowBranchLimit()) }
-
-  int accessPathLimit() { result = 5 }
-
-  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
-
-  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
-
-  predicate observeDiffInformedIncrementalMode() { none() }
-}
-
-deprecated private import Impl<Config> as I
-
-/**
- * A `Node` augmented with a call context (except for sinks), an access path, and a configuration.
- * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
- */
-deprecated class PathNode instanceof I::PathNode {
-  /** Gets a textual representation of this element. */
-  final string toString() { result = super.toString() }
-
-  /**
-   * Gets a textual representation of this element, including a textual
-   * representation of the call context.
-   */
-  final string toStringWithContext() { result = super.toStringWithContext() }
-
-  /**
-   * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
-   * For more information, see
-   * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
-   */
-  final predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    super.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-
-  /** Gets the underlying `Node`. */
-  final Node getNode() { result = super.getNode() }
-
-  /** Gets the `FlowState` of this node. */
-  deprecated final FlowState getState() { result = getState(super.getState()) }
-
-  /** Gets the associated configuration. */
-  deprecated final Configuration getConfiguration() { result = getConfig(super.getState()) }
-
-  /** Gets a successor of this node, if any. */
-  final PathNode getASuccessor() { result = super.getASuccessor() }
-
-  /** Holds if this node is a source. */
-  final predicate isSource() { super.isSource() }
-
-  /** Holds if this node is a grouping of source nodes. */
-  final predicate isSourceGroup(string group) { super.isSourceGroup(group) }
-
-  /** Holds if this node is a grouping of sink nodes. */
-  final predicate isSinkGroup(string group) { super.isSinkGroup(group) }
-}
-
-deprecated module PathGraph = I::PathGraph;
-
-deprecated private predicate hasFlow(Node source, Node sink, Configuration config) {
-  exists(PathNode source0, PathNode sink0 |
-    hasFlowPath(source0, sink0, config) and
-    source0.getNode() = source and
-    sink0.getNode() = sink
-  )
-}
-
-deprecated private predicate hasFlowPath(PathNode source, PathNode sink, Configuration config) {
-  I::flowPath(source, sink) and source.getConfiguration() = config
-}
-
-deprecated private predicate hasFlowTo(Node sink, Configuration config) { hasFlow(_, sink, config) }
-
-deprecated predicate flowsTo = hasFlow/3;
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl2.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl2.qll
deleted file mode 100644
index 17def0c431d..00000000000
--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl2.qll
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides a `Configuration` class backwards-compatible interface to the data
- * flow library.
- */
-
-private import DataFlowImplCommon
-private import DataFlowImplSpecific::Private
-import DataFlowImplSpecific::Public
-private import DataFlowImpl
-import DataFlowImplCommonPublic
-deprecated import FlowStateString
-private import codeql.util.Unit
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural data flow analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the global data flow library must define its own unique extension
- * of this abstract class. To create a configuration, extend this class with
- * a subclass whose characteristic predicate is a unique singleton string.
- * For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends DataFlow::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isBarrier`.
- *   // Optionally override `isAdditionalFlowStep`.
- * }
- * ```
- * Conceptually, this defines a graph where the nodes are `DataFlow::Node`s and
- * the edges are those data-flow steps that preserve the value of the node
- * along with any additional edges defined by `isAdditionalFlowStep`.
- * Specifying nodes in `isBarrier` will remove those nodes from the graph, and
- * specifying nodes in `isBarrierIn` and/or `isBarrierOut` will remove in-going
- * and/or out-going edges from those nodes, respectively.
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but two classes extending
- * `DataFlow::Configuration` should never depend on each other. One of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`.
- */
-abstract deprecated class Configuration extends string {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant data flow source.
-   */
-  predicate isSource(Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant data flow source with the given initial
-   * `state`.
-   */
-  predicate isSource(Node source, FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink.
-   */
-  predicate isSink(Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink accepting `state`.
-   */
-  predicate isSink(Node sink, FlowState state) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited. This completely removes
-   * `node` from the data flow graph.
-   */
-  predicate isBarrier(Node node) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited when the flow state is
-   * `state`.
-   */
-  predicate isBarrier(Node node, FlowState state) { none() }
-
-  /** Holds if data flow into `node` is prohibited. */
-  predicate isBarrierIn(Node node) { none() }
-
-  /** Holds if data flow out of `node` is prohibited. */
-  predicate isBarrierOut(Node node) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   */
-  predicate isAdditionalFlowStep(Node node1, Node node2) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
-    none()
-  }
-
-  /**
-   * Holds if an arbitrary number of implicit read steps of content `c` may be
-   * taken at `node`.
-   */
-  predicate allowImplicitRead(Node node, ContentSet c) { none() }
-
-  /**
-   * Gets the virtual dispatch branching limit when calculating field flow.
-   * This can be overridden to a smaller value to improve performance (a
-   * value of 0 disables field flow), or a larger value to get more results.
-   */
-  int fieldFlowBranchLimit() { result = 2 }
-
-  /**
-   * Gets a data flow configuration feature to add restrictions to the set of
-   * valid flow paths.
-   *
-   * - `FeatureHasSourceCallContext`:
-   *    Assume that sources have some existing call context to disallow
-   *    conflicting return-flow directly following the source.
-   * - `FeatureHasSinkCallContext`:
-   *    Assume that sinks have some existing call context to disallow
-   *    conflicting argument-to-parameter flow directly preceding the sink.
-   * - `FeatureEqualSourceSinkCallContext`:
-   *    Implies both of the above and additionally ensures that the entire flow
-   *    path preserves the call context.
-   *
-   * These features are generally not relevant for typical end-to-end data flow
-   * queries, but should only be used for constructing paths that need to
-   * somehow be pluggable in another path context.
-   */
-  FlowFeature getAFeature() { none() }
-
-  /** Holds if sources should be grouped in the result of `hasFlowPath`. */
-  predicate sourceGrouping(Node source, string sourceGroup) { none() }
-
-  /** Holds if sinks should be grouped in the result of `hasFlowPath`. */
-  predicate sinkGrouping(Node sink, string sinkGroup) { none() }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   */
-  predicate hasFlow(Node source, Node sink) { hasFlow(source, sink, this) }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   *
-   * The corresponding paths are generated from the end-points and the graph
-   * included in the module `PathGraph`.
-   */
-  predicate hasFlowPath(PathNode source, PathNode sink) { hasFlowPath(source, sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowTo(Node sink) { hasFlowTo(sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowToExpr(DataFlowExpr sink) { this.hasFlowTo(exprNode(sink)) }
-
-  /**
-   * Holds if hidden nodes should be included in the data flow graph.
-   *
-   * This feature should only be used for debugging or when the data flow graph
-   * is not visualized (for example in a `path-problem` query).
-   */
-  predicate includeHiddenNodes() { none() }
-}
-
-/**
- * This class exists to prevent mutual recursion between the user-overridden
- * member predicates of `Configuration` and the rest of the data-flow library.
- * Good performance cannot be guaranteed in the presence of such recursion, so
- * it should be replaced by using more than one copy of the data flow library.
- */
-abstract deprecated private class ConfigurationRecursionPrevention extends Configuration {
-  bindingset[this]
-  ConfigurationRecursionPrevention() { any() }
-
-  override predicate hasFlow(Node source, Node sink) {
-    strictcount(Node n | this.isSource(n)) < 0
-    or
-    strictcount(Node n | this.isSource(n, _)) < 0
-    or
-    strictcount(Node n | this.isSink(n)) < 0
-    or
-    strictcount(Node n | this.isSink(n, _)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, _, n2, _)) < 0
-    or
-    super.hasFlow(source, sink)
-  }
-}
-
-deprecated private FlowState relevantState(Configuration config) {
-  config.isSource(_, result) or
-  config.isSink(_, result) or
-  config.isBarrier(_, result) or
-  config.isAdditionalFlowStep(_, result, _, _) or
-  config.isAdditionalFlowStep(_, _, _, result)
-}
-
-private newtype TConfigState =
-  deprecated TMkConfigState(Configuration config, FlowState state) {
-    state = relevantState(config) or state instanceof FlowStateEmpty
-  }
-
-deprecated private Configuration getConfig(TConfigState state) { state = TMkConfigState(result, _) }
-
-deprecated private FlowState getState(TConfigState state) { state = TMkConfigState(_, result) }
-
-deprecated private predicate singleConfiguration() { 1 = strictcount(Configuration c) }
-
-deprecated private module Config implements FullStateConfigSig {
-  class FlowState = TConfigState;
-
-  predicate isSource(Node source, FlowState state) {
-    getConfig(state).isSource(source, getState(state))
-    or
-    getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isSink(Node sink) { none() }
-
-  predicate isSink(Node sink, FlowState state) {
-    getConfig(state).isSink(sink, getState(state))
-    or
-    getConfig(state).isSink(sink) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isBarrier(Node node) { none() }
-
-  predicate isBarrier(Node node, FlowState state) {
-    getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node)
-  }
-
-  predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
-
-  predicate isBarrierOut(Node node) { any(Configuration config).isBarrierOut(node) }
-
-  predicate isBarrierIn(Node node, FlowState state) { none() }
-
-  predicate isBarrierOut(Node node, FlowState state) { none() }
-
-  predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
-    singleConfiguration() and
-    any(Configuration config).isAdditionalFlowStep(node1, node2) and
-    model = ""
-  }
-
-  predicate isAdditionalFlowStep(
-    Node node1, FlowState state1, Node node2, FlowState state2, string model
-  ) {
-    getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1) and
-    model = ""
-    or
-    not singleConfiguration() and
-    getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1 and
-    model = ""
-  }
-
-  predicate allowImplicitRead(Node node, ContentSet c) {
-    any(Configuration config).allowImplicitRead(node, c)
-  }
-
-  predicate neverSkip(Node node) { none() }
-
-  int fieldFlowBranchLimit() { result = min(any(Configuration config).fieldFlowBranchLimit()) }
-
-  int accessPathLimit() { result = 5 }
-
-  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
-
-  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
-
-  predicate observeDiffInformedIncrementalMode() { none() }
-}
-
-deprecated private import Impl<Config> as I
-
-/**
- * A `Node` augmented with a call context (except for sinks), an access path, and a configuration.
- * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
- */
-deprecated class PathNode instanceof I::PathNode {
-  /** Gets a textual representation of this element. */
-  final string toString() { result = super.toString() }
-
-  /**
-   * Gets a textual representation of this element, including a textual
-   * representation of the call context.
-   */
-  final string toStringWithContext() { result = super.toStringWithContext() }
-
-  /**
-   * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
-   * For more information, see
-   * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
-   */
-  final predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    super.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-
-  /** Gets the underlying `Node`. */
-  final Node getNode() { result = super.getNode() }
-
-  /** Gets the `FlowState` of this node. */
-  deprecated final FlowState getState() { result = getState(super.getState()) }
-
-  /** Gets the associated configuration. */
-  deprecated final Configuration getConfiguration() { result = getConfig(super.getState()) }
-
-  /** Gets a successor of this node, if any. */
-  final PathNode getASuccessor() { result = super.getASuccessor() }
-
-  /** Holds if this node is a source. */
-  final predicate isSource() { super.isSource() }
-
-  /** Holds if this node is a grouping of source nodes. */
-  final predicate isSourceGroup(string group) { super.isSourceGroup(group) }
-
-  /** Holds if this node is a grouping of sink nodes. */
-  final predicate isSinkGroup(string group) { super.isSinkGroup(group) }
-}
-
-deprecated module PathGraph = I::PathGraph;
-
-deprecated private predicate hasFlow(Node source, Node sink, Configuration config) {
-  exists(PathNode source0, PathNode sink0 |
-    hasFlowPath(source0, sink0, config) and
-    source0.getNode() = source and
-    sink0.getNode() = sink
-  )
-}
-
-deprecated private predicate hasFlowPath(PathNode source, PathNode sink, Configuration config) {
-  I::flowPath(source, sink) and source.getConfiguration() = config
-}
-
-deprecated private predicate hasFlowTo(Node sink, Configuration config) { hasFlow(_, sink, config) }
-
-deprecated predicate flowsTo = hasFlow/3;
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl3.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl3.qll
deleted file mode 100644
index 17def0c431d..00000000000
--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl3.qll
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides a `Configuration` class backwards-compatible interface to the data
- * flow library.
- */
-
-private import DataFlowImplCommon
-private import DataFlowImplSpecific::Private
-import DataFlowImplSpecific::Public
-private import DataFlowImpl
-import DataFlowImplCommonPublic
-deprecated import FlowStateString
-private import codeql.util.Unit
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural data flow analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the global data flow library must define its own unique extension
- * of this abstract class. To create a configuration, extend this class with
- * a subclass whose characteristic predicate is a unique singleton string.
- * For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends DataFlow::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isBarrier`.
- *   // Optionally override `isAdditionalFlowStep`.
- * }
- * ```
- * Conceptually, this defines a graph where the nodes are `DataFlow::Node`s and
- * the edges are those data-flow steps that preserve the value of the node
- * along with any additional edges defined by `isAdditionalFlowStep`.
- * Specifying nodes in `isBarrier` will remove those nodes from the graph, and
- * specifying nodes in `isBarrierIn` and/or `isBarrierOut` will remove in-going
- * and/or out-going edges from those nodes, respectively.
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but two classes extending
- * `DataFlow::Configuration` should never depend on each other. One of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`.
- */
-abstract deprecated class Configuration extends string {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant data flow source.
-   */
-  predicate isSource(Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant data flow source with the given initial
-   * `state`.
-   */
-  predicate isSource(Node source, FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink.
-   */
-  predicate isSink(Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink accepting `state`.
-   */
-  predicate isSink(Node sink, FlowState state) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited. This completely removes
-   * `node` from the data flow graph.
-   */
-  predicate isBarrier(Node node) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited when the flow state is
-   * `state`.
-   */
-  predicate isBarrier(Node node, FlowState state) { none() }
-
-  /** Holds if data flow into `node` is prohibited. */
-  predicate isBarrierIn(Node node) { none() }
-
-  /** Holds if data flow out of `node` is prohibited. */
-  predicate isBarrierOut(Node node) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   */
-  predicate isAdditionalFlowStep(Node node1, Node node2) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
-    none()
-  }
-
-  /**
-   * Holds if an arbitrary number of implicit read steps of content `c` may be
-   * taken at `node`.
-   */
-  predicate allowImplicitRead(Node node, ContentSet c) { none() }
-
-  /**
-   * Gets the virtual dispatch branching limit when calculating field flow.
-   * This can be overridden to a smaller value to improve performance (a
-   * value of 0 disables field flow), or a larger value to get more results.
-   */
-  int fieldFlowBranchLimit() { result = 2 }
-
-  /**
-   * Gets a data flow configuration feature to add restrictions to the set of
-   * valid flow paths.
-   *
-   * - `FeatureHasSourceCallContext`:
-   *    Assume that sources have some existing call context to disallow
-   *    conflicting return-flow directly following the source.
-   * - `FeatureHasSinkCallContext`:
-   *    Assume that sinks have some existing call context to disallow
-   *    conflicting argument-to-parameter flow directly preceding the sink.
-   * - `FeatureEqualSourceSinkCallContext`:
-   *    Implies both of the above and additionally ensures that the entire flow
-   *    path preserves the call context.
-   *
-   * These features are generally not relevant for typical end-to-end data flow
-   * queries, but should only be used for constructing paths that need to
-   * somehow be pluggable in another path context.
-   */
-  FlowFeature getAFeature() { none() }
-
-  /** Holds if sources should be grouped in the result of `hasFlowPath`. */
-  predicate sourceGrouping(Node source, string sourceGroup) { none() }
-
-  /** Holds if sinks should be grouped in the result of `hasFlowPath`. */
-  predicate sinkGrouping(Node sink, string sinkGroup) { none() }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   */
-  predicate hasFlow(Node source, Node sink) { hasFlow(source, sink, this) }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   *
-   * The corresponding paths are generated from the end-points and the graph
-   * included in the module `PathGraph`.
-   */
-  predicate hasFlowPath(PathNode source, PathNode sink) { hasFlowPath(source, sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowTo(Node sink) { hasFlowTo(sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowToExpr(DataFlowExpr sink) { this.hasFlowTo(exprNode(sink)) }
-
-  /**
-   * Holds if hidden nodes should be included in the data flow graph.
-   *
-   * This feature should only be used for debugging or when the data flow graph
-   * is not visualized (for example in a `path-problem` query).
-   */
-  predicate includeHiddenNodes() { none() }
-}
-
-/**
- * This class exists to prevent mutual recursion between the user-overridden
- * member predicates of `Configuration` and the rest of the data-flow library.
- * Good performance cannot be guaranteed in the presence of such recursion, so
- * it should be replaced by using more than one copy of the data flow library.
- */
-abstract deprecated private class ConfigurationRecursionPrevention extends Configuration {
-  bindingset[this]
-  ConfigurationRecursionPrevention() { any() }
-
-  override predicate hasFlow(Node source, Node sink) {
-    strictcount(Node n | this.isSource(n)) < 0
-    or
-    strictcount(Node n | this.isSource(n, _)) < 0
-    or
-    strictcount(Node n | this.isSink(n)) < 0
-    or
-    strictcount(Node n | this.isSink(n, _)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, _, n2, _)) < 0
-    or
-    super.hasFlow(source, sink)
-  }
-}
-
-deprecated private FlowState relevantState(Configuration config) {
-  config.isSource(_, result) or
-  config.isSink(_, result) or
-  config.isBarrier(_, result) or
-  config.isAdditionalFlowStep(_, result, _, _) or
-  config.isAdditionalFlowStep(_, _, _, result)
-}
-
-private newtype TConfigState =
-  deprecated TMkConfigState(Configuration config, FlowState state) {
-    state = relevantState(config) or state instanceof FlowStateEmpty
-  }
-
-deprecated private Configuration getConfig(TConfigState state) { state = TMkConfigState(result, _) }
-
-deprecated private FlowState getState(TConfigState state) { state = TMkConfigState(_, result) }
-
-deprecated private predicate singleConfiguration() { 1 = strictcount(Configuration c) }
-
-deprecated private module Config implements FullStateConfigSig {
-  class FlowState = TConfigState;
-
-  predicate isSource(Node source, FlowState state) {
-    getConfig(state).isSource(source, getState(state))
-    or
-    getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isSink(Node sink) { none() }
-
-  predicate isSink(Node sink, FlowState state) {
-    getConfig(state).isSink(sink, getState(state))
-    or
-    getConfig(state).isSink(sink) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isBarrier(Node node) { none() }
-
-  predicate isBarrier(Node node, FlowState state) {
-    getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node)
-  }
-
-  predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
-
-  predicate isBarrierOut(Node node) { any(Configuration config).isBarrierOut(node) }
-
-  predicate isBarrierIn(Node node, FlowState state) { none() }
-
-  predicate isBarrierOut(Node node, FlowState state) { none() }
-
-  predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
-    singleConfiguration() and
-    any(Configuration config).isAdditionalFlowStep(node1, node2) and
-    model = ""
-  }
-
-  predicate isAdditionalFlowStep(
-    Node node1, FlowState state1, Node node2, FlowState state2, string model
-  ) {
-    getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1) and
-    model = ""
-    or
-    not singleConfiguration() and
-    getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1 and
-    model = ""
-  }
-
-  predicate allowImplicitRead(Node node, ContentSet c) {
-    any(Configuration config).allowImplicitRead(node, c)
-  }
-
-  predicate neverSkip(Node node) { none() }
-
-  int fieldFlowBranchLimit() { result = min(any(Configuration config).fieldFlowBranchLimit()) }
-
-  int accessPathLimit() { result = 5 }
-
-  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
-
-  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
-
-  predicate observeDiffInformedIncrementalMode() { none() }
-}
-
-deprecated private import Impl<Config> as I
-
-/**
- * A `Node` augmented with a call context (except for sinks), an access path, and a configuration.
- * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
- */
-deprecated class PathNode instanceof I::PathNode {
-  /** Gets a textual representation of this element. */
-  final string toString() { result = super.toString() }
-
-  /**
-   * Gets a textual representation of this element, including a textual
-   * representation of the call context.
-   */
-  final string toStringWithContext() { result = super.toStringWithContext() }
-
-  /**
-   * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
-   * For more information, see
-   * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
-   */
-  final predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    super.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-
-  /** Gets the underlying `Node`. */
-  final Node getNode() { result = super.getNode() }
-
-  /** Gets the `FlowState` of this node. */
-  deprecated final FlowState getState() { result = getState(super.getState()) }
-
-  /** Gets the associated configuration. */
-  deprecated final Configuration getConfiguration() { result = getConfig(super.getState()) }
-
-  /** Gets a successor of this node, if any. */
-  final PathNode getASuccessor() { result = super.getASuccessor() }
-
-  /** Holds if this node is a source. */
-  final predicate isSource() { super.isSource() }
-
-  /** Holds if this node is a grouping of source nodes. */
-  final predicate isSourceGroup(string group) { super.isSourceGroup(group) }
-
-  /** Holds if this node is a grouping of sink nodes. */
-  final predicate isSinkGroup(string group) { super.isSinkGroup(group) }
-}
-
-deprecated module PathGraph = I::PathGraph;
-
-deprecated private predicate hasFlow(Node source, Node sink, Configuration config) {
-  exists(PathNode source0, PathNode sink0 |
-    hasFlowPath(source0, sink0, config) and
-    source0.getNode() = source and
-    sink0.getNode() = sink
-  )
-}
-
-deprecated private predicate hasFlowPath(PathNode source, PathNode sink, Configuration config) {
-  I::flowPath(source, sink) and source.getConfiguration() = config
-}
-
-deprecated private predicate hasFlowTo(Node sink, Configuration config) { hasFlow(_, sink, config) }
-
-deprecated predicate flowsTo = hasFlow/3;
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl4.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl4.qll
deleted file mode 100644
index 17def0c431d..00000000000
--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl4.qll
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides a `Configuration` class backwards-compatible interface to the data
- * flow library.
- */
-
-private import DataFlowImplCommon
-private import DataFlowImplSpecific::Private
-import DataFlowImplSpecific::Public
-private import DataFlowImpl
-import DataFlowImplCommonPublic
-deprecated import FlowStateString
-private import codeql.util.Unit
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural data flow analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the global data flow library must define its own unique extension
- * of this abstract class. To create a configuration, extend this class with
- * a subclass whose characteristic predicate is a unique singleton string.
- * For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends DataFlow::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isBarrier`.
- *   // Optionally override `isAdditionalFlowStep`.
- * }
- * ```
- * Conceptually, this defines a graph where the nodes are `DataFlow::Node`s and
- * the edges are those data-flow steps that preserve the value of the node
- * along with any additional edges defined by `isAdditionalFlowStep`.
- * Specifying nodes in `isBarrier` will remove those nodes from the graph, and
- * specifying nodes in `isBarrierIn` and/or `isBarrierOut` will remove in-going
- * and/or out-going edges from those nodes, respectively.
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but two classes extending
- * `DataFlow::Configuration` should never depend on each other. One of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`.
- */
-abstract deprecated class Configuration extends string {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant data flow source.
-   */
-  predicate isSource(Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant data flow source with the given initial
-   * `state`.
-   */
-  predicate isSource(Node source, FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink.
-   */
-  predicate isSink(Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink accepting `state`.
-   */
-  predicate isSink(Node sink, FlowState state) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited. This completely removes
-   * `node` from the data flow graph.
-   */
-  predicate isBarrier(Node node) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited when the flow state is
-   * `state`.
-   */
-  predicate isBarrier(Node node, FlowState state) { none() }
-
-  /** Holds if data flow into `node` is prohibited. */
-  predicate isBarrierIn(Node node) { none() }
-
-  /** Holds if data flow out of `node` is prohibited. */
-  predicate isBarrierOut(Node node) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   */
-  predicate isAdditionalFlowStep(Node node1, Node node2) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
-    none()
-  }
-
-  /**
-   * Holds if an arbitrary number of implicit read steps of content `c` may be
-   * taken at `node`.
-   */
-  predicate allowImplicitRead(Node node, ContentSet c) { none() }
-
-  /**
-   * Gets the virtual dispatch branching limit when calculating field flow.
-   * This can be overridden to a smaller value to improve performance (a
-   * value of 0 disables field flow), or a larger value to get more results.
-   */
-  int fieldFlowBranchLimit() { result = 2 }
-
-  /**
-   * Gets a data flow configuration feature to add restrictions to the set of
-   * valid flow paths.
-   *
-   * - `FeatureHasSourceCallContext`:
-   *    Assume that sources have some existing call context to disallow
-   *    conflicting return-flow directly following the source.
-   * - `FeatureHasSinkCallContext`:
-   *    Assume that sinks have some existing call context to disallow
-   *    conflicting argument-to-parameter flow directly preceding the sink.
-   * - `FeatureEqualSourceSinkCallContext`:
-   *    Implies both of the above and additionally ensures that the entire flow
-   *    path preserves the call context.
-   *
-   * These features are generally not relevant for typical end-to-end data flow
-   * queries, but should only be used for constructing paths that need to
-   * somehow be pluggable in another path context.
-   */
-  FlowFeature getAFeature() { none() }
-
-  /** Holds if sources should be grouped in the result of `hasFlowPath`. */
-  predicate sourceGrouping(Node source, string sourceGroup) { none() }
-
-  /** Holds if sinks should be grouped in the result of `hasFlowPath`. */
-  predicate sinkGrouping(Node sink, string sinkGroup) { none() }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   */
-  predicate hasFlow(Node source, Node sink) { hasFlow(source, sink, this) }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   *
-   * The corresponding paths are generated from the end-points and the graph
-   * included in the module `PathGraph`.
-   */
-  predicate hasFlowPath(PathNode source, PathNode sink) { hasFlowPath(source, sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowTo(Node sink) { hasFlowTo(sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowToExpr(DataFlowExpr sink) { this.hasFlowTo(exprNode(sink)) }
-
-  /**
-   * Holds if hidden nodes should be included in the data flow graph.
-   *
-   * This feature should only be used for debugging or when the data flow graph
-   * is not visualized (for example in a `path-problem` query).
-   */
-  predicate includeHiddenNodes() { none() }
-}
-
-/**
- * This class exists to prevent mutual recursion between the user-overridden
- * member predicates of `Configuration` and the rest of the data-flow library.
- * Good performance cannot be guaranteed in the presence of such recursion, so
- * it should be replaced by using more than one copy of the data flow library.
- */
-abstract deprecated private class ConfigurationRecursionPrevention extends Configuration {
-  bindingset[this]
-  ConfigurationRecursionPrevention() { any() }
-
-  override predicate hasFlow(Node source, Node sink) {
-    strictcount(Node n | this.isSource(n)) < 0
-    or
-    strictcount(Node n | this.isSource(n, _)) < 0
-    or
-    strictcount(Node n | this.isSink(n)) < 0
-    or
-    strictcount(Node n | this.isSink(n, _)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, _, n2, _)) < 0
-    or
-    super.hasFlow(source, sink)
-  }
-}
-
-deprecated private FlowState relevantState(Configuration config) {
-  config.isSource(_, result) or
-  config.isSink(_, result) or
-  config.isBarrier(_, result) or
-  config.isAdditionalFlowStep(_, result, _, _) or
-  config.isAdditionalFlowStep(_, _, _, result)
-}
-
-private newtype TConfigState =
-  deprecated TMkConfigState(Configuration config, FlowState state) {
-    state = relevantState(config) or state instanceof FlowStateEmpty
-  }
-
-deprecated private Configuration getConfig(TConfigState state) { state = TMkConfigState(result, _) }
-
-deprecated private FlowState getState(TConfigState state) { state = TMkConfigState(_, result) }
-
-deprecated private predicate singleConfiguration() { 1 = strictcount(Configuration c) }
-
-deprecated private module Config implements FullStateConfigSig {
-  class FlowState = TConfigState;
-
-  predicate isSource(Node source, FlowState state) {
-    getConfig(state).isSource(source, getState(state))
-    or
-    getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isSink(Node sink) { none() }
-
-  predicate isSink(Node sink, FlowState state) {
-    getConfig(state).isSink(sink, getState(state))
-    or
-    getConfig(state).isSink(sink) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isBarrier(Node node) { none() }
-
-  predicate isBarrier(Node node, FlowState state) {
-    getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node)
-  }
-
-  predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
-
-  predicate isBarrierOut(Node node) { any(Configuration config).isBarrierOut(node) }
-
-  predicate isBarrierIn(Node node, FlowState state) { none() }
-
-  predicate isBarrierOut(Node node, FlowState state) { none() }
-
-  predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
-    singleConfiguration() and
-    any(Configuration config).isAdditionalFlowStep(node1, node2) and
-    model = ""
-  }
-
-  predicate isAdditionalFlowStep(
-    Node node1, FlowState state1, Node node2, FlowState state2, string model
-  ) {
-    getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1) and
-    model = ""
-    or
-    not singleConfiguration() and
-    getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1 and
-    model = ""
-  }
-
-  predicate allowImplicitRead(Node node, ContentSet c) {
-    any(Configuration config).allowImplicitRead(node, c)
-  }
-
-  predicate neverSkip(Node node) { none() }
-
-  int fieldFlowBranchLimit() { result = min(any(Configuration config).fieldFlowBranchLimit()) }
-
-  int accessPathLimit() { result = 5 }
-
-  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
-
-  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
-
-  predicate observeDiffInformedIncrementalMode() { none() }
-}
-
-deprecated private import Impl<Config> as I
-
-/**
- * A `Node` augmented with a call context (except for sinks), an access path, and a configuration.
- * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
- */
-deprecated class PathNode instanceof I::PathNode {
-  /** Gets a textual representation of this element. */
-  final string toString() { result = super.toString() }
-
-  /**
-   * Gets a textual representation of this element, including a textual
-   * representation of the call context.
-   */
-  final string toStringWithContext() { result = super.toStringWithContext() }
-
-  /**
-   * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
-   * For more information, see
-   * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
-   */
-  final predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    super.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-
-  /** Gets the underlying `Node`. */
-  final Node getNode() { result = super.getNode() }
-
-  /** Gets the `FlowState` of this node. */
-  deprecated final FlowState getState() { result = getState(super.getState()) }
-
-  /** Gets the associated configuration. */
-  deprecated final Configuration getConfiguration() { result = getConfig(super.getState()) }
-
-  /** Gets a successor of this node, if any. */
-  final PathNode getASuccessor() { result = super.getASuccessor() }
-
-  /** Holds if this node is a source. */
-  final predicate isSource() { super.isSource() }
-
-  /** Holds if this node is a grouping of source nodes. */
-  final predicate isSourceGroup(string group) { super.isSourceGroup(group) }
-
-  /** Holds if this node is a grouping of sink nodes. */
-  final predicate isSinkGroup(string group) { super.isSinkGroup(group) }
-}
-
-deprecated module PathGraph = I::PathGraph;
-
-deprecated private predicate hasFlow(Node source, Node sink, Configuration config) {
-  exists(PathNode source0, PathNode sink0 |
-    hasFlowPath(source0, sink0, config) and
-    source0.getNode() = source and
-    sink0.getNode() = sink
-  )
-}
-
-deprecated private predicate hasFlowPath(PathNode source, PathNode sink, Configuration config) {
-  I::flowPath(source, sink) and source.getConfiguration() = config
-}
-
-deprecated private predicate hasFlowTo(Node sink, Configuration config) { hasFlow(_, sink, config) }
-
-deprecated predicate flowsTo = hasFlow/3;
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl5.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl5.qll
deleted file mode 100644
index 17def0c431d..00000000000
--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl5.qll
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides a `Configuration` class backwards-compatible interface to the data
- * flow library.
- */
-
-private import DataFlowImplCommon
-private import DataFlowImplSpecific::Private
-import DataFlowImplSpecific::Public
-private import DataFlowImpl
-import DataFlowImplCommonPublic
-deprecated import FlowStateString
-private import codeql.util.Unit
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural data flow analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the global data flow library must define its own unique extension
- * of this abstract class. To create a configuration, extend this class with
- * a subclass whose characteristic predicate is a unique singleton string.
- * For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends DataFlow::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isBarrier`.
- *   // Optionally override `isAdditionalFlowStep`.
- * }
- * ```
- * Conceptually, this defines a graph where the nodes are `DataFlow::Node`s and
- * the edges are those data-flow steps that preserve the value of the node
- * along with any additional edges defined by `isAdditionalFlowStep`.
- * Specifying nodes in `isBarrier` will remove those nodes from the graph, and
- * specifying nodes in `isBarrierIn` and/or `isBarrierOut` will remove in-going
- * and/or out-going edges from those nodes, respectively.
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but two classes extending
- * `DataFlow::Configuration` should never depend on each other. One of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`.
- */
-abstract deprecated class Configuration extends string {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant data flow source.
-   */
-  predicate isSource(Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant data flow source with the given initial
-   * `state`.
-   */
-  predicate isSource(Node source, FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink.
-   */
-  predicate isSink(Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink accepting `state`.
-   */
-  predicate isSink(Node sink, FlowState state) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited. This completely removes
-   * `node` from the data flow graph.
-   */
-  predicate isBarrier(Node node) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited when the flow state is
-   * `state`.
-   */
-  predicate isBarrier(Node node, FlowState state) { none() }
-
-  /** Holds if data flow into `node` is prohibited. */
-  predicate isBarrierIn(Node node) { none() }
-
-  /** Holds if data flow out of `node` is prohibited. */
-  predicate isBarrierOut(Node node) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   */
-  predicate isAdditionalFlowStep(Node node1, Node node2) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
-    none()
-  }
-
-  /**
-   * Holds if an arbitrary number of implicit read steps of content `c` may be
-   * taken at `node`.
-   */
-  predicate allowImplicitRead(Node node, ContentSet c) { none() }
-
-  /**
-   * Gets the virtual dispatch branching limit when calculating field flow.
-   * This can be overridden to a smaller value to improve performance (a
-   * value of 0 disables field flow), or a larger value to get more results.
-   */
-  int fieldFlowBranchLimit() { result = 2 }
-
-  /**
-   * Gets a data flow configuration feature to add restrictions to the set of
-   * valid flow paths.
-   *
-   * - `FeatureHasSourceCallContext`:
-   *    Assume that sources have some existing call context to disallow
-   *    conflicting return-flow directly following the source.
-   * - `FeatureHasSinkCallContext`:
-   *    Assume that sinks have some existing call context to disallow
-   *    conflicting argument-to-parameter flow directly preceding the sink.
-   * - `FeatureEqualSourceSinkCallContext`:
-   *    Implies both of the above and additionally ensures that the entire flow
-   *    path preserves the call context.
-   *
-   * These features are generally not relevant for typical end-to-end data flow
-   * queries, but should only be used for constructing paths that need to
-   * somehow be pluggable in another path context.
-   */
-  FlowFeature getAFeature() { none() }
-
-  /** Holds if sources should be grouped in the result of `hasFlowPath`. */
-  predicate sourceGrouping(Node source, string sourceGroup) { none() }
-
-  /** Holds if sinks should be grouped in the result of `hasFlowPath`. */
-  predicate sinkGrouping(Node sink, string sinkGroup) { none() }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   */
-  predicate hasFlow(Node source, Node sink) { hasFlow(source, sink, this) }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   *
-   * The corresponding paths are generated from the end-points and the graph
-   * included in the module `PathGraph`.
-   */
-  predicate hasFlowPath(PathNode source, PathNode sink) { hasFlowPath(source, sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowTo(Node sink) { hasFlowTo(sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowToExpr(DataFlowExpr sink) { this.hasFlowTo(exprNode(sink)) }
-
-  /**
-   * Holds if hidden nodes should be included in the data flow graph.
-   *
-   * This feature should only be used for debugging or when the data flow graph
-   * is not visualized (for example in a `path-problem` query).
-   */
-  predicate includeHiddenNodes() { none() }
-}
-
-/**
- * This class exists to prevent mutual recursion between the user-overridden
- * member predicates of `Configuration` and the rest of the data-flow library.
- * Good performance cannot be guaranteed in the presence of such recursion, so
- * it should be replaced by using more than one copy of the data flow library.
- */
-abstract deprecated private class ConfigurationRecursionPrevention extends Configuration {
-  bindingset[this]
-  ConfigurationRecursionPrevention() { any() }
-
-  override predicate hasFlow(Node source, Node sink) {
-    strictcount(Node n | this.isSource(n)) < 0
-    or
-    strictcount(Node n | this.isSource(n, _)) < 0
-    or
-    strictcount(Node n | this.isSink(n)) < 0
-    or
-    strictcount(Node n | this.isSink(n, _)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, _, n2, _)) < 0
-    or
-    super.hasFlow(source, sink)
-  }
-}
-
-deprecated private FlowState relevantState(Configuration config) {
-  config.isSource(_, result) or
-  config.isSink(_, result) or
-  config.isBarrier(_, result) or
-  config.isAdditionalFlowStep(_, result, _, _) or
-  config.isAdditionalFlowStep(_, _, _, result)
-}
-
-private newtype TConfigState =
-  deprecated TMkConfigState(Configuration config, FlowState state) {
-    state = relevantState(config) or state instanceof FlowStateEmpty
-  }
-
-deprecated private Configuration getConfig(TConfigState state) { state = TMkConfigState(result, _) }
-
-deprecated private FlowState getState(TConfigState state) { state = TMkConfigState(_, result) }
-
-deprecated private predicate singleConfiguration() { 1 = strictcount(Configuration c) }
-
-deprecated private module Config implements FullStateConfigSig {
-  class FlowState = TConfigState;
-
-  predicate isSource(Node source, FlowState state) {
-    getConfig(state).isSource(source, getState(state))
-    or
-    getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isSink(Node sink) { none() }
-
-  predicate isSink(Node sink, FlowState state) {
-    getConfig(state).isSink(sink, getState(state))
-    or
-    getConfig(state).isSink(sink) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isBarrier(Node node) { none() }
-
-  predicate isBarrier(Node node, FlowState state) {
-    getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node)
-  }
-
-  predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
-
-  predicate isBarrierOut(Node node) { any(Configuration config).isBarrierOut(node) }
-
-  predicate isBarrierIn(Node node, FlowState state) { none() }
-
-  predicate isBarrierOut(Node node, FlowState state) { none() }
-
-  predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
-    singleConfiguration() and
-    any(Configuration config).isAdditionalFlowStep(node1, node2) and
-    model = ""
-  }
-
-  predicate isAdditionalFlowStep(
-    Node node1, FlowState state1, Node node2, FlowState state2, string model
-  ) {
-    getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1) and
-    model = ""
-    or
-    not singleConfiguration() and
-    getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1 and
-    model = ""
-  }
-
-  predicate allowImplicitRead(Node node, ContentSet c) {
-    any(Configuration config).allowImplicitRead(node, c)
-  }
-
-  predicate neverSkip(Node node) { none() }
-
-  int fieldFlowBranchLimit() { result = min(any(Configuration config).fieldFlowBranchLimit()) }
-
-  int accessPathLimit() { result = 5 }
-
-  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
-
-  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
-
-  predicate observeDiffInformedIncrementalMode() { none() }
-}
-
-deprecated private import Impl<Config> as I
-
-/**
- * A `Node` augmented with a call context (except for sinks), an access path, and a configuration.
- * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
- */
-deprecated class PathNode instanceof I::PathNode {
-  /** Gets a textual representation of this element. */
-  final string toString() { result = super.toString() }
-
-  /**
-   * Gets a textual representation of this element, including a textual
-   * representation of the call context.
-   */
-  final string toStringWithContext() { result = super.toStringWithContext() }
-
-  /**
-   * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
-   * For more information, see
-   * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
-   */
-  final predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    super.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-
-  /** Gets the underlying `Node`. */
-  final Node getNode() { result = super.getNode() }
-
-  /** Gets the `FlowState` of this node. */
-  deprecated final FlowState getState() { result = getState(super.getState()) }
-
-  /** Gets the associated configuration. */
-  deprecated final Configuration getConfiguration() { result = getConfig(super.getState()) }
-
-  /** Gets a successor of this node, if any. */
-  final PathNode getASuccessor() { result = super.getASuccessor() }
-
-  /** Holds if this node is a source. */
-  final predicate isSource() { super.isSource() }
-
-  /** Holds if this node is a grouping of source nodes. */
-  final predicate isSourceGroup(string group) { super.isSourceGroup(group) }
-
-  /** Holds if this node is a grouping of sink nodes. */
-  final predicate isSinkGroup(string group) { super.isSinkGroup(group) }
-}
-
-deprecated module PathGraph = I::PathGraph;
-
-deprecated private predicate hasFlow(Node source, Node sink, Configuration config) {
-  exists(PathNode source0, PathNode sink0 |
-    hasFlowPath(source0, sink0, config) and
-    source0.getNode() = source and
-    sink0.getNode() = sink
-  )
-}
-
-deprecated private predicate hasFlowPath(PathNode source, PathNode sink, Configuration config) {
-  I::flowPath(source, sink) and source.getConfiguration() = config
-}
-
-deprecated private predicate hasFlowTo(Node sink, Configuration config) { hasFlow(_, sink, config) }
-
-deprecated predicate flowsTo = hasFlow/3;
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl6.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl6.qll
deleted file mode 100644
index 17def0c431d..00000000000
--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl6.qll
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides a `Configuration` class backwards-compatible interface to the data
- * flow library.
- */
-
-private import DataFlowImplCommon
-private import DataFlowImplSpecific::Private
-import DataFlowImplSpecific::Public
-private import DataFlowImpl
-import DataFlowImplCommonPublic
-deprecated import FlowStateString
-private import codeql.util.Unit
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural data flow analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the global data flow library must define its own unique extension
- * of this abstract class. To create a configuration, extend this class with
- * a subclass whose characteristic predicate is a unique singleton string.
- * For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends DataFlow::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isBarrier`.
- *   // Optionally override `isAdditionalFlowStep`.
- * }
- * ```
- * Conceptually, this defines a graph where the nodes are `DataFlow::Node`s and
- * the edges are those data-flow steps that preserve the value of the node
- * along with any additional edges defined by `isAdditionalFlowStep`.
- * Specifying nodes in `isBarrier` will remove those nodes from the graph, and
- * specifying nodes in `isBarrierIn` and/or `isBarrierOut` will remove in-going
- * and/or out-going edges from those nodes, respectively.
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but two classes extending
- * `DataFlow::Configuration` should never depend on each other. One of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`.
- */
-abstract deprecated class Configuration extends string {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant data flow source.
-   */
-  predicate isSource(Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant data flow source with the given initial
-   * `state`.
-   */
-  predicate isSource(Node source, FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink.
-   */
-  predicate isSink(Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink accepting `state`.
-   */
-  predicate isSink(Node sink, FlowState state) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited. This completely removes
-   * `node` from the data flow graph.
-   */
-  predicate isBarrier(Node node) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited when the flow state is
-   * `state`.
-   */
-  predicate isBarrier(Node node, FlowState state) { none() }
-
-  /** Holds if data flow into `node` is prohibited. */
-  predicate isBarrierIn(Node node) { none() }
-
-  /** Holds if data flow out of `node` is prohibited. */
-  predicate isBarrierOut(Node node) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   */
-  predicate isAdditionalFlowStep(Node node1, Node node2) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
-    none()
-  }
-
-  /**
-   * Holds if an arbitrary number of implicit read steps of content `c` may be
-   * taken at `node`.
-   */
-  predicate allowImplicitRead(Node node, ContentSet c) { none() }
-
-  /**
-   * Gets the virtual dispatch branching limit when calculating field flow.
-   * This can be overridden to a smaller value to improve performance (a
-   * value of 0 disables field flow), or a larger value to get more results.
-   */
-  int fieldFlowBranchLimit() { result = 2 }
-
-  /**
-   * Gets a data flow configuration feature to add restrictions to the set of
-   * valid flow paths.
-   *
-   * - `FeatureHasSourceCallContext`:
-   *    Assume that sources have some existing call context to disallow
-   *    conflicting return-flow directly following the source.
-   * - `FeatureHasSinkCallContext`:
-   *    Assume that sinks have some existing call context to disallow
-   *    conflicting argument-to-parameter flow directly preceding the sink.
-   * - `FeatureEqualSourceSinkCallContext`:
-   *    Implies both of the above and additionally ensures that the entire flow
-   *    path preserves the call context.
-   *
-   * These features are generally not relevant for typical end-to-end data flow
-   * queries, but should only be used for constructing paths that need to
-   * somehow be pluggable in another path context.
-   */
-  FlowFeature getAFeature() { none() }
-
-  /** Holds if sources should be grouped in the result of `hasFlowPath`. */
-  predicate sourceGrouping(Node source, string sourceGroup) { none() }
-
-  /** Holds if sinks should be grouped in the result of `hasFlowPath`. */
-  predicate sinkGrouping(Node sink, string sinkGroup) { none() }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   */
-  predicate hasFlow(Node source, Node sink) { hasFlow(source, sink, this) }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   *
-   * The corresponding paths are generated from the end-points and the graph
-   * included in the module `PathGraph`.
-   */
-  predicate hasFlowPath(PathNode source, PathNode sink) { hasFlowPath(source, sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowTo(Node sink) { hasFlowTo(sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowToExpr(DataFlowExpr sink) { this.hasFlowTo(exprNode(sink)) }
-
-  /**
-   * Holds if hidden nodes should be included in the data flow graph.
-   *
-   * This feature should only be used for debugging or when the data flow graph
-   * is not visualized (for example in a `path-problem` query).
-   */
-  predicate includeHiddenNodes() { none() }
-}
-
-/**
- * This class exists to prevent mutual recursion between the user-overridden
- * member predicates of `Configuration` and the rest of the data-flow library.
- * Good performance cannot be guaranteed in the presence of such recursion, so
- * it should be replaced by using more than one copy of the data flow library.
- */
-abstract deprecated private class ConfigurationRecursionPrevention extends Configuration {
-  bindingset[this]
-  ConfigurationRecursionPrevention() { any() }
-
-  override predicate hasFlow(Node source, Node sink) {
-    strictcount(Node n | this.isSource(n)) < 0
-    or
-    strictcount(Node n | this.isSource(n, _)) < 0
-    or
-    strictcount(Node n | this.isSink(n)) < 0
-    or
-    strictcount(Node n | this.isSink(n, _)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, _, n2, _)) < 0
-    or
-    super.hasFlow(source, sink)
-  }
-}
-
-deprecated private FlowState relevantState(Configuration config) {
-  config.isSource(_, result) or
-  config.isSink(_, result) or
-  config.isBarrier(_, result) or
-  config.isAdditionalFlowStep(_, result, _, _) or
-  config.isAdditionalFlowStep(_, _, _, result)
-}
-
-private newtype TConfigState =
-  deprecated TMkConfigState(Configuration config, FlowState state) {
-    state = relevantState(config) or state instanceof FlowStateEmpty
-  }
-
-deprecated private Configuration getConfig(TConfigState state) { state = TMkConfigState(result, _) }
-
-deprecated private FlowState getState(TConfigState state) { state = TMkConfigState(_, result) }
-
-deprecated private predicate singleConfiguration() { 1 = strictcount(Configuration c) }
-
-deprecated private module Config implements FullStateConfigSig {
-  class FlowState = TConfigState;
-
-  predicate isSource(Node source, FlowState state) {
-    getConfig(state).isSource(source, getState(state))
-    or
-    getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isSink(Node sink) { none() }
-
-  predicate isSink(Node sink, FlowState state) {
-    getConfig(state).isSink(sink, getState(state))
-    or
-    getConfig(state).isSink(sink) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isBarrier(Node node) { none() }
-
-  predicate isBarrier(Node node, FlowState state) {
-    getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node)
-  }
-
-  predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
-
-  predicate isBarrierOut(Node node) { any(Configuration config).isBarrierOut(node) }
-
-  predicate isBarrierIn(Node node, FlowState state) { none() }
-
-  predicate isBarrierOut(Node node, FlowState state) { none() }
-
-  predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
-    singleConfiguration() and
-    any(Configuration config).isAdditionalFlowStep(node1, node2) and
-    model = ""
-  }
-
-  predicate isAdditionalFlowStep(
-    Node node1, FlowState state1, Node node2, FlowState state2, string model
-  ) {
-    getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1) and
-    model = ""
-    or
-    not singleConfiguration() and
-    getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1 and
-    model = ""
-  }
-
-  predicate allowImplicitRead(Node node, ContentSet c) {
-    any(Configuration config).allowImplicitRead(node, c)
-  }
-
-  predicate neverSkip(Node node) { none() }
-
-  int fieldFlowBranchLimit() { result = min(any(Configuration config).fieldFlowBranchLimit()) }
-
-  int accessPathLimit() { result = 5 }
-
-  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
-
-  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
-
-  predicate observeDiffInformedIncrementalMode() { none() }
-}
-
-deprecated private import Impl<Config> as I
-
-/**
- * A `Node` augmented with a call context (except for sinks), an access path, and a configuration.
- * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
- */
-deprecated class PathNode instanceof I::PathNode {
-  /** Gets a textual representation of this element. */
-  final string toString() { result = super.toString() }
-
-  /**
-   * Gets a textual representation of this element, including a textual
-   * representation of the call context.
-   */
-  final string toStringWithContext() { result = super.toStringWithContext() }
-
-  /**
-   * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
-   * For more information, see
-   * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
-   */
-  final predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    super.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-
-  /** Gets the underlying `Node`. */
-  final Node getNode() { result = super.getNode() }
-
-  /** Gets the `FlowState` of this node. */
-  deprecated final FlowState getState() { result = getState(super.getState()) }
-
-  /** Gets the associated configuration. */
-  deprecated final Configuration getConfiguration() { result = getConfig(super.getState()) }
-
-  /** Gets a successor of this node, if any. */
-  final PathNode getASuccessor() { result = super.getASuccessor() }
-
-  /** Holds if this node is a source. */
-  final predicate isSource() { super.isSource() }
-
-  /** Holds if this node is a grouping of source nodes. */
-  final predicate isSourceGroup(string group) { super.isSourceGroup(group) }
-
-  /** Holds if this node is a grouping of sink nodes. */
-  final predicate isSinkGroup(string group) { super.isSinkGroup(group) }
-}
-
-deprecated module PathGraph = I::PathGraph;
-
-deprecated private predicate hasFlow(Node source, Node sink, Configuration config) {
-  exists(PathNode source0, PathNode sink0 |
-    hasFlowPath(source0, sink0, config) and
-    source0.getNode() = source and
-    sink0.getNode() = sink
-  )
-}
-
-deprecated private predicate hasFlowPath(PathNode source, PathNode sink, Configuration config) {
-  I::flowPath(source, sink) and source.getConfiguration() = config
-}
-
-deprecated private predicate hasFlowTo(Node sink, Configuration config) { hasFlow(_, sink, config) }
-
-deprecated predicate flowsTo = hasFlow/3;
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowUtil.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowUtil.qll
index c1fc51bff04..bb71ed25c73 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowUtil.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowUtil.qll
@@ -160,11 +160,8 @@ predicate localMustFlowStep(Node node1, Node node2) {
   or
   node2.asExpr().(AssignExpr).getSource() = node1.asExpr()
   or
-  node1 =
-    unique(FlowSummaryNode n1 |
-      FlowSummaryImpl::Private::Steps::summaryLocalStep(n1.getSummaryNode(),
-        node2.(FlowSummaryNode).getSummaryNode(), true, _)
-    )
+  FlowSummaryImpl::Private::Steps::summaryLocalMustFlowStep(node1.(FlowSummaryNode).getSummaryNode(),
+    node2.(FlowSummaryNode).getSummaryNode())
 }
 
 import Cached
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll b/java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll
index ad770b75a3e..1c7db851a2c 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll
@@ -161,6 +161,7 @@ private module Cached {
    */
   cached
   predicate defaultTaintSanitizer(DataFlow::Node node) {
+    node instanceof DefaultTaintSanitizer or
     // Ignore paths through test code.
     node.getEnclosingCallable().getDeclaringType() instanceof NonSecurityTestClass or
     node.asExpr() instanceof ValidatedVariableAccess
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/tainttracking1/TaintTrackingImpl.qll b/java/ql/lib/semmle/code/java/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
deleted file mode 100644
index 75e7856fd26..00000000000
--- a/java/ql/lib/semmle/code/java/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides an implementation of global (interprocedural) taint tracking.
- * This file re-exports the local (intraprocedural) taint-tracking analysis
- * from `TaintTrackingParameter::Public` and adds a global analysis, mainly
- * exposed through the `Configuration` class. For some languages, this file
- * exists in several identical copies, allowing queries to use multiple
- * `Configuration` classes that depend on each other without introducing
- * mutual recursion among those configurations.
- */
-
-import TaintTrackingParameter::Public
-private import TaintTrackingParameter::Private
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural taint tracking analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the taint tracking library must define its own unique extension of
- * this abstract class.
- *
- * A taint-tracking configuration is a special data flow configuration
- * (`DataFlow::Configuration`) that allows for flow through nodes that do not
- * necessarily preserve values but are still relevant from a taint tracking
- * perspective. (For example, string concatenation, where one of the operands
- * is tainted.)
- *
- * To create a configuration, extend this class with a subclass whose
- * characteristic predicate is a unique singleton string. For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends TaintTracking::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isSanitizer`.
- *   // Optionally override `isSanitizerIn`.
- *   // Optionally override `isSanitizerOut`.
- *   // Optionally override `isSanitizerGuard`.
- *   // Optionally override `isAdditionalTaintStep`.
- * }
- * ```
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but it is unsupported to depend on
- * another `TaintTracking::Configuration` or a `DataFlow::Configuration` in the
- * overridden predicates that define sources, sinks, or additional steps.
- * Instead, the dependency should go to a `TaintTracking2::Configuration` or a
- * `DataFlow2::Configuration`, `DataFlow3::Configuration`, etc.
- */
-abstract deprecated class Configuration extends DataFlow::Configuration {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant taint source.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant taint source with the given initial
-   * `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink accepting `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
-
-  /** Holds if the node `node` is a taint sanitizer. */
-  predicate isSanitizer(DataFlow::Node node) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node) {
-    this.isSanitizer(node) or
-    defaultTaintSanitizer(node)
-  }
-
-  /**
-   * Holds if the node `node` is a taint sanitizer when the flow state is
-   * `state`.
-   */
-  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
-    this.isSanitizer(node, state)
-  }
-
-  /** Holds if taint propagation into `node` is prohibited. */
-  predicate isSanitizerIn(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierIn(DataFlow::Node node) { this.isSanitizerIn(node) }
-
-  /** Holds if taint propagation out of `node` is prohibited. */
-  predicate isSanitizerOut(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   */
-  predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) { none() }
-
-  final override predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
-    this.isAdditionalTaintStep(node1, node2) or
-    defaultAdditionalTaintStep(node1, node2, _)
-  }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalTaintStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    none()
-  }
-
-  final override predicate isAdditionalFlowStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    this.isAdditionalTaintStep(node1, state1, node2, state2)
-  }
-
-  override predicate allowImplicitRead(DataFlow::Node node, DataFlow::ContentSet c) {
-    (
-      this.isSink(node) or
-      this.isSink(node, _) or
-      this.isAdditionalTaintStep(node, _) or
-      this.isAdditionalTaintStep(node, _, _, _)
-    ) and
-    defaultImplicitTaintRead(node, c)
-  }
-
-  /**
-   * Holds if taint may flow from `source` to `sink` for this configuration.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate hasFlow(DataFlow::Node source, DataFlow::Node sink) {
-    super.hasFlow(source, sink)
-  }
-}
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/tainttracking1/TaintTrackingParameter.qll b/java/ql/lib/semmle/code/java/dataflow/internal/tainttracking1/TaintTrackingParameter.qll
deleted file mode 100644
index 2608adffda3..00000000000
--- a/java/ql/lib/semmle/code/java/dataflow/internal/tainttracking1/TaintTrackingParameter.qll
+++ /dev/null
@@ -1,6 +0,0 @@
-import semmle.code.java.dataflow.internal.TaintTrackingUtil as Public
-
-module Private {
-  import semmle.code.java.dataflow.DataFlow::DataFlow as DataFlow
-  import semmle.code.java.dataflow.internal.DataFlowImpl as DataFlowInternal
-}
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/tainttracking2/TaintTrackingImpl.qll b/java/ql/lib/semmle/code/java/dataflow/internal/tainttracking2/TaintTrackingImpl.qll
deleted file mode 100644
index 75e7856fd26..00000000000
--- a/java/ql/lib/semmle/code/java/dataflow/internal/tainttracking2/TaintTrackingImpl.qll
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides an implementation of global (interprocedural) taint tracking.
- * This file re-exports the local (intraprocedural) taint-tracking analysis
- * from `TaintTrackingParameter::Public` and adds a global analysis, mainly
- * exposed through the `Configuration` class. For some languages, this file
- * exists in several identical copies, allowing queries to use multiple
- * `Configuration` classes that depend on each other without introducing
- * mutual recursion among those configurations.
- */
-
-import TaintTrackingParameter::Public
-private import TaintTrackingParameter::Private
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural taint tracking analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the taint tracking library must define its own unique extension of
- * this abstract class.
- *
- * A taint-tracking configuration is a special data flow configuration
- * (`DataFlow::Configuration`) that allows for flow through nodes that do not
- * necessarily preserve values but are still relevant from a taint tracking
- * perspective. (For example, string concatenation, where one of the operands
- * is tainted.)
- *
- * To create a configuration, extend this class with a subclass whose
- * characteristic predicate is a unique singleton string. For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends TaintTracking::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isSanitizer`.
- *   // Optionally override `isSanitizerIn`.
- *   // Optionally override `isSanitizerOut`.
- *   // Optionally override `isSanitizerGuard`.
- *   // Optionally override `isAdditionalTaintStep`.
- * }
- * ```
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but it is unsupported to depend on
- * another `TaintTracking::Configuration` or a `DataFlow::Configuration` in the
- * overridden predicates that define sources, sinks, or additional steps.
- * Instead, the dependency should go to a `TaintTracking2::Configuration` or a
- * `DataFlow2::Configuration`, `DataFlow3::Configuration`, etc.
- */
-abstract deprecated class Configuration extends DataFlow::Configuration {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant taint source.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant taint source with the given initial
-   * `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink accepting `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
-
-  /** Holds if the node `node` is a taint sanitizer. */
-  predicate isSanitizer(DataFlow::Node node) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node) {
-    this.isSanitizer(node) or
-    defaultTaintSanitizer(node)
-  }
-
-  /**
-   * Holds if the node `node` is a taint sanitizer when the flow state is
-   * `state`.
-   */
-  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
-    this.isSanitizer(node, state)
-  }
-
-  /** Holds if taint propagation into `node` is prohibited. */
-  predicate isSanitizerIn(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierIn(DataFlow::Node node) { this.isSanitizerIn(node) }
-
-  /** Holds if taint propagation out of `node` is prohibited. */
-  predicate isSanitizerOut(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   */
-  predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) { none() }
-
-  final override predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
-    this.isAdditionalTaintStep(node1, node2) or
-    defaultAdditionalTaintStep(node1, node2, _)
-  }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalTaintStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    none()
-  }
-
-  final override predicate isAdditionalFlowStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    this.isAdditionalTaintStep(node1, state1, node2, state2)
-  }
-
-  override predicate allowImplicitRead(DataFlow::Node node, DataFlow::ContentSet c) {
-    (
-      this.isSink(node) or
-      this.isSink(node, _) or
-      this.isAdditionalTaintStep(node, _) or
-      this.isAdditionalTaintStep(node, _, _, _)
-    ) and
-    defaultImplicitTaintRead(node, c)
-  }
-
-  /**
-   * Holds if taint may flow from `source` to `sink` for this configuration.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate hasFlow(DataFlow::Node source, DataFlow::Node sink) {
-    super.hasFlow(source, sink)
-  }
-}
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/tainttracking2/TaintTrackingParameter.qll b/java/ql/lib/semmle/code/java/dataflow/internal/tainttracking2/TaintTrackingParameter.qll
deleted file mode 100644
index 5a9c924b6bd..00000000000
--- a/java/ql/lib/semmle/code/java/dataflow/internal/tainttracking2/TaintTrackingParameter.qll
+++ /dev/null
@@ -1,5 +0,0 @@
-import semmle.code.java.dataflow.internal.TaintTrackingUtil as Public
-
-module Private {
-  import semmle.code.java.dataflow.DataFlow2::DataFlow2 as DataFlow
-}
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/tainttracking3/TaintTrackingImpl.qll b/java/ql/lib/semmle/code/java/dataflow/internal/tainttracking3/TaintTrackingImpl.qll
deleted file mode 100644
index 75e7856fd26..00000000000
--- a/java/ql/lib/semmle/code/java/dataflow/internal/tainttracking3/TaintTrackingImpl.qll
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides an implementation of global (interprocedural) taint tracking.
- * This file re-exports the local (intraprocedural) taint-tracking analysis
- * from `TaintTrackingParameter::Public` and adds a global analysis, mainly
- * exposed through the `Configuration` class. For some languages, this file
- * exists in several identical copies, allowing queries to use multiple
- * `Configuration` classes that depend on each other without introducing
- * mutual recursion among those configurations.
- */
-
-import TaintTrackingParameter::Public
-private import TaintTrackingParameter::Private
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural taint tracking analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the taint tracking library must define its own unique extension of
- * this abstract class.
- *
- * A taint-tracking configuration is a special data flow configuration
- * (`DataFlow::Configuration`) that allows for flow through nodes that do not
- * necessarily preserve values but are still relevant from a taint tracking
- * perspective. (For example, string concatenation, where one of the operands
- * is tainted.)
- *
- * To create a configuration, extend this class with a subclass whose
- * characteristic predicate is a unique singleton string. For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends TaintTracking::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isSanitizer`.
- *   // Optionally override `isSanitizerIn`.
- *   // Optionally override `isSanitizerOut`.
- *   // Optionally override `isSanitizerGuard`.
- *   // Optionally override `isAdditionalTaintStep`.
- * }
- * ```
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but it is unsupported to depend on
- * another `TaintTracking::Configuration` or a `DataFlow::Configuration` in the
- * overridden predicates that define sources, sinks, or additional steps.
- * Instead, the dependency should go to a `TaintTracking2::Configuration` or a
- * `DataFlow2::Configuration`, `DataFlow3::Configuration`, etc.
- */
-abstract deprecated class Configuration extends DataFlow::Configuration {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant taint source.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant taint source with the given initial
-   * `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink accepting `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
-
-  /** Holds if the node `node` is a taint sanitizer. */
-  predicate isSanitizer(DataFlow::Node node) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node) {
-    this.isSanitizer(node) or
-    defaultTaintSanitizer(node)
-  }
-
-  /**
-   * Holds if the node `node` is a taint sanitizer when the flow state is
-   * `state`.
-   */
-  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
-    this.isSanitizer(node, state)
-  }
-
-  /** Holds if taint propagation into `node` is prohibited. */
-  predicate isSanitizerIn(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierIn(DataFlow::Node node) { this.isSanitizerIn(node) }
-
-  /** Holds if taint propagation out of `node` is prohibited. */
-  predicate isSanitizerOut(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   */
-  predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) { none() }
-
-  final override predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
-    this.isAdditionalTaintStep(node1, node2) or
-    defaultAdditionalTaintStep(node1, node2, _)
-  }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalTaintStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    none()
-  }
-
-  final override predicate isAdditionalFlowStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    this.isAdditionalTaintStep(node1, state1, node2, state2)
-  }
-
-  override predicate allowImplicitRead(DataFlow::Node node, DataFlow::ContentSet c) {
-    (
-      this.isSink(node) or
-      this.isSink(node, _) or
-      this.isAdditionalTaintStep(node, _) or
-      this.isAdditionalTaintStep(node, _, _, _)
-    ) and
-    defaultImplicitTaintRead(node, c)
-  }
-
-  /**
-   * Holds if taint may flow from `source` to `sink` for this configuration.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate hasFlow(DataFlow::Node source, DataFlow::Node sink) {
-    super.hasFlow(source, sink)
-  }
-}
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/tainttracking3/TaintTrackingParameter.qll b/java/ql/lib/semmle/code/java/dataflow/internal/tainttracking3/TaintTrackingParameter.qll
deleted file mode 100644
index 10fb6b09fa8..00000000000
--- a/java/ql/lib/semmle/code/java/dataflow/internal/tainttracking3/TaintTrackingParameter.qll
+++ /dev/null
@@ -1,5 +0,0 @@
-import semmle.code.java.dataflow.internal.TaintTrackingUtil as Public
-
-module Private {
-  import semmle.code.java.dataflow.DataFlow3::DataFlow3 as DataFlow
-}
diff --git a/java/ql/lib/semmle/code/java/frameworks/JsonIo.qll b/java/ql/lib/semmle/code/java/frameworks/JsonIo.qll
index d40e7ebf81e..85f3a5ef06b 100644
--- a/java/ql/lib/semmle/code/java/frameworks/JsonIo.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/JsonIo.qll
@@ -5,8 +5,6 @@
 import java
 import semmle.code.java.Maps
 import semmle.code.java.dataflow.DataFlow
-deprecated import semmle.code.java.dataflow.DataFlow2
-private import semmle.code.java.dataflow.DataFlow2
 
 /**
  * The class `com.cedarsoftware.util.io.JsonReader`.
diff --git a/java/ql/lib/semmle/code/java/security/AndroidIntentRedirectionQuery.qll b/java/ql/lib/semmle/code/java/security/AndroidIntentRedirectionQuery.qll
index 109300458d2..7625f9d7da4 100644
--- a/java/ql/lib/semmle/code/java/security/AndroidIntentRedirectionQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/AndroidIntentRedirectionQuery.qll
@@ -2,9 +2,7 @@
 
 import java
 import semmle.code.java.dataflow.FlowSources
-deprecated import semmle.code.java.dataflow.DataFlow2
 import semmle.code.java.dataflow.TaintTracking
-deprecated import semmle.code.java.dataflow.TaintTracking3
 import semmle.code.java.security.AndroidIntentRedirection
 
 /** A taint tracking configuration for tainted Intents being used to start Android components. */
diff --git a/java/ql/lib/semmle/code/java/security/CleartextStorageCookieQuery.qll b/java/ql/lib/semmle/code/java/security/CleartextStorageCookieQuery.qll
index a36a4754584..1f262ad57d6 100644
--- a/java/ql/lib/semmle/code/java/security/CleartextStorageCookieQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/CleartextStorageCookieQuery.qll
@@ -2,7 +2,6 @@
 
 import java
 import semmle.code.java.dataflow.DataFlow
-deprecated import semmle.code.java.dataflow.DataFlow3
 import semmle.code.java.security.CleartextStorageQuery
 private import semmle.code.java.dataflow.FlowSinks
 private import semmle.code.java.dataflow.FlowSources
diff --git a/java/ql/lib/semmle/code/java/security/Encryption.qll b/java/ql/lib/semmle/code/java/security/Encryption.qll
index 6fc7f6b7d16..7c9c5ec60db 100644
--- a/java/ql/lib/semmle/code/java/security/Encryption.qll
+++ b/java/ql/lib/semmle/code/java/security/Encryption.qll
@@ -223,10 +223,7 @@ string getAnInsecureHashAlgorithmName() {
 }
 
 private string rankedInsecureAlgorithm(int i) {
-  // In this case we know these are being used for encryption, so we want to match
-  // weak hash algorithms too.
-  result =
-    rank[i](string s | s = getAnInsecureAlgorithmName() or s = getAnInsecureHashAlgorithmName())
+  result = rank[i](string s | s = getAnInsecureAlgorithmName())
 }
 
 private string insecureAlgorithmString(int i) {
@@ -249,8 +246,8 @@ string getInsecureAlgorithmRegex() {
 string getASecureAlgorithmName() {
   result =
     [
-      "RSA", "SHA-?256", "SHA-?512", "CCM", "GCM", "AES(?![^a-zA-Z](ECB|CBC/PKCS[57]Padding))",
-      "Blowfish", "ECIES"
+      "RSA", "SHA-?(256|384|512)", "CCM", "GCM", "AES(?![^a-zA-Z](ECB|CBC/PKCS[57]Padding))",
+      "Blowfish", "ECIES", "SHA3-(256|384|512)"
     ]
 }
 
diff --git a/java/ql/lib/semmle/code/java/security/HardcodedCredentialsSourceCallQuery.qll b/java/ql/lib/semmle/code/java/security/HardcodedCredentialsSourceCallQuery.qll
index 2192c5c70de..06d7869ce99 100644
--- a/java/ql/lib/semmle/code/java/security/HardcodedCredentialsSourceCallQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/HardcodedCredentialsSourceCallQuery.qll
@@ -4,8 +4,6 @@
 
 import java
 import semmle.code.java.dataflow.DataFlow
-deprecated import semmle.code.java.dataflow.DataFlow2
-private import semmle.code.java.dataflow.DataFlow2
 import HardcodedCredentials
 
 /**
diff --git a/java/ql/lib/semmle/code/java/security/ImplicitPendingIntents.qll b/java/ql/lib/semmle/code/java/security/ImplicitPendingIntents.qll
index a5d8f256b03..650527e88e4 100644
--- a/java/ql/lib/semmle/code/java/security/ImplicitPendingIntents.qll
+++ b/java/ql/lib/semmle/code/java/security/ImplicitPendingIntents.qll
@@ -26,24 +26,10 @@ class NoState extends PendingIntentState, TNoState {
 }
 
 /** A source for an implicit `PendingIntent` flow. */
-abstract class ImplicitPendingIntentSource extends ApiSourceNode {
-  /**
-   * DEPRECATED: Open-ended flow state is not intended to be part of the extension points.
-   *
-   * Holds if this source has the specified `state`.
-   */
-  deprecated predicate hasState(DataFlow::FlowState state) { state = "" }
-}
+abstract class ImplicitPendingIntentSource extends ApiSourceNode { }
 
 /** A sink that sends an implicit and mutable `PendingIntent` to a third party. */
-abstract class ImplicitPendingIntentSink extends DataFlow::Node {
-  /**
-   * DEPRECATED: Open-ended flow state is not intended to be part of the extension points.
-   *
-   * Holds if this sink has the specified `state`.
-   */
-  deprecated predicate hasState(DataFlow::FlowState state) { state = "" }
-}
+abstract class ImplicitPendingIntentSink extends DataFlow::Node { }
 
 /**
  * A unit class for adding additional taint steps.
@@ -62,21 +48,6 @@ class ImplicitPendingIntentAdditionalTaintStep extends Unit {
    * Holds if the step from `node1` to `node2` creates a mutable `PendingIntent`.
    */
   predicate mutablePendingIntentCreation(DataFlow::Node node1, DataFlow::Node node2) { none() }
-
-  /**
-   * DEPRECATED: Open-ended flow state is not intended to be part of the extension points.
-   * Use `mutablePendingIntentCreation` instead.
-   *
-   * Holds if the step from `node1` to `node2` should be considered a taint
-   * step for flows related to the use of implicit `PendingIntent`s. This step is only applicable
-   * in `state1` and updates the flow state to `state2`.
-   */
-  deprecated predicate step(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    none()
-  }
 }
 
 private class IntentCreationSource extends ImplicitPendingIntentSource {
diff --git a/java/ql/lib/semmle/code/java/security/ListOfConstantsSanitizer.qll b/java/ql/lib/semmle/code/java/security/ListOfConstantsSanitizer.qll
new file mode 100644
index 00000000000..cc57fbce648
--- /dev/null
+++ b/java/ql/lib/semmle/code/java/security/ListOfConstantsSanitizer.qll
@@ -0,0 +1,263 @@
+/**
+ * Provides a default taint sanitizer identifying comparisons against lists of
+ * compile-time constants.
+ */
+
+import java
+private import codeql.typeflow.UniversalFlow as UniversalFlow
+private import semmle.code.java.Collections
+private import semmle.code.java.controlflow.Guards
+private import semmle.code.java.dataflow.internal.BaseSSA
+private import semmle.code.java.dataflow.TaintTracking
+private import semmle.code.java.dataflow.TypeFlow
+private import semmle.code.java.dispatch.VirtualDispatch
+
+private class FlowNode = FlowStepsInput::FlowNode;
+
+/**
+ * Holds if `n2` is an unmodifiable collection constructed from input `n1`,
+ * which is either another collection or a number of elements.
+ */
+private predicate unmodifiableCollectionStep(FlowNode n1, FlowNode n2) {
+  exists(Call c, Callable tgt |
+    n2.asExpr() = c and
+    n1.asExpr() = c.getAnArgument() and
+    c.getCallee().getSourceDeclaration() = tgt
+  |
+    tgt.hasQualifiedName("java.util", "Collections",
+      ["unmodifiableCollection", "unmodifiableList", "unmodifiableSet"])
+    or
+    tgt.hasQualifiedName("java.util", ["List", "Set"], ["copyOf", "of"])
+    or
+    tgt.hasQualifiedName("com.google.common.collect", ["ImmutableList", "ImmutableSet"],
+      ["copyOf", "of"])
+  )
+}
+
+/**
+ * Holds if `n2` is a collection or array constructed from input `n1`, which is
+ * either a collection, an array, or a number of elements.
+ */
+private predicate collectionStep(FlowNode n1, FlowNode n2) {
+  n2.asExpr().(ArrayInit).getAnInit() = n1.asExpr()
+  or
+  n2.asExpr().(ArrayCreationExpr).getInit() = n1.asExpr()
+  or
+  unmodifiableCollectionStep(n1, n2)
+  or
+  exists(Call c, Callable tgt |
+    n2.asExpr() = c and
+    n1.asExpr() = c.getAnArgument() and
+    c.getCallee().getSourceDeclaration() = tgt
+  |
+    tgt.hasQualifiedName("java.util", "Arrays", "asList")
+    or
+    tgt.isStatic() and
+    tgt.hasName(["copyOf", "of"]) and
+    tgt.getDeclaringType().getASourceSupertype+().hasQualifiedName("java.util", "Collection")
+    or
+    tgt instanceof Constructor and
+    tgt.getNumberOfParameters() = 1 and
+    tgt.getParameterType(0) instanceof CollectionType and
+    tgt.getDeclaringType() instanceof CollectionType
+  )
+}
+
+private module BaseUniversalFlow = UniversalFlow::Make<Location, FlowStepsInput>;
+
+private module UnmodifiableProp implements BaseUniversalFlow::NullaryPropertySig {
+  predicate hasPropertyBase(FlowNode n) { unmodifiableCollectionStep(_, n) }
+}
+
+/** Holds if the given node is an unmodifiable collection. */
+private predicate unmodifiableCollection =
+  BaseUniversalFlow::FlowNullary<UnmodifiableProp>::hasProperty/1;
+
+/**
+ * Holds if `v` is a collection or array with an access, `coll`, at which the
+ * element `e` gets added.
+ */
+private predicate collectionAddition(Variable v, VarAccess coll, Expr e) {
+  exists(MethodCall mc, Method m, int arg |
+    mc.getMethod().getSourceDeclaration().overridesOrInstantiates*(m) and
+    mc.getQualifier() = coll and
+    v.getAnAccess() = coll and
+    mc.getArgument(arg) = e
+  |
+    m.hasQualifiedName("java.util", "Collection", ["add", "addAll"]) and
+    m.getNumberOfParameters() = 1 and
+    arg = 0
+    or
+    m.hasQualifiedName("java.util", "List", ["add", "addAll"]) and
+    m.getNumberOfParameters() = 2 and
+    arg = 1
+    or
+    m.hasQualifiedName("java.util", "SequencedCollection", ["addFirst", "addLast"]) and
+    m.getNumberOfParameters() = 1 and
+    arg = 0
+  )
+  or
+  v.getAnAccess() = coll and
+  exists(Assignment assign | assign.getSource() = e |
+    coll = assign.getDest().(ArrayAccess).getArray()
+  )
+}
+
+/**
+ * Holds if `n` represents a definition of `v` and `v` is a collection or
+ * array that has additions occurring as side-effects after its definition.
+ */
+private predicate nodeWithAddition(FlowNode n, Variable v) {
+  collectionAddition(v, _, _) and
+  (
+    n.asField() = v
+    or
+    n.asSsa().getSourceVariable().getVariable() = v and
+    (n.asSsa() instanceof BaseSsaUpdate or n.asSsa().(BaseSsaImplicitInit).isParameterDefinition(_))
+  )
+}
+
+/** Holds if `c` does not add elements to the given collection. */
+private predicate safeCallable(Callable c) {
+  c instanceof CollectionQueryMethod
+  or
+  c instanceof CollectionMethod and
+  c.hasName(["clear", "remove", "removeAll", "stream", "iterator", "toArray"])
+  or
+  c.hasQualifiedName("org.apache.commons.lang3", "StringUtils", "join")
+}
+
+/**
+ * Holds if `n` might be mutated in ways that adds elements that are not
+ * tracked by the `collectionAddition` predicate.
+ */
+private predicate collectionWithPossibleMutation(FlowNode n) {
+  not unmodifiableCollection(n) and
+  (
+    exists(Expr e |
+      n.asExpr() = e and
+      (e.getType() instanceof CollectionType or e.getType() instanceof Array) and
+      not collectionAddition(_, e, _) and
+      not collectionStep(n, _)
+    |
+      exists(ArrayAccess aa | e = aa.getArray())
+      or
+      exists(Call c, Callable tgt | c.getAnArgument() = e or c.getQualifier() = e |
+        tgt = c.getCallee().getSourceDeclaration() and
+        not safeCallable(tgt)
+      )
+    )
+    or
+    exists(FlowNode mid |
+      FlowStepsInput::step(n, mid) and
+      collectionWithPossibleMutation(mid)
+    )
+  )
+}
+
+/**
+ * A collection constructor that constructs an empty mutable collection.
+ */
+private class EmptyCollectionConstructor extends Constructor {
+  EmptyCollectionConstructor() {
+    this.getDeclaringType() instanceof CollectionType and
+    forall(Type t | t = this.getAParamType() | t instanceof PrimitiveType)
+  }
+}
+
+private module CollectionFlowStepsInput implements UniversalFlow::UniversalFlowInput<Location> {
+  import FlowStepsInput
+
+  /**
+   * Holds if `n2` is a collection/array/constant whose value(s) are
+   * determined completely from the range of `n1` nodes.
+   */
+  predicate step(FlowNode n1, FlowNode n2) {
+    // Exclude the regular input constraints for those nodes that are covered
+    // completely by `collectionStep`.
+    FlowStepsInput::step(n1, n2) and
+    not collectionStep(_, n2)
+    or
+    // For collections with side-effects in the form of additions, we add the
+    // sources of those additions as additional input that need to originate
+    // from constants.
+    exists(Variable v |
+      nodeWithAddition(n2, v) and
+      collectionAddition(v, _, n1.asExpr())
+    )
+    or
+    // Include various forms of collection transformation.
+    collectionStep(n1, n2)
+  }
+
+  predicate isExcludedFromNullAnalysis = FlowStepsInput::isExcludedFromNullAnalysis/1;
+}
+
+private module CollectionUniversalFlow = UniversalFlow::Make<Location, CollectionFlowStepsInput>;
+
+private module ConstantCollectionProp implements CollectionUniversalFlow::NullaryPropertySig {
+  /**
+   * Holds if `n` forms the base case for finding collections of constants.
+   * These are individual constants and empty collections.
+   */
+  predicate hasPropertyBase(FlowNode n) {
+    n.asExpr().isCompileTimeConstant() or
+    n.asExpr().(ConstructorCall).getConstructor() instanceof EmptyCollectionConstructor
+  }
+
+  predicate barrier = collectionWithPossibleMutation/1;
+}
+
+/**
+ * Holds if the given node is either a constant or a collection/array of
+ * constants.
+ */
+private predicate constantCollection =
+  CollectionUniversalFlow::FlowNullary<ConstantCollectionProp>::hasProperty/1;
+
+/** Gets the result of a case normalization call of `arg`. */
+private MethodCall normalizeCaseCall(Expr arg) {
+  exists(Method changecase | result.getMethod() = changecase |
+    changecase.hasName(["toUpperCase", "toLowerCase"]) and
+    changecase.getDeclaringType() instanceof TypeString and
+    arg = result.getQualifier()
+    or
+    changecase
+        .hasQualifiedName(["org.apache.commons.lang", "org.apache.commons.lang3"], "StringUtils",
+          ["lowerCase", "upperCase"]) and
+    arg = result.getArgument(0)
+    or
+    changecase
+        .hasQualifiedName("org.apache.hadoop.util", "StringUtils", ["toLowerCase", "toUpperCase"]) and
+    arg = result.getArgument(0)
+  )
+}
+
+/**
+ * Holds if the guard `g` ensures that the expression `e` is one of a set of
+ * known constants upon evaluating to `branch`.
+ */
+private predicate constantCollectionContainsCheck(Guard g, Expr e, boolean branch) {
+  exists(MethodCall mc, Method m, FlowNode n, Expr checked |
+    g = mc and
+    mc.getMethod().getSourceDeclaration().overridesOrInstantiates*(m) and
+    m.hasQualifiedName("java.util", "Collection", "contains") and
+    n.asExpr() = mc.getQualifier() and
+    constantCollection(n) and
+    checked = mc.getAnArgument() and
+    branch = true
+  |
+    checked = e or
+    checked = normalizeCaseCall(e)
+  )
+}
+
+/**
+ * A comparison against a list of compile-time constants, sanitizing taint by
+ * restricting to a set of known values.
+ */
+private class ListOfConstantsComparisonSanitizerGuard extends TaintTracking::DefaultTaintSanitizer {
+  ListOfConstantsComparisonSanitizerGuard() {
+    this = DataFlow::BarrierGuard<constantCollectionContainsCheck/3>::getABarrierNode()
+  }
+}
diff --git a/java/ql/lib/semmle/code/java/security/MaybeBrokenCryptoAlgorithmQuery.qll b/java/ql/lib/semmle/code/java/security/MaybeBrokenCryptoAlgorithmQuery.qll
index 1533b61dd5e..060a30f87e6 100644
--- a/java/ql/lib/semmle/code/java/security/MaybeBrokenCryptoAlgorithmQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/MaybeBrokenCryptoAlgorithmQuery.qll
@@ -30,7 +30,11 @@ class InsecureAlgoLiteral extends InsecureAlgorithm, ShortStringLiteral {
       s.length() > 1 and
       not s.regexpMatch(getSecureAlgorithmRegex()) and
       // Exclude results covered by another query.
-      not s.regexpMatch(getInsecureAlgorithmRegex())
+      not s.regexpMatch(getInsecureAlgorithmRegex()) and
+      // Exclude results covered by `InsecureAlgoProperty`.
+      // This removes duplicates when a string literal is a default value for the property,
+      // such as "MD5" in the following: `props.getProperty("hashAlg2", "MD5")`.
+      not exists(InsecureAlgoProperty insecAlgoProp | this = insecAlgoProp.getAnArgument())
     )
   }
 
diff --git a/java/ql/lib/semmle/code/java/security/TemplateInjection.qll b/java/ql/lib/semmle/code/java/security/TemplateInjection.qll
index a74f4db8030..0b703780a03 100644
--- a/java/ql/lib/semmle/code/java/security/TemplateInjection.qll
+++ b/java/ql/lib/semmle/code/java/security/TemplateInjection.qll
@@ -9,30 +9,12 @@ private import semmle.code.java.security.Sanitizers
 /**
  * A source for server-side template injection (SST) vulnerabilities.
  */
-abstract class TemplateInjectionSource extends DataFlow::Node {
-  /**
-   * DEPRECATED: Open-ended flow state is not intended to be part of the extension points.
-   *
-   * Holds if this source has the specified `state`.
-   */
-  deprecated predicate hasState(DataFlow::FlowState state) {
-    state instanceof DataFlow::FlowStateEmpty
-  }
-}
+abstract class TemplateInjectionSource extends DataFlow::Node { }
 
 /**
  * A sink for server-side template injection (SST) vulnerabilities.
  */
-abstract class TemplateInjectionSink extends DataFlow::Node {
-  /**
-   * DEPRECATED: Open-ended flow state is not intended to be part of the extension points.
-   *
-   * Holds if this sink has the specified `state`.
-   */
-  deprecated predicate hasState(DataFlow::FlowState state) {
-    state instanceof DataFlow::FlowStateEmpty
-  }
-}
+abstract class TemplateInjectionSink extends DataFlow::Node { }
 
 /**
  * A unit class for adding additional taint steps.
@@ -46,20 +28,6 @@ class TemplateInjectionAdditionalTaintStep extends Unit {
    * step for flows related to server-side template injection (SST) vulnerabilities.
    */
   predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) { none() }
-
-  /**
-   * DEPRECATED: Open-ended flow state is not intended to be part of the extension points.
-   *
-   * Holds if the step from `node1` to `node2` should be considered a taint
-   * step for flows related toserver-side template injection (SST) vulnerabilities.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  deprecated predicate isAdditionalTaintStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    none()
-  }
 }
 
 /**
@@ -67,22 +35,6 @@ class TemplateInjectionAdditionalTaintStep extends Unit {
  */
 abstract class TemplateInjectionSanitizer extends DataFlow::Node { }
 
-/**
- * DEPRECATED: Open-ended flow state is not intended to be part of the extension points.
- *
- * A sanitizer for server-side template injection (SST) vulnerabilities.
- * This sanitizer is only applicable when `TemplateInjectionSanitizerWithState::hasState`
- * holds for the flow state.
- */
-abstract deprecated class TemplateInjectionSanitizerWithState extends DataFlow::Node {
-  /**
-   * DEPRECATED: Open-ended flow state is not intended to be part of the extension points.
-   *
-   * Holds if this sanitizer has the specified `state`.
-   */
-  abstract deprecated predicate hasState(DataFlow::FlowState state);
-}
-
 private class DefaultTemplateInjectionSource extends TemplateInjectionSource instanceof ActiveThreatModelSource
 { }
 
diff --git a/java/ql/lib/semmle/code/java/security/UnsafeDeserializationQuery.qll b/java/ql/lib/semmle/code/java/security/UnsafeDeserializationQuery.qll
index 9a627d54c5a..cb76ee37c7b 100644
--- a/java/ql/lib/semmle/code/java/security/UnsafeDeserializationQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/UnsafeDeserializationQuery.qll
@@ -4,7 +4,6 @@
 
 import semmle.code.java.dataflow.FlowSources
 private import semmle.code.java.dataflow.FlowSinks
-private import semmle.code.java.dataflow.TaintTracking2
 private import semmle.code.java.dispatch.VirtualDispatch
 private import semmle.code.java.frameworks.Kryo
 private import semmle.code.java.frameworks.XStream
diff --git a/java/ql/lib/semmle/code/java/security/XmlParsers.qll b/java/ql/lib/semmle/code/java/security/XmlParsers.qll
index 4a5b7121e60..fc0b52b6f78 100644
--- a/java/ql/lib/semmle/code/java/security/XmlParsers.qll
+++ b/java/ql/lib/semmle/code/java/security/XmlParsers.qll
@@ -2,8 +2,6 @@
 
 import java
 import semmle.code.java.dataflow.DataFlow
-deprecated import semmle.code.java.dataflow.DataFlow3
-private import semmle.code.java.dataflow.DataFlow3
 private import semmle.code.java.dataflow.RangeUtils
 
 private module Frameworks {
diff --git a/java/ql/src/change-notes/2024-10-29-weak-crypto-hash.md b/java/ql/src/change-notes/2024-10-29-weak-crypto-hash.md
new file mode 100644
index 00000000000..b4ac88bcdc6
--- /dev/null
+++ b/java/ql/src/change-notes/2024-10-29-weak-crypto-hash.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The `java/weak-cryptographic-algorithm` query has been updated to no longer report uses of hash functions such as `MD5` and `SHA1` even if they are known to be weak. These hash algorithms are used very often in non-sensitive contexts, making the query too imprecise in practice. The `java/potentially-weak-cryptographic-algorithm` query has been updated to report these uses instead.
diff --git a/java/ql/src/change-notes/2024-11-22-sha3.md b/java/ql/src/change-notes/2024-11-22-sha3.md
new file mode 100644
index 00000000000..61dbc35162e
--- /dev/null
+++ b/java/ql/src/change-notes/2024-11-22-sha3.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Added SHA3 to the list of secure hashing algorithms. As a result the `java/potentially-weak-cryptographic-algorithm` query should no longer flag up uses of SHA3.
diff --git a/java/ql/src/change-notes/2024-11-24-sha2.md b/java/ql/src/change-notes/2024-11-24-sha2.md
new file mode 100644
index 00000000000..395ea04b782
--- /dev/null
+++ b/java/ql/src/change-notes/2024-11-24-sha2.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Added SHA-384 to the list of secure hashing algorithms. As a result the `java/potentially-weak-cryptographic-algorithm` query should no longer flag up uses of SHA-384.
diff --git a/java/ql/src/experimental/Security/CWE/CWE-208/NonConstantTimeCheckOnSignatureQuery.qll b/java/ql/src/experimental/Security/CWE/CWE-208/NonConstantTimeCheckOnSignatureQuery.qll
index 8e545a5e8f0..5972db67495 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-208/NonConstantTimeCheckOnSignatureQuery.qll
+++ b/java/ql/src/experimental/Security/CWE/CWE-208/NonConstantTimeCheckOnSignatureQuery.qll
@@ -95,7 +95,7 @@ private class ProduceCiphertextCall extends ProduceCryptoCall {
 }
 
 /** Holds if `fromNode` to `toNode` is a dataflow step that updates a cryptographic operation. */
-private predicate updateCryptoOperationStep(DataFlow2::Node fromNode, DataFlow2::Node toNode) {
+private predicate updateCryptoOperationStep(DataFlow::Node fromNode, DataFlow::Node toNode) {
   exists(MethodCall call, Method m |
     m = call.getMethod() and
     call.getQualifier() = toNode.asExpr() and
@@ -111,7 +111,7 @@ private predicate updateCryptoOperationStep(DataFlow2::Node fromNode, DataFlow2:
 }
 
 /** Holds if `fromNode` to `toNode` is a dataflow step that creates a hash. */
-private predicate createMessageDigestStep(DataFlow2::Node fromNode, DataFlow2::Node toNode) {
+private predicate createMessageDigestStep(DataFlow::Node fromNode, DataFlow::Node toNode) {
   exists(MethodCall ma, Method m | m = ma.getMethod() |
     m.getDeclaringType().hasQualifiedName("java.security", "MessageDigest") and
     m.hasStringSignature("digest()") and
@@ -135,7 +135,7 @@ private predicate createMessageDigestStep(DataFlow2::Node fromNode, DataFlow2::N
 }
 
 /** Holds if `fromNode` to `toNode` is a dataflow step that updates a hash. */
-private predicate updateMessageDigestStep(DataFlow2::Node fromNode, DataFlow2::Node toNode) {
+private predicate updateMessageDigestStep(DataFlow::Node fromNode, DataFlow::Node toNode) {
   exists(MethodCall ma, Method m | m = ma.getMethod() |
     m.hasQualifiedName("java.security", "MessageDigest", "update") and
     ma.getArgument(0) = fromNode.asExpr() and
@@ -154,7 +154,7 @@ private module UserInputInCryptoOperationConfig implements DataFlow::ConfigSig {
     exists(ProduceCryptoCall call | call.getQualifier() = sink.asExpr())
   }
 
-  predicate isAdditionalFlowStep(DataFlow2::Node fromNode, DataFlow2::Node toNode) {
+  predicate isAdditionalFlowStep(DataFlow::Node fromNode, DataFlow::Node toNode) {
     updateCryptoOperationStep(fromNode, toNode)
     or
     createMessageDigestStep(fromNode, toNode)
diff --git a/java/ql/src/experimental/Security/CWE/CWE-625/PermissiveDotRegexQuery.qll b/java/ql/src/experimental/Security/CWE/CWE-625/PermissiveDotRegexQuery.qll
index 925fd5632a3..5f015732cb3 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-625/PermissiveDotRegexQuery.qll
+++ b/java/ql/src/experimental/Security/CWE/CWE-625/PermissiveDotRegexQuery.qll
@@ -94,11 +94,11 @@ private class CompileRegexSink extends DataFlow::ExprNode {
  * A data flow configuration for regular expressions that include permissive dots.
  */
 private module PermissiveDotRegexConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow2::Node src) { src.asExpr() instanceof PermissiveDotStr }
+  predicate isSource(DataFlow::Node src) { src.asExpr() instanceof PermissiveDotStr }
 
-  predicate isSink(DataFlow2::Node sink) { sink instanceof CompileRegexSink }
+  predicate isSink(DataFlow::Node sink) { sink instanceof CompileRegexSink }
 
-  predicate isBarrier(DataFlow2::Node node) {
+  predicate isBarrier(DataFlow::Node node) {
     exists(
       MethodCall ma, Field f // Pattern.compile(PATTERN, Pattern.DOTALL)
     |
diff --git a/java/ql/src/experimental/semmle/code/java/security/SpringUrlRedirect.qll b/java/ql/src/experimental/semmle/code/java/security/SpringUrlRedirect.qll
index d437c8fa3cc..c068dfbb7e3 100644
--- a/java/ql/src/experimental/semmle/code/java/security/SpringUrlRedirect.qll
+++ b/java/ql/src/experimental/semmle/code/java/security/SpringUrlRedirect.qll
@@ -53,7 +53,7 @@ private class SpringViewUrlRedirectSink extends SpringUrlRedirectSink {
     )
     or
     exists(MethodCall ma, RedirectAppendCall rac |
-      DataFlow2::localExprFlow(rac.getQualifier(), ma.getQualifier()) and
+      DataFlow::localExprFlow(rac.getQualifier(), ma.getQualifier()) and
       ma.getMethod().hasName("append") and
       ma.getArgument(0) = this.asExpr() and
       any(SpringRequestMappingMethod sqmm).polyCalls*(this.getEnclosingCallable())
diff --git a/java/ql/test/library-tests/dataflow/callback-dispatch/test.expected b/java/ql/test/library-tests/dataflow/callback-dispatch/test.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/library-tests/dataflow/callback-dispatch/test.expected
+++ b/java/ql/test/library-tests/dataflow/callback-dispatch/test.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/library-tests/dataflow/entrypoint-types/EntryPointTypesTest.expected b/java/ql/test/library-tests/dataflow/entrypoint-types/EntryPointTypesTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/library-tests/dataflow/entrypoint-types/EntryPointTypesTest.expected
+++ b/java/ql/test/library-tests/dataflow/entrypoint-types/EntryPointTypesTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/library-tests/dataflow/flowfeature/flow.expected b/java/ql/test/library-tests/dataflow/flowfeature/flow.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/java/ql/test/library-tests/dataflow/flowfeature/flow.expected
+++ b/java/ql/test/library-tests/dataflow/flowfeature/flow.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/java/ql/test/library-tests/dataflow/getter/getter.expected b/java/ql/test/library-tests/dataflow/getter/getter.expected
index b5af3f91a59..9a36107f198 100644
--- a/java/ql/test/library-tests/dataflow/getter/getter.expected
+++ b/java/ql/test/library-tests/dataflow/getter/getter.expected
@@ -1,6 +1,5 @@
 | A.java:5:12:5:15 | this | A.java:5:12:5:19 | this.foo | A.java:2:7:2:9 | foo |
 | A.java:21:13:21:13 | a | A.java:21:13:21:22 | getFoo(...) | A.java:2:7:2:9 | foo |
 | A.java:23:9:23:9 | a | A.java:23:9:23:19 | aGetter(...) | A.java:2:7:2:9 | foo |
-| A.java:24:9:24:10 | a2 | A.java:24:9:24:23 | notAGetter(...) | A.java:2:7:2:9 | foo |
 | A.java:45:12:45:38 | maybeIdWrap(...) | A.java:45:12:45:42 | maybeIdWrap(...).foo | A.java:2:7:2:9 | foo |
 | A.java:49:12:49:38 | maybeIdWrap(...) | A.java:49:12:49:42 | maybeIdWrap(...).foo | A.java:2:7:2:9 | foo |
diff --git a/java/ql/test/library-tests/dataflow/range-analysis-inline/B.java b/java/ql/test/library-tests/dataflow/range-analysis-inline/B.java
new file mode 100644
index 00000000000..01c8656deea
--- /dev/null
+++ b/java/ql/test/library-tests/dataflow/range-analysis-inline/B.java
@@ -0,0 +1,158 @@
+public class B {
+
+    // Use this method to mark non-integer bounds
+    // that should also be annotated.
+    static void bound(int b) { }
+
+    public int forLoop() {
+        int result = 0;
+        for (int i = 0;
+            i < 10; // $ bound="i in [0..10]"
+            i++) { // $ bound="i in [0..9]"
+            result = i; // $ bound="i in [0..9]"
+        }
+        return result; // $ bound="result in [0..9]"
+    }
+
+    public int forLoopExit() {
+        int result = 0;
+        for (; result < 10;) { // $ bound="result in [0..10]"
+            result += 1; // $ bound="result in [0..9]"
+        }
+        return result; // $ bound="result = 10"
+    }
+
+    public int forLoopExitStep() {
+        int result = 0;
+        for (; result < 10;) { // $ bound="result in [0..12]"
+            result += 3; // $ bound="result in [0..9]"
+        }
+        return result; // $ bound="result = 12"
+    }
+
+    public int forLoopExitUpd() {
+        int result = 0;
+        for (; result < 10; // $ bound="result in [0..10]"
+            result++) { // $ bound="result in [0..9]"
+        }
+        return result; // $ bound="result = 10"
+    }
+
+    public int forLoopExitNested() {
+        int result = 0;
+        for (; result < 10;) {
+            int i = 0;
+            for (; i < 3;) { // $ bound="i in [0..3]"
+                i += 1; // $ bound="i in [0..2]"
+            }
+            result += i; // $ bound="result in [0..9]" bound="i = 3"
+        }
+        return result; // $ MISSING:bound="result = 12"
+    }
+
+    public int emptyForLoop() {
+        int result = 0;
+        for (int i = 0; i < 0; // $ bound="i = 0"
+            i++) { // $ bound="i in [0..-1]"
+            result = i; // $ bound="i in [0..-1]"
+        }
+        return result; // $ bound="result = 0"
+    }
+
+    public int noLoop() {
+        int result = 0;
+        result += 1; // $ bound="result = 0"
+        return result; // $ bound="result = 1"
+    }
+
+    public int foreachLoop() {
+        int result = 0;
+        for (int i : new int[] {1, 2, 3, 4, 5}) {
+            result = i;
+        }
+        return result;
+    }
+
+    public int emptyForeachLoop() {
+        int result = 0;
+        for (int i : new int[] {}) {
+            result = i;
+        }
+        return result;
+    }
+
+    public int whileLoop() {
+        int result = 100;
+        while (result > 5) { // $ bound="result in [4..100]"
+            result = result - 2; // $ bound="result in [6..100]"
+        }
+        return result; // $ bound="result = 4"
+    }
+
+    public int oddWhileLoop() {
+        int result = 101;
+        while (result > 5) { // $ bound="result in [5..101]"
+            result = result - 2; // $ bound="result in [7..101]"
+        }
+        return result; // $ bound="result = 5"
+    }
+
+    static void arrayLength(int[] arr) {
+        bound(arr.length);
+        for (int i = 0;
+            i < arr.length;
+            i++) { // $ bound="i <= arr.length - 1"
+            arr[i]++; // $ bound="i <= arr.length - 1"
+        }
+    }
+
+    static int varBound(int b) {
+        bound(b);
+        int result = 0;
+        for (int i = 0;
+            i < b;
+            i++) { // $ bound="i <= b - 1"
+            result = i; // $ bound="i <= b - 1"
+        }
+        return result; // We cannot conclude anything here, since we do not know that b > 0
+    }
+
+    static int varBoundPositiveGuard(int b) {
+        bound(b);
+        if (b > 0) {
+            int result = 0;
+            for (int i = 0;
+                i < b;
+                i++) { // $ bound="i <= b - 1"
+                result = i; // $ bound="i <= b - 1"
+            }
+            return result; // $ MISSING: bound="result <= b - 1"
+        } else {
+            return 0;
+        }
+    }
+
+    static int varBoundPositiveGuardEarlyReturn(int b) {
+        bound(b);
+        if (b <= 0) return 0;
+        int result = 0;
+        for (int i = 0;
+            i < b;
+            i++) { // $ bound="i <= b - 1"
+            result = i; // $ bound="i <= b - 1"
+        }
+        return result; // $ MISSING: bound="result <= b - 1"
+    }
+
+    static int varBoundPositiveAssert(int b) {
+        bound(b);
+        assert b > 0;
+        int result = 0;
+        for (int i = 0;
+            i < b;
+            i++) { // $ bound="i <= b - 1"
+            result = i; // $ bound="i <= b - 1"
+        }
+        return result; // $ MISSING: bound="result <= b - 1"
+    }
+}
\ No newline at end of file
diff --git a/rust/ql/test/extractor-tests/generated/ArrayExpr/ArrayExpr_getAttr.expected b/java/ql/test/library-tests/dataflow/range-analysis-inline/range.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/ArrayExpr/ArrayExpr_getAttr.expected
rename to java/ql/test/library-tests/dataflow/range-analysis-inline/range.expected
diff --git a/java/ql/test/library-tests/dataflow/range-analysis-inline/range.ql b/java/ql/test/library-tests/dataflow/range-analysis-inline/range.ql
new file mode 100644
index 00000000000..b0fcc1710d4
--- /dev/null
+++ b/java/ql/test/library-tests/dataflow/range-analysis-inline/range.ql
@@ -0,0 +1,71 @@
+/**
+ * Inline range analysis tests for Java.
+ * See `shared/util/codeql/dataflow/test/InlineFlowTest.qll`
+ */
+
+import java
+import semmle.code.java.dataflow.RangeAnalysis
+private import TestUtilities.InlineExpectationsTest as IET
+
+module RangeTest implements IET::TestSig {
+  string getARelevantTag() { result = "bound" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    tag = "bound" and
+    (
+      // simple integer bounds (`ZeroBound`s)
+      exists(Expr e, int lower, int upper |
+        constrained(e, lower, upper) and
+        e instanceof VarRead and
+        e.getCompilationUnit().fromSource()
+      |
+        location = e.getLocation() and
+        element = e.toString() and
+        if lower = upper
+        then value = "\"" + e.toString() + " = " + lower.toString() + "\""
+        else
+          value = "\"" + e.toString() + " in [" + lower.toString() + ".." + upper.toString() + "]\""
+      )
+      or
+      // advanced bounds
+      exists(Expr e, int delta, string deltaStr, boolean upper, string cmp, Expr boundExpr |
+        annotatedBound(e, _, boundExpr, delta, upper) and
+        e instanceof VarRead and
+        e.getCompilationUnit().fromSource() and
+        (
+          if delta = 0
+          then deltaStr = ""
+          else
+            if delta > 0
+            then deltaStr = " + " + delta.toString()
+            else deltaStr = " - " + delta.abs().toString()
+        ) and
+        if upper = true then cmp = "<=" else cmp = ">="
+      |
+        location = e.getLocation() and
+        element = e.toString() and
+        value = "\"" + e.toString() + " " + cmp + " " + boundExpr.toString() + deltaStr + "\""
+      )
+    )
+  }
+
+  private predicate constrained(Expr e, int lower, int upper) {
+    bounded(e, any(ZeroBound z), lower, false, _) and
+    bounded(e, any(ZeroBound z), upper, true, _)
+  }
+
+  private predicate annotatedBound(Expr e, Bound b, Expr boundExpr, int delta, boolean upper) {
+    bounded(e, b, delta, upper, _) and
+    // the expression for the bound is explicitly requested as being annotated
+    // via a call such as
+    // ```java
+    //  bound(expr);
+    // ```
+    boundExpr = b.getExpr() and
+    exists(Call c | c.getCallee().getName() = "bound" and c.getArgument(0) = boundExpr) and
+    // non-trivial bound
+    not e = b.getExpr()
+  }
+}
+
+import IET::MakeTest<RangeTest>
diff --git a/java/ql/test/library-tests/dataflow/state/test.expected b/java/ql/test/library-tests/dataflow/state/test.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/library-tests/dataflow/state/test.expected
+++ b/java/ql/test/library-tests/dataflow/state/test.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/library-tests/dataflow/taintsources/local.expected b/java/ql/test/library-tests/dataflow/taintsources/local.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/library-tests/dataflow/taintsources/local.expected
+++ b/java/ql/test/library-tests/dataflow/taintsources/local.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/library-tests/dataflow/taintsources/remote.expected b/java/ql/test/library-tests/dataflow/taintsources/remote.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/library-tests/dataflow/taintsources/remote.expected
+++ b/java/ql/test/library-tests/dataflow/taintsources/remote.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/library-tests/dataflow/taintsources/reversedns.expected b/java/ql/test/library-tests/dataflow/taintsources/reversedns.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/library-tests/dataflow/taintsources/reversedns.expected
+++ b/java/ql/test/library-tests/dataflow/taintsources/reversedns.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/library-tests/frameworks/JaxWs/JaxRs.expected b/java/ql/test/library-tests/frameworks/JaxWs/JaxRs.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/library-tests/frameworks/JaxWs/JaxRs.expected
+++ b/java/ql/test/library-tests/frameworks/JaxWs/JaxRs.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/library-tests/frameworks/JaxWs/JaxWsEndpoint.expected b/java/ql/test/library-tests/frameworks/JaxWs/JaxWsEndpoint.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/library-tests/frameworks/JaxWs/JaxWsEndpoint.expected
+++ b/java/ql/test/library-tests/frameworks/JaxWs/JaxWsEndpoint.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/library-tests/frameworks/android/taint-database/flowSteps.expected b/java/ql/test/library-tests/frameworks/android/taint-database/flowSteps.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/library-tests/frameworks/android/taint-database/flowSteps.expected
+++ b/java/ql/test/library-tests/frameworks/android/taint-database/flowSteps.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/library-tests/frameworks/android/taint-database/sinks.expected b/java/ql/test/library-tests/frameworks/android/taint-database/sinks.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/library-tests/frameworks/android/taint-database/sinks.expected
+++ b/java/ql/test/library-tests/frameworks/android/taint-database/sinks.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/library-tests/frameworks/guava/handwritten/flow.expected b/java/ql/test/library-tests/frameworks/guava/handwritten/flow.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/library-tests/frameworks/guava/handwritten/flow.expected
+++ b/java/ql/test/library-tests/frameworks/guava/handwritten/flow.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/library-tests/frameworks/jms/FlowTest.expected b/java/ql/test/library-tests/frameworks/jms/FlowTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/library-tests/frameworks/jms/FlowTest.expected
+++ b/java/ql/test/library-tests/frameworks/jms/FlowTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/library-tests/frameworks/jms/RemoteSourcesTest.expected b/java/ql/test/library-tests/frameworks/jms/RemoteSourcesTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/library-tests/frameworks/jms/RemoteSourcesTest.expected
+++ b/java/ql/test/library-tests/frameworks/jms/RemoteSourcesTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/library-tests/frameworks/rabbitmq/SourceTest.expected b/java/ql/test/library-tests/frameworks/rabbitmq/SourceTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/library-tests/frameworks/rabbitmq/SourceTest.expected
+++ b/java/ql/test/library-tests/frameworks/rabbitmq/SourceTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/library-tests/listofconstants/A.java b/java/ql/test/library-tests/listofconstants/A.java
new file mode 100644
index 00000000000..74129692d71
--- /dev/null
+++ b/java/ql/test/library-tests/listofconstants/A.java
@@ -0,0 +1,35 @@
+import java.util.*;
+
+public class A {
+  private static final Set<String> SEPARATORS =
+      Collections.unmodifiableSet(
+          new HashSet<>(Arrays.asList("\t", "\n", ";")));
+
+  public static void sink(String s) { }
+
+  private void checkSeparator(String separator) {
+    if (SEPARATORS.contains(separator)) {
+      sink(separator);
+    }
+  }
+
+  public static final String URI1 = "yarn.io/gpu";
+  public static final String URI2 = "yarn.io/fpga";
+
+  public static final Set<String> SCHEMAS = Set.of(URI1, URI2, "s3a", "wasb");
+
+  private void checkSchema(String schema) {
+    if (SCHEMAS.contains(schema)) {
+      sink(schema);
+    }
+  }
+
+  private void testAdd(String inp) {
+    Set<String> s = new HashSet<>();
+    s.add("AA");
+    s.add("BB");
+    if (s.contains(inp.toUpperCase())) {
+      sink(inp);
+    }
+  }
+}
diff --git a/java/ql/test/library-tests/listofconstants/CONSISTENCY/typeParametersInScope.expected b/java/ql/test/library-tests/listofconstants/CONSISTENCY/typeParametersInScope.expected
new file mode 100644
index 00000000000..1ea902154a6
--- /dev/null
+++ b/java/ql/test/library-tests/listofconstants/CONSISTENCY/typeParametersInScope.expected
@@ -0,0 +1 @@
+| Type A uses out-of-scope type variable E. Note the Java extractor is known to sometimes do this; the Kotlin extractor should not. |
diff --git a/java/ql/test/library-tests/listofconstants/test.expected b/java/ql/test/library-tests/listofconstants/test.expected
new file mode 100644
index 00000000000..203d64cd46d
--- /dev/null
+++ b/java/ql/test/library-tests/listofconstants/test.expected
@@ -0,0 +1,3 @@
+| A.java:12:12:12:20 | separator |
+| A.java:23:12:23:17 | schema |
+| A.java:32:12:32:14 | inp |
diff --git a/java/ql/test/library-tests/listofconstants/test.ql b/java/ql/test/library-tests/listofconstants/test.ql
new file mode 100644
index 00000000000..f56dfc0f11f
--- /dev/null
+++ b/java/ql/test/library-tests/listofconstants/test.ql
@@ -0,0 +1,5 @@
+import java
+import semmle.code.java.dataflow.FlowSteps
+
+from DefaultTaintSanitizer e
+select e
diff --git a/java/ql/test/library-tests/neutrals/neutralsinks/NeutralSinksTest.expected b/java/ql/test/library-tests/neutrals/neutralsinks/NeutralSinksTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/library-tests/neutrals/neutralsinks/NeutralSinksTest.expected
+++ b/java/ql/test/library-tests/neutrals/neutralsinks/NeutralSinksTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/library-tests/xml/XMLTest.expected b/java/ql/test/library-tests/xml/XMLTest.expected
index 191aad0a6e2..cbdfca1fc67 100644
--- a/java/ql/test/library-tests/xml/XMLTest.expected
+++ b/java/ql/test/library-tests/xml/XMLTest.expected
@@ -1,4 +1,2 @@
-testFailures
 | test.xml:4:5:4:32 | attribute=value | Unexpected result: hasXmlResult |
 | test.xml:5:29:5:52 |  $ hasXmlResult  | Missing result: hasXmlResult |
-failures
diff --git a/java/ql/test/query-tests/security/CWE-023/semmle/tests/PartialPathTraversalFromRemoteTest.expected b/java/ql/test/query-tests/security/CWE-023/semmle/tests/PartialPathTraversalFromRemoteTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-023/semmle/tests/PartialPathTraversalFromRemoteTest.expected
+++ b/java/ql/test/query-tests/security/CWE-023/semmle/tests/PartialPathTraversalFromRemoteTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-074/JndiInjectionTest.expected b/java/ql/test/query-tests/security/CWE-074/JndiInjectionTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-074/JndiInjectionTest.expected
+++ b/java/ql/test/query-tests/security/CWE-074/JndiInjectionTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-074/XsltInjectionTest.expected b/java/ql/test/query-tests/security/CWE-074/XsltInjectionTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-074/XsltInjectionTest.expected
+++ b/java/ql/test/query-tests/security/CWE-074/XsltInjectionTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-079/semmle/tests/XSS.expected b/java/ql/test/query-tests/security/CWE-079/semmle/tests/XSS.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-079/semmle/tests/XSS.expected
+++ b/java/ql/test/query-tests/security/CWE-079/semmle/tests/XSS.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-089/semmle/examples/AllowListSanitizerWithJavaUtilList.java b/java/ql/test/query-tests/security/CWE-089/semmle/examples/AllowListSanitizerWithJavaUtilList.java
new file mode 100644
index 00000000000..285f9bc49cb
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-089/semmle/examples/AllowListSanitizerWithJavaUtilList.java
@@ -0,0 +1,306 @@
+// Test cases for CWE-089 (SQL injection and Java Persistence query injection)
+// http://cwe.mitre.org/data/definitions/89.html
+package test.cwe089.semmle.tests;
+
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Consumer;
+
+class AllowListSanitizerWithJavaUtilList {
+	public static Connection connection;
+	public static final List<String> goodAllowList1 = List.of("allowed1", "allowed2", "allowed3");
+	public static final List<String> goodAllowList2 = Collections.unmodifiableList(Arrays.asList("allowed1"));
+	public static final List<String> goodAllowList3;
+	public static final List<String> goodAllowList4;
+	public static final List<String> goodAllowList5;
+	public static final List<String> badAllowList1 = List.of("allowed1", "allowed2", getNonConstantString());
+	public static final List<String> badAllowList2 = Collections.unmodifiableList(Arrays.asList("allowed1", getNonConstantString()));
+	public static final List<String> badAllowList3;
+	public static final List<String> badAllowList4;
+	public static List<String> badAllowList6 = List.of("allowed1", "allowed2", "allowed3");
+	public final List<String> goodAllowList7 = List.of("allowed1", "allowed2", "allowed3");
+
+	static {
+    	goodAllowList3 = List.of("allowed1", "allowed2", "allowed3");
+    	goodAllowList4 = Collections.unmodifiableList(Arrays.asList("allowed1", "allowed2"));
+    	badAllowList3 = List.of(getNonConstantString(), "allowed2", "allowed3");
+    	badAllowList4 = Collections.unmodifiableList(Arrays.asList("allowed1", getNonConstantString()));
+		goodAllowList5 = new ArrayList<String>();
+		goodAllowList5.add("allowed1");
+		goodAllowList5.add("allowed2");
+		goodAllowList5.add("allowed3");
+	}
+
+	public static String getNonConstantString() {
+		return String.valueOf(System.currentTimeMillis());
+	}
+
+	public static void main(String[] args) throws IOException, SQLException {
+		badAllowList6 = List.of("allowed1", getNonConstantString(), "allowed3");
+		testStaticFields(args);
+		testLocal(args);
+		var x = new AllowListSanitizerWithJavaUtilList();
+		x.testNonStaticFields(args);
+		testMultipleSources(args);
+		testEscape(args);
+	}
+
+	private static void testStaticFields(String[] args) throws IOException, SQLException {
+		String tainted = args[1];
+		// GOOD: an allowlist is used with constant strings
+		if(goodAllowList1.contains(tainted.toLowerCase())){
+			String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+					+ tainted + "' ORDER BY PRICE";
+			ResultSet results = connection.createStatement().executeQuery(query);
+		}
+		// GOOD: an allowlist is used with constant strings
+		if(goodAllowList2.contains(tainted.toUpperCase())){
+			String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+					+ tainted + "' ORDER BY PRICE";
+			ResultSet results = connection.createStatement().executeQuery(query);
+		}
+		// GOOD: an allowlist is used with constant strings
+		if(goodAllowList3.contains(tainted)){
+			String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+					+ tainted + "' ORDER BY PRICE";
+			ResultSet results = connection.createStatement().executeQuery(query);
+		}
+		// GOOD: an allowlist is used with constant strings
+		if(goodAllowList4.contains(tainted)){
+			String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+					+ tainted + "' ORDER BY PRICE";
+			ResultSet results = connection.createStatement().executeQuery(query);
+		}
+		// BAD: an allowlist is used with constant strings
+		if(badAllowList1.contains(tainted)){
+			String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+					+ tainted + "' ORDER BY PRICE";
+			ResultSet results = connection.createStatement().executeQuery(query);
+		}
+		// BAD: an allowlist is used with constant strings
+		if(badAllowList2.contains(tainted)){
+			String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+					+ tainted + "' ORDER BY PRICE";
+			ResultSet results = connection.createStatement().executeQuery(query);
+		}
+		// BAD: an allowlist is used with constant strings
+		if(badAllowList3.contains(tainted)){
+			String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+					+ tainted + "' ORDER BY PRICE";
+			ResultSet results = connection.createStatement().executeQuery(query);
+		}
+		// BAD: an allowlist is used with constant strings
+		if(badAllowList4.contains(tainted)){
+			String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+					+ tainted + "' ORDER BY PRICE";
+			ResultSet results = connection.createStatement().executeQuery(query);
+		}
+		// GOOD: an allowlist is used with constant strings
+		if(goodAllowList5.contains(tainted)){
+			String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+					+ tainted + "' ORDER BY PRICE";
+			ResultSet results = connection.createStatement().executeQuery(query);
+		}
+		// BAD: the allowlist is in a non-final field
+		if(badAllowList6.contains(tainted)){
+			String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+					+ tainted + "' ORDER BY PRICE";
+			ResultSet results = connection.createStatement().executeQuery(query);
+		}
+	}
+
+	private void testNonStaticFields(String[] args) throws IOException, SQLException {
+		String tainted = args[0];
+		// GOOD: the allowlist is in a non-static field
+		if(goodAllowList7.contains(tainted)){
+			String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+					+ tainted + "' ORDER BY PRICE";
+			ResultSet results = connection.createStatement().executeQuery(query);
+		}
+	}
+
+	private static void testLocal(String[] args) throws IOException, SQLException {
+		String tainted = args[1];
+		// GOOD: an allowlist is used with constant strings
+		{
+			List<String> allowlist = List.of("allowed1", "allowed2", "allowed3");
+			if(allowlist.contains(tainted.toLowerCase())){
+				String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+						+ tainted + "' ORDER BY PRICE";
+				ResultSet results = connection.createStatement().executeQuery(query);
+			}
+		}
+		// BAD: an allowlist is used but one of the entries is not a compile-time constant
+		{
+			List<String> allowlist = List.of("allowed1", "allowed2", args[2]);
+			if(allowlist.contains(tainted)){
+				String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+						+ tainted + "' ORDER BY PRICE";
+				ResultSet results = connection.createStatement().executeQuery(query);
+			}
+		}
+		// GOOD: an allowlist is used with constant strings
+		{
+			String[] allowedArray = {"allowed1", "allowed2", "allowed3"};
+			List<String> allowlist = List.of(allowedArray);
+			if(allowlist.contains(tainted.toUpperCase())){
+				String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+						+ tainted + "' ORDER BY PRICE";
+				ResultSet results = connection.createStatement().executeQuery(query);
+			}
+		}
+		// BAD: an allowlist is used but one of the entries is not a compile-time constant
+		{
+			String[] allowedArray = {"allowed1", "allowed2", args[2]};
+			List<String> allowlist = List.of(allowedArray);
+			if(allowlist.contains(tainted)){
+				String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+						+ tainted + "' ORDER BY PRICE";
+				ResultSet results = connection.createStatement().executeQuery(query);
+			}
+		}
+		// GOOD: an allowlist is used with constant strings
+		{
+			List<String> allowlist = Collections.unmodifiableList(Arrays.asList("allowed1"));
+			if(allowlist.contains(tainted)){
+				String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+						+ tainted + "' ORDER BY PRICE";
+				ResultSet results = connection.createStatement().executeQuery(query);
+			}
+		}
+		// BAD: an allowlist is used but one of the entries is not a compile-time constant
+		{
+			List<String> allowlist = Collections.unmodifiableList(Arrays.asList("allowed1", "allowed2", args[2]));
+			if(allowlist.contains(tainted)){
+				String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+						+ tainted + "' ORDER BY PRICE";
+				ResultSet results = connection.createStatement().executeQuery(query);
+			}
+		}
+		// GOOD: an allowlist is used with constant strings
+		{
+			String[] allowedArray = {"allowed1", "allowed2", "allowed3"};
+			List<String> allowlist = Collections.unmodifiableList(Arrays.asList(allowedArray));
+			if(allowlist.contains(tainted)){
+				String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+						+ tainted + "' ORDER BY PRICE";
+				ResultSet results = connection.createStatement().executeQuery(query);
+			}
+		}
+		// BAD: an allowlist is used but one of the entries is not a compile-time constant
+		{
+			String[] allowedArray = {"allowed1", "allowed2", args[2]};
+			List<String> allowlist = Collections.unmodifiableList(Arrays.asList(allowedArray));
+			if(allowlist.contains(tainted)){
+				String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+						+ tainted + "' ORDER BY PRICE";
+				ResultSet results = connection.createStatement().executeQuery(query);
+			}
+		}
+		// GOOD: an allowlist is used with constant string
+		{
+			List<String> allowlist = new ArrayList<String>();
+			allowlist.add("allowed1");
+			allowlist.add("allowed2");
+			allowlist.add("allowed3");
+			if(allowlist.contains(tainted)){
+				String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+						+ tainted + "' ORDER BY PRICE";
+				ResultSet results = connection.createStatement().executeQuery(query);
+			}
+		}
+		// BAD: an allowlist is used but one of the entries is not a compile-time constant
+		{
+			List<String> allowlist = new ArrayList<String>();
+			allowlist.add("allowed1");
+			allowlist.add(getNonConstantString());
+			allowlist.add("allowed3");
+			if(allowlist.contains(tainted)){
+				String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+						+ tainted + "' ORDER BY PRICE";
+				ResultSet results = connection.createStatement().executeQuery(query);
+			}
+		}
+		// BAD: an allowlist is used but it contains a non-compile-time constant element
+		{
+			List<String> allowlist = new ArrayList<String>();
+			allowlist.add("allowed1");
+			addNonConstantStringDirectly(allowlist);
+			if(allowlist.contains(tainted)){
+				String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+						+ tainted + "' ORDER BY PRICE";
+				ResultSet results = connection.createStatement().executeQuery(query);
+			}
+		}
+	}
+
+	private static void testMultipleSources(String[] args) throws IOException, SQLException {
+		String tainted = args[1];
+		boolean b = args[2] == "True";
+		{
+			// BAD: an allowlist is used which might contain constant strings
+			List<String> allowlist = new ArrayList<String>();
+			allowlist.add("allowed1");
+			if (b) {
+				allowlist.add(getNonConstantString());
+			}
+			if(allowlist.contains(tainted)){
+				String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+						+ tainted + "' ORDER BY PRICE";
+				ResultSet results = connection.createStatement().executeQuery(query);
+			}
+		}
+		{
+			// BAD: an allowlist is used which might contain constant strings
+			List<String> allowlist = b ? goodAllowList1 : badAllowList1;
+			if(allowlist.contains(tainted)){
+				String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+						+ tainted + "' ORDER BY PRICE";
+				ResultSet results = connection.createStatement().executeQuery(query);
+			}
+		}
+		{
+			// BAD: an allowlist is used which might contain constant strings
+			List<String> allowlist = b ? goodAllowList1 : List.of("allowed1", "allowed2", args[2]);;
+			if(allowlist.contains(tainted)){
+				String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+						+ tainted + "' ORDER BY PRICE";
+				ResultSet results = connection.createStatement().executeQuery(query);
+			}
+		}
+	}
+
+	private static void testEscape(String[] args) throws IOException, SQLException {
+		String tainted = args[1];
+		boolean b = args[2] == "True";
+		{
+			// BAD: an allowlist is used which contains constant strings
+			List<String> allowlist = new ArrayList<String>();
+			addNonConstantStringViaLambda(e -> allowlist.add(e));
+			if(allowlist.contains(tainted)){ // missing result
+				String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+						+ tainted + "' ORDER BY PRICE";
+				ResultSet results = connection.createStatement().executeQuery(query);
+			}
+		}
+	}
+
+	private static void addNonConstantStringDirectly(List<String> list) {
+		list.add(getNonConstantString());
+	}
+
+	private static void addNonConstantStringViaLambda(Consumer<String> adder) {
+		adder.accept(getNonConstantString());
+	}
+
+}
diff --git a/java/ql/test/query-tests/security/CWE-089/semmle/examples/AllowListSanitizerWithJavaUtilSet.java b/java/ql/test/query-tests/security/CWE-089/semmle/examples/AllowListSanitizerWithJavaUtilSet.java
new file mode 100644
index 00000000000..e1a5f889c6f
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-089/semmle/examples/AllowListSanitizerWithJavaUtilSet.java
@@ -0,0 +1,305 @@
+// Test cases for CWE-089 (SQL injection and Java Persistence query injection)
+// http://cwe.mitre.org/data/definitions/89.html
+package test.cwe089.semmle.tests;
+
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Set;
+import java.util.function.Consumer;
+
+class AllowListSanitizerWithJavaUtilSet {
+	public static Connection connection;
+	public static final Set<String> goodAllowList1 = Set.of("allowed1", "allowed2", "allowed3");
+	public static final Set<String> goodAllowList2 = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList("allowed1","allowed2")));
+	public static final Set<String> goodAllowList3;
+	public static final Set<String> goodAllowList4;
+	public static final Set<String> goodAllowList5;
+	public static final Set<String> badAllowList1 = Set.of("allowed1", "allowed2", getNonConstantString());
+	public static final Set<String> badAllowList2 = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList("allowed1", getNonConstantString())));
+	public static final Set<String> badAllowList3;
+	public static final Set<String> badAllowList4;
+	public static Set<String> badAllowList6 = Set.of("allowed1", "allowed2", "allowed3");
+	public final Set<String> goodAllowList7 = Set.of("allowed1", "allowed2", "allowed3");
+
+	static {
+    	goodAllowList3 = Set.of("allowed1", "allowed2", "allowed3");
+    	goodAllowList4 = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList("allowed1", "allowed2")));
+    	badAllowList3 = Set.of(getNonConstantString(), "allowed2", "allowed3");
+    	badAllowList4 = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList("allowed1", getNonConstantString())));
+		goodAllowList5 = new HashSet<String>();
+		goodAllowList5.add("allowed1");
+		goodAllowList5.add("allowed2");
+		goodAllowList5.add("allowed3");
+	}
+
+	public static String getNonConstantString() {
+		return String.valueOf(System.currentTimeMillis());
+	}
+
+	public static void main(String[] args) throws IOException, SQLException {
+		badAllowList6 = Set.of("allowed1", getNonConstantString(), "allowed3");
+		testStaticFields(args);
+		testLocal(args);
+		var x = new AllowListSanitizerWithJavaUtilSet();
+		x.testNonStaticFields(args);
+		testMultipleSources(args);
+		testEscape(args);
+	}
+
+	private static void testStaticFields(String[] args) throws IOException, SQLException {
+		String tainted = args[1];
+		// GOOD: an allowlist is used with constant strings
+		if(goodAllowList1.contains(tainted.toLowerCase())){
+			String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+					+ tainted + "' ORDER BY PRICE";
+			ResultSet results = connection.createStatement().executeQuery(query);
+		}
+		// GOOD: an allowlist is used with constant strings
+		if(goodAllowList2.contains(tainted.toUpperCase())){
+			String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+					+ tainted + "' ORDER BY PRICE";
+			ResultSet results = connection.createStatement().executeQuery(query);
+		}
+		// GOOD: an allowlist is used with constant strings
+		if(goodAllowList3.contains(tainted)){
+			String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+					+ tainted + "' ORDER BY PRICE";
+			ResultSet results = connection.createStatement().executeQuery(query);
+		}
+		// GOOD: an allowlist is used with constant strings
+		if(goodAllowList4.contains(tainted)){
+			String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+					+ tainted + "' ORDER BY PRICE";
+			ResultSet results = connection.createStatement().executeQuery(query);
+		}
+		// BAD: an allowlist is used with constant strings
+		if(badAllowList1.contains(tainted)){
+			String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+					+ tainted + "' ORDER BY PRICE";
+			ResultSet results = connection.createStatement().executeQuery(query);
+		}
+		// BAD: an allowlist is used with constant strings
+		if(badAllowList2.contains(tainted)){
+			String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+					+ tainted + "' ORDER BY PRICE";
+			ResultSet results = connection.createStatement().executeQuery(query);
+		}
+		// BAD: an allowlist is used with constant strings
+		if(badAllowList3.contains(tainted)){
+			String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+					+ tainted + "' ORDER BY PRICE";
+			ResultSet results = connection.createStatement().executeQuery(query);
+		}
+		// BAD: an allowlist is used with constant strings
+		if(badAllowList4.contains(tainted)){
+			String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+					+ tainted + "' ORDER BY PRICE";
+			ResultSet results = connection.createStatement().executeQuery(query);
+		}
+		// GOOD: an allowlist is used with constant strings
+		if(goodAllowList5.contains(tainted)){
+			String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+					+ tainted + "' ORDER BY PRICE";
+			ResultSet results = connection.createStatement().executeQuery(query);
+		}
+		// BAD: the allowlist is in a non-final field
+		if(badAllowList6.contains(tainted)){
+			String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+					+ tainted + "' ORDER BY PRICE";
+			ResultSet results = connection.createStatement().executeQuery(query);
+		}
+	}
+
+	private void testNonStaticFields(String[] args) throws IOException, SQLException {
+		String tainted = args[1];
+		// GOOD: the allowlist is in a non-static field
+		if(goodAllowList7.contains(tainted)){
+			String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+					+ tainted + "' ORDER BY PRICE";
+			ResultSet results = connection.createStatement().executeQuery(query);
+		}
+	}
+
+	private static void testLocal(String[] args) throws IOException, SQLException {
+		String tainted = args[1];
+		// GOOD: an allowlist is used with constant strings
+		{
+			Set<String> allowlist = Set.of("allowed1", "allowed2", "allowed3");
+			if(allowlist.contains(tainted.toLowerCase())){
+				String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+						+ tainted + "' ORDER BY PRICE";
+				ResultSet results = connection.createStatement().executeQuery(query);
+			}
+		}
+		// BAD: an allowlist is used but one of the entries is not a compile-time constant
+		{
+			Set<String> allowlist = Set.of("allowed1", "allowed2", args[2]);
+			if(allowlist.contains(tainted)){
+				String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+						+ tainted + "' ORDER BY PRICE";
+				ResultSet results = connection.createStatement().executeQuery(query);
+			}
+		}
+		// GOOD: an allowlist is used with constant strings
+		{
+			String[] allowedArray = {"allowed1", "allowed2", "allowed3"};
+			Set<String> allowlist = Set.of(allowedArray);
+			if(allowlist.contains(tainted.toUpperCase())){
+				String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+						+ tainted + "' ORDER BY PRICE";
+				ResultSet results = connection.createStatement().executeQuery(query);
+			}
+		}
+		// BAD: an allowlist is used but one of the entries is not a compile-time constant
+		{
+			String[] allowedArray = {"allowed1", "allowed2", args[2]};
+			Set<String> allowlist = Set.of(allowedArray);
+			if(allowlist.contains(tainted)){
+				String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+						+ tainted + "' ORDER BY PRICE";
+				ResultSet results = connection.createStatement().executeQuery(query);
+			}
+		}
+		// GOOD: an allowlist is used with constant strings
+		{
+			Set<String> allowlist = Collections.unmodifiableSet(new HashSet<>(Arrays.asList("allowed1")));
+			if(allowlist.contains(tainted)){
+				String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+						+ tainted + "' ORDER BY PRICE";
+				ResultSet results = connection.createStatement().executeQuery(query);
+			}
+		}
+		// BAD: an allowlist is used but one of the entries is not a compile-time constant
+		{
+			Set<String> allowlist = Collections.unmodifiableSet(new HashSet<>(Arrays.asList("allowed1", "allowed2", args[2])));
+			if(allowlist.contains(tainted)){
+				String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+						+ tainted + "' ORDER BY PRICE";
+				ResultSet results = connection.createStatement().executeQuery(query);
+			}
+		}
+		// GOOD: an allowlist is used with constant strings
+		{
+			String[] allowedArray = {"allowed1", "allowed2", "allowed3"};
+			Set<String> allowlist = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(allowedArray)));
+			if(allowlist.contains(tainted)){
+				String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+						+ tainted + "' ORDER BY PRICE";
+				ResultSet results = connection.createStatement().executeQuery(query);
+			}
+		}
+		// BAD: an allowlist is used but one of the entries is not a compile-time constant
+		{
+			String[] allowedArray = {"allowed1", "allowed2", args[2]};
+			Set<String> allowlist = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(allowedArray)));
+			if(allowlist.contains(tainted)){
+				String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+						+ tainted + "' ORDER BY PRICE";
+				ResultSet results = connection.createStatement().executeQuery(query);
+			}
+		}
+		// GOOD: an allowlist is used with constant string
+		{
+			Set<String> allowlist = new HashSet<String>();
+			allowlist.add("allowed1");
+			allowlist.add("allowed2");
+			allowlist.add("allowed3");
+			if(allowlist.contains(tainted)){
+				String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+						+ tainted + "' ORDER BY PRICE";
+				ResultSet results = connection.createStatement().executeQuery(query);
+			}
+		}
+		// BAD: an allowlist is used but one of the entries is not a compile-time constant
+		{
+			Set<String> allowlist = new HashSet<String>();
+			allowlist.add("allowed1");
+			allowlist.add(getNonConstantString());
+			allowlist.add("allowed3");
+			if(allowlist.contains(tainted)){
+				String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+						+ tainted + "' ORDER BY PRICE";
+				ResultSet results = connection.createStatement().executeQuery(query);
+			}
+		}
+		// BAD: an allowlist is used but it contains a non-compile-time constant element
+		{
+			Set<String> allowlist = new HashSet<String>();
+			allowlist.add("allowed1");
+			addNonConstantStringDirectly(allowlist);
+			if(allowlist.contains(tainted)){
+				String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+						+ tainted + "' ORDER BY PRICE";
+				ResultSet results = connection.createStatement().executeQuery(query);
+			}
+		}
+	}
+
+	private static void testMultipleSources(String[] args) throws IOException, SQLException {
+		String tainted = args[1];
+		boolean b = args[2] == "True";
+		{
+			// BAD: an allowlist is used which might contain constant strings
+			Set<String> allowlist = new HashSet<String>();
+			allowlist.add("allowed1");
+			if (b) {
+				allowlist.add(getNonConstantString());
+			}
+			if(allowlist.contains(tainted)){
+				String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+						+ tainted + "' ORDER BY PRICE";
+				ResultSet results = connection.createStatement().executeQuery(query);
+			}
+		}
+		{
+			// BAD: an allowlist is used which might contain constant strings
+			Set<String> allowlist = b ? goodAllowList1 : badAllowList1;
+			if(allowlist.contains(tainted)){
+				String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+						+ tainted + "' ORDER BY PRICE";
+				ResultSet results = connection.createStatement().executeQuery(query);
+			}
+		}
+		{
+			// BAD: an allowlist is used which might contain constant strings
+			Set<String> allowlist = b ? goodAllowList1 : Set.of("allowed1", "allowed2", args[2]);;
+			if(allowlist.contains(tainted)){
+				String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+						+ tainted + "' ORDER BY PRICE";
+				ResultSet results = connection.createStatement().executeQuery(query);
+			}
+		}
+	}
+
+	private static void testEscape(String[] args) throws IOException, SQLException {
+		String tainted = args[1];
+		boolean b = args[2] == "True";
+		{
+			// BAD: an allowlist is used which contains constant strings
+			Set<String> allowlist = new HashSet<String>();
+			addNonConstantStringViaLambda(e -> allowlist.add(e));
+			if(allowlist.contains(tainted)){ // missing result
+				String query = "SELECT ITEM,PRICE FROM PRODUCT WHERE ITEM_CATEGORY='"
+						+ tainted + "' ORDER BY PRICE";
+				ResultSet results = connection.createStatement().executeQuery(query);
+			}
+		}
+	}
+
+	private static void addNonConstantStringDirectly(Set<String> set) {
+		set.add(getNonConstantString());
+	}
+
+	private static void addNonConstantStringViaLambda(Consumer<String> adder) {
+		adder.accept(getNonConstantString());
+	}
+
+}
diff --git a/java/ql/test/query-tests/security/CWE-089/semmle/examples/CONSISTENCY/typeParametersInScope.expected b/java/ql/test/query-tests/security/CWE-089/semmle/examples/CONSISTENCY/typeParametersInScope.expected
new file mode 100644
index 00000000000..1f8028eff60
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-089/semmle/examples/CONSISTENCY/typeParametersInScope.expected
@@ -0,0 +1 @@
+| Type AllowListSanitizerWithJavaUtilSet uses out-of-scope type variable E. Note the Java extractor is known to sometimes do this; the Kotlin extractor should not. |
diff --git a/java/ql/test/query-tests/security/CWE-089/semmle/examples/SqlConcatenated.expected b/java/ql/test/query-tests/security/CWE-089/semmle/examples/SqlConcatenated.expected
index fc1d87f06b1..1e560f03c3b 100644
--- a/java/ql/test/query-tests/security/CWE-089/semmle/examples/SqlConcatenated.expected
+++ b/java/ql/test/query-tests/security/CWE-089/semmle/examples/SqlConcatenated.expected
@@ -1,3 +1,55 @@
+| AllowListSanitizerWithJavaUtilList.java:64:66:64:70 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilList.java:63:8:63:14 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilList.java:70:66:70:70 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilList.java:69:8:69:14 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilList.java:76:66:76:70 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilList.java:75:8:75:14 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilList.java:82:66:82:70 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilList.java:81:8:81:14 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilList.java:88:66:88:70 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilList.java:87:8:87:14 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilList.java:94:66:94:70 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilList.java:93:8:93:14 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilList.java:100:66:100:70 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilList.java:99:8:99:14 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilList.java:106:66:106:70 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilList.java:105:8:105:14 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilList.java:112:66:112:70 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilList.java:111:8:111:14 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilList.java:118:66:118:70 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilList.java:117:8:117:14 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilList.java:128:66:128:70 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilList.java:127:8:127:14 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilList.java:140:67:140:71 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilList.java:139:9:139:15 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilList.java:149:67:149:71 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilList.java:148:9:148:15 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilList.java:159:67:159:71 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilList.java:158:9:158:15 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilList.java:169:67:169:71 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilList.java:168:9:168:15 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilList.java:178:67:178:71 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilList.java:177:9:177:15 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilList.java:187:67:187:71 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilList.java:186:9:186:15 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilList.java:197:67:197:71 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilList.java:196:9:196:15 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilList.java:207:67:207:71 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilList.java:206:9:206:15 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilList.java:219:67:219:71 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilList.java:218:9:218:15 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilList.java:231:67:231:71 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilList.java:230:9:230:15 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilList.java:242:67:242:71 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilList.java:241:9:241:15 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilList.java:260:67:260:71 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilList.java:259:9:259:15 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilList.java:269:67:269:71 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilList.java:268:9:268:15 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilList.java:278:67:278:71 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilList.java:277:9:277:15 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilList.java:293:67:293:71 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilList.java:292:9:292:15 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilSet.java:63:66:63:70 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilSet.java:62:8:62:14 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilSet.java:69:66:69:70 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilSet.java:68:8:68:14 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilSet.java:75:66:75:70 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilSet.java:74:8:74:14 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilSet.java:81:66:81:70 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilSet.java:80:8:80:14 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilSet.java:87:66:87:70 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilSet.java:86:8:86:14 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilSet.java:93:66:93:70 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilSet.java:92:8:92:14 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilSet.java:99:66:99:70 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilSet.java:98:8:98:14 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilSet.java:105:66:105:70 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilSet.java:104:8:104:14 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilSet.java:111:66:111:70 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilSet.java:110:8:110:14 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilSet.java:117:66:117:70 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilSet.java:116:8:116:14 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilSet.java:127:66:127:70 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilSet.java:126:8:126:14 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilSet.java:139:67:139:71 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilSet.java:138:9:138:15 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilSet.java:148:67:148:71 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilSet.java:147:9:147:15 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilSet.java:158:67:158:71 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilSet.java:157:9:157:15 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilSet.java:168:67:168:71 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilSet.java:167:9:167:15 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilSet.java:177:67:177:71 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilSet.java:176:9:176:15 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilSet.java:186:67:186:71 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilSet.java:185:9:185:15 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilSet.java:196:67:196:71 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilSet.java:195:9:195:15 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilSet.java:206:67:206:71 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilSet.java:205:9:205:15 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilSet.java:218:67:218:71 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilSet.java:217:9:217:15 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilSet.java:230:67:230:71 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilSet.java:229:9:229:15 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilSet.java:241:67:241:71 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilSet.java:240:9:240:15 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilSet.java:259:67:259:71 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilSet.java:258:9:258:15 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilSet.java:268:67:268:71 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilSet.java:267:9:267:15 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilSet.java:277:67:277:71 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilSet.java:276:9:276:15 | tainted | this expression |
+| AllowListSanitizerWithJavaUtilSet.java:292:67:292:71 | query | Query built by concatenation with $@, which may be untrusted. | AllowListSanitizerWithJavaUtilSet.java:291:9:291:15 | tainted | this expression |
 | Test.java:36:47:36:52 | query1 | Query built by concatenation with $@, which may be untrusted. | Test.java:35:8:35:15 | category | this expression |
 | Test.java:42:57:42:62 | query2 | Query built by concatenation with $@, which may be untrusted. | Test.java:41:51:41:52 | id | this expression |
 | Test.java:50:62:50:67 | query3 | Query built by concatenation with $@, which may be untrusted. | Test.java:49:8:49:15 | category | this expression |
diff --git a/java/ql/test/query-tests/security/CWE-089/semmle/examples/SqlTainted.expected b/java/ql/test/query-tests/security/CWE-089/semmle/examples/SqlTainted.expected
index d54bbdaec05..a45f58bd54d 100644
--- a/java/ql/test/query-tests/security/CWE-089/semmle/examples/SqlTainted.expected
+++ b/java/ql/test/query-tests/security/CWE-089/semmle/examples/SqlTainted.expected
@@ -1,4 +1,34 @@
 #select
+| AllowListSanitizerWithJavaUtilList.java:88:66:88:70 | query | AllowListSanitizerWithJavaUtilList.java:48:26:48:38 | args : String[] | AllowListSanitizerWithJavaUtilList.java:88:66:88:70 | query | This query depends on a $@. | AllowListSanitizerWithJavaUtilList.java:48:26:48:38 | args | user-provided value |
+| AllowListSanitizerWithJavaUtilList.java:94:66:94:70 | query | AllowListSanitizerWithJavaUtilList.java:48:26:48:38 | args : String[] | AllowListSanitizerWithJavaUtilList.java:94:66:94:70 | query | This query depends on a $@. | AllowListSanitizerWithJavaUtilList.java:48:26:48:38 | args | user-provided value |
+| AllowListSanitizerWithJavaUtilList.java:100:66:100:70 | query | AllowListSanitizerWithJavaUtilList.java:48:26:48:38 | args : String[] | AllowListSanitizerWithJavaUtilList.java:100:66:100:70 | query | This query depends on a $@. | AllowListSanitizerWithJavaUtilList.java:48:26:48:38 | args | user-provided value |
+| AllowListSanitizerWithJavaUtilList.java:106:66:106:70 | query | AllowListSanitizerWithJavaUtilList.java:48:26:48:38 | args : String[] | AllowListSanitizerWithJavaUtilList.java:106:66:106:70 | query | This query depends on a $@. | AllowListSanitizerWithJavaUtilList.java:48:26:48:38 | args | user-provided value |
+| AllowListSanitizerWithJavaUtilList.java:118:66:118:70 | query | AllowListSanitizerWithJavaUtilList.java:48:26:48:38 | args : String[] | AllowListSanitizerWithJavaUtilList.java:118:66:118:70 | query | This query depends on a $@. | AllowListSanitizerWithJavaUtilList.java:48:26:48:38 | args | user-provided value |
+| AllowListSanitizerWithJavaUtilList.java:149:67:149:71 | query | AllowListSanitizerWithJavaUtilList.java:48:26:48:38 | args : String[] | AllowListSanitizerWithJavaUtilList.java:149:67:149:71 | query | This query depends on a $@. | AllowListSanitizerWithJavaUtilList.java:48:26:48:38 | args | user-provided value |
+| AllowListSanitizerWithJavaUtilList.java:169:67:169:71 | query | AllowListSanitizerWithJavaUtilList.java:48:26:48:38 | args : String[] | AllowListSanitizerWithJavaUtilList.java:169:67:169:71 | query | This query depends on a $@. | AllowListSanitizerWithJavaUtilList.java:48:26:48:38 | args | user-provided value |
+| AllowListSanitizerWithJavaUtilList.java:187:67:187:71 | query | AllowListSanitizerWithJavaUtilList.java:48:26:48:38 | args : String[] | AllowListSanitizerWithJavaUtilList.java:187:67:187:71 | query | This query depends on a $@. | AllowListSanitizerWithJavaUtilList.java:48:26:48:38 | args | user-provided value |
+| AllowListSanitizerWithJavaUtilList.java:207:67:207:71 | query | AllowListSanitizerWithJavaUtilList.java:48:26:48:38 | args : String[] | AllowListSanitizerWithJavaUtilList.java:207:67:207:71 | query | This query depends on a $@. | AllowListSanitizerWithJavaUtilList.java:48:26:48:38 | args | user-provided value |
+| AllowListSanitizerWithJavaUtilList.java:231:67:231:71 | query | AllowListSanitizerWithJavaUtilList.java:48:26:48:38 | args : String[] | AllowListSanitizerWithJavaUtilList.java:231:67:231:71 | query | This query depends on a $@. | AllowListSanitizerWithJavaUtilList.java:48:26:48:38 | args | user-provided value |
+| AllowListSanitizerWithJavaUtilList.java:242:67:242:71 | query | AllowListSanitizerWithJavaUtilList.java:48:26:48:38 | args : String[] | AllowListSanitizerWithJavaUtilList.java:242:67:242:71 | query | This query depends on a $@. | AllowListSanitizerWithJavaUtilList.java:48:26:48:38 | args | user-provided value |
+| AllowListSanitizerWithJavaUtilList.java:260:67:260:71 | query | AllowListSanitizerWithJavaUtilList.java:48:26:48:38 | args : String[] | AllowListSanitizerWithJavaUtilList.java:260:67:260:71 | query | This query depends on a $@. | AllowListSanitizerWithJavaUtilList.java:48:26:48:38 | args | user-provided value |
+| AllowListSanitizerWithJavaUtilList.java:269:67:269:71 | query | AllowListSanitizerWithJavaUtilList.java:48:26:48:38 | args : String[] | AllowListSanitizerWithJavaUtilList.java:269:67:269:71 | query | This query depends on a $@. | AllowListSanitizerWithJavaUtilList.java:48:26:48:38 | args | user-provided value |
+| AllowListSanitizerWithJavaUtilList.java:278:67:278:71 | query | AllowListSanitizerWithJavaUtilList.java:48:26:48:38 | args : String[] | AllowListSanitizerWithJavaUtilList.java:278:67:278:71 | query | This query depends on a $@. | AllowListSanitizerWithJavaUtilList.java:48:26:48:38 | args | user-provided value |
+| AllowListSanitizerWithJavaUtilList.java:293:67:293:71 | query | AllowListSanitizerWithJavaUtilList.java:48:26:48:38 | args : String[] | AllowListSanitizerWithJavaUtilList.java:293:67:293:71 | query | This query depends on a $@. | AllowListSanitizerWithJavaUtilList.java:48:26:48:38 | args | user-provided value |
+| AllowListSanitizerWithJavaUtilSet.java:87:66:87:70 | query | AllowListSanitizerWithJavaUtilSet.java:47:26:47:38 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:87:66:87:70 | query | This query depends on a $@. | AllowListSanitizerWithJavaUtilSet.java:47:26:47:38 | args | user-provided value |
+| AllowListSanitizerWithJavaUtilSet.java:93:66:93:70 | query | AllowListSanitizerWithJavaUtilSet.java:47:26:47:38 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:93:66:93:70 | query | This query depends on a $@. | AllowListSanitizerWithJavaUtilSet.java:47:26:47:38 | args | user-provided value |
+| AllowListSanitizerWithJavaUtilSet.java:99:66:99:70 | query | AllowListSanitizerWithJavaUtilSet.java:47:26:47:38 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:99:66:99:70 | query | This query depends on a $@. | AllowListSanitizerWithJavaUtilSet.java:47:26:47:38 | args | user-provided value |
+| AllowListSanitizerWithJavaUtilSet.java:105:66:105:70 | query | AllowListSanitizerWithJavaUtilSet.java:47:26:47:38 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:105:66:105:70 | query | This query depends on a $@. | AllowListSanitizerWithJavaUtilSet.java:47:26:47:38 | args | user-provided value |
+| AllowListSanitizerWithJavaUtilSet.java:117:66:117:70 | query | AllowListSanitizerWithJavaUtilSet.java:47:26:47:38 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:117:66:117:70 | query | This query depends on a $@. | AllowListSanitizerWithJavaUtilSet.java:47:26:47:38 | args | user-provided value |
+| AllowListSanitizerWithJavaUtilSet.java:148:67:148:71 | query | AllowListSanitizerWithJavaUtilSet.java:47:26:47:38 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:148:67:148:71 | query | This query depends on a $@. | AllowListSanitizerWithJavaUtilSet.java:47:26:47:38 | args | user-provided value |
+| AllowListSanitizerWithJavaUtilSet.java:168:67:168:71 | query | AllowListSanitizerWithJavaUtilSet.java:47:26:47:38 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:168:67:168:71 | query | This query depends on a $@. | AllowListSanitizerWithJavaUtilSet.java:47:26:47:38 | args | user-provided value |
+| AllowListSanitizerWithJavaUtilSet.java:186:67:186:71 | query | AllowListSanitizerWithJavaUtilSet.java:47:26:47:38 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:186:67:186:71 | query | This query depends on a $@. | AllowListSanitizerWithJavaUtilSet.java:47:26:47:38 | args | user-provided value |
+| AllowListSanitizerWithJavaUtilSet.java:206:67:206:71 | query | AllowListSanitizerWithJavaUtilSet.java:47:26:47:38 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:206:67:206:71 | query | This query depends on a $@. | AllowListSanitizerWithJavaUtilSet.java:47:26:47:38 | args | user-provided value |
+| AllowListSanitizerWithJavaUtilSet.java:230:67:230:71 | query | AllowListSanitizerWithJavaUtilSet.java:47:26:47:38 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:230:67:230:71 | query | This query depends on a $@. | AllowListSanitizerWithJavaUtilSet.java:47:26:47:38 | args | user-provided value |
+| AllowListSanitizerWithJavaUtilSet.java:241:67:241:71 | query | AllowListSanitizerWithJavaUtilSet.java:47:26:47:38 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:241:67:241:71 | query | This query depends on a $@. | AllowListSanitizerWithJavaUtilSet.java:47:26:47:38 | args | user-provided value |
+| AllowListSanitizerWithJavaUtilSet.java:259:67:259:71 | query | AllowListSanitizerWithJavaUtilSet.java:47:26:47:38 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:259:67:259:71 | query | This query depends on a $@. | AllowListSanitizerWithJavaUtilSet.java:47:26:47:38 | args | user-provided value |
+| AllowListSanitizerWithJavaUtilSet.java:268:67:268:71 | query | AllowListSanitizerWithJavaUtilSet.java:47:26:47:38 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:268:67:268:71 | query | This query depends on a $@. | AllowListSanitizerWithJavaUtilSet.java:47:26:47:38 | args | user-provided value |
+| AllowListSanitizerWithJavaUtilSet.java:277:67:277:71 | query | AllowListSanitizerWithJavaUtilSet.java:47:26:47:38 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:277:67:277:71 | query | This query depends on a $@. | AllowListSanitizerWithJavaUtilSet.java:47:26:47:38 | args | user-provided value |
+| AllowListSanitizerWithJavaUtilSet.java:292:67:292:71 | query | AllowListSanitizerWithJavaUtilSet.java:47:26:47:38 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:292:67:292:71 | query | This query depends on a $@. | AllowListSanitizerWithJavaUtilSet.java:47:26:47:38 | args | user-provided value |
 | Mongo.java:17:45:17:67 | parse(...) | Mongo.java:10:29:10:41 | args : String[] | Mongo.java:17:45:17:67 | parse(...) | This query depends on a $@. | Mongo.java:10:29:10:41 | args | user-provided value |
 | Mongo.java:21:49:21:52 | json | Mongo.java:10:29:10:41 | args : String[] | Mongo.java:21:49:21:52 | json | This query depends on a $@. | Mongo.java:10:29:10:41 | args | user-provided value |
 | Test.java:36:47:36:52 | query1 | Test.java:227:26:227:38 | args : String[] | Test.java:36:47:36:52 | query1 | This query depends on a $@. | Test.java:227:26:227:38 | args | user-provided value |
@@ -10,6 +40,52 @@
 | Test.java:209:47:209:68 | queryWithUserTableName | Test.java:227:26:227:38 | args : String[] | Test.java:209:47:209:68 | queryWithUserTableName | This query depends on a $@. | Test.java:227:26:227:38 | args | user-provided value |
 | Test.java:221:81:221:111 | ... + ... | Test.java:227:26:227:38 | args : String[] | Test.java:221:81:221:111 | ... + ... | This query depends on a $@. | Test.java:227:26:227:38 | args | user-provided value |
 edges
+| AllowListSanitizerWithJavaUtilList.java:48:26:48:38 | args : String[] | AllowListSanitizerWithJavaUtilList.java:50:20:50:23 | args : String[] | provenance |  |
+| AllowListSanitizerWithJavaUtilList.java:48:26:48:38 | args : String[] | AllowListSanitizerWithJavaUtilList.java:51:13:51:16 | args : String[] | provenance |  |
+| AllowListSanitizerWithJavaUtilList.java:48:26:48:38 | args : String[] | AllowListSanitizerWithJavaUtilList.java:54:23:54:26 | args : String[] | provenance |  |
+| AllowListSanitizerWithJavaUtilList.java:48:26:48:38 | args : String[] | AllowListSanitizerWithJavaUtilList.java:55:14:55:17 | args : String[] | provenance |  |
+| AllowListSanitizerWithJavaUtilList.java:50:20:50:23 | args : String[] | AllowListSanitizerWithJavaUtilList.java:58:39:58:51 | args : String[] | provenance |  |
+| AllowListSanitizerWithJavaUtilList.java:51:13:51:16 | args : String[] | AllowListSanitizerWithJavaUtilList.java:132:32:132:44 | args : String[] | provenance |  |
+| AllowListSanitizerWithJavaUtilList.java:54:23:54:26 | args : String[] | AllowListSanitizerWithJavaUtilList.java:247:42:247:54 | args : String[] | provenance |  |
+| AllowListSanitizerWithJavaUtilList.java:55:14:55:17 | args : String[] | AllowListSanitizerWithJavaUtilList.java:283:33:283:45 | args : String[] | provenance |  |
+| AllowListSanitizerWithJavaUtilList.java:58:39:58:51 | args : String[] | AllowListSanitizerWithJavaUtilList.java:88:66:88:70 | query | provenance | Sink:MaD:4 |
+| AllowListSanitizerWithJavaUtilList.java:58:39:58:51 | args : String[] | AllowListSanitizerWithJavaUtilList.java:94:66:94:70 | query | provenance | Sink:MaD:4 |
+| AllowListSanitizerWithJavaUtilList.java:58:39:58:51 | args : String[] | AllowListSanitizerWithJavaUtilList.java:100:66:100:70 | query | provenance | Sink:MaD:4 |
+| AllowListSanitizerWithJavaUtilList.java:58:39:58:51 | args : String[] | AllowListSanitizerWithJavaUtilList.java:106:66:106:70 | query | provenance | Sink:MaD:4 |
+| AllowListSanitizerWithJavaUtilList.java:58:39:58:51 | args : String[] | AllowListSanitizerWithJavaUtilList.java:118:66:118:70 | query | provenance | Sink:MaD:4 |
+| AllowListSanitizerWithJavaUtilList.java:132:32:132:44 | args : String[] | AllowListSanitizerWithJavaUtilList.java:149:67:149:71 | query | provenance | Sink:MaD:4 |
+| AllowListSanitizerWithJavaUtilList.java:132:32:132:44 | args : String[] | AllowListSanitizerWithJavaUtilList.java:169:67:169:71 | query | provenance | Sink:MaD:4 |
+| AllowListSanitizerWithJavaUtilList.java:132:32:132:44 | args : String[] | AllowListSanitizerWithJavaUtilList.java:187:67:187:71 | query | provenance | Sink:MaD:4 |
+| AllowListSanitizerWithJavaUtilList.java:132:32:132:44 | args : String[] | AllowListSanitizerWithJavaUtilList.java:207:67:207:71 | query | provenance | Sink:MaD:4 |
+| AllowListSanitizerWithJavaUtilList.java:132:32:132:44 | args : String[] | AllowListSanitizerWithJavaUtilList.java:231:67:231:71 | query | provenance | Sink:MaD:4 |
+| AllowListSanitizerWithJavaUtilList.java:132:32:132:44 | args : String[] | AllowListSanitizerWithJavaUtilList.java:242:67:242:71 | query | provenance | Sink:MaD:4 |
+| AllowListSanitizerWithJavaUtilList.java:247:42:247:54 | args : String[] | AllowListSanitizerWithJavaUtilList.java:260:67:260:71 | query | provenance | Sink:MaD:4 |
+| AllowListSanitizerWithJavaUtilList.java:247:42:247:54 | args : String[] | AllowListSanitizerWithJavaUtilList.java:269:67:269:71 | query | provenance | Sink:MaD:4 |
+| AllowListSanitizerWithJavaUtilList.java:247:42:247:54 | args : String[] | AllowListSanitizerWithJavaUtilList.java:278:67:278:71 | query | provenance | Sink:MaD:4 |
+| AllowListSanitizerWithJavaUtilList.java:283:33:283:45 | args : String[] | AllowListSanitizerWithJavaUtilList.java:293:67:293:71 | query | provenance | Sink:MaD:4 |
+| AllowListSanitizerWithJavaUtilSet.java:47:26:47:38 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:49:20:49:23 | args : String[] | provenance |  |
+| AllowListSanitizerWithJavaUtilSet.java:47:26:47:38 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:50:13:50:16 | args : String[] | provenance |  |
+| AllowListSanitizerWithJavaUtilSet.java:47:26:47:38 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:53:23:53:26 | args : String[] | provenance |  |
+| AllowListSanitizerWithJavaUtilSet.java:47:26:47:38 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:54:14:54:17 | args : String[] | provenance |  |
+| AllowListSanitizerWithJavaUtilSet.java:49:20:49:23 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:57:39:57:51 | args : String[] | provenance |  |
+| AllowListSanitizerWithJavaUtilSet.java:50:13:50:16 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:131:32:131:44 | args : String[] | provenance |  |
+| AllowListSanitizerWithJavaUtilSet.java:53:23:53:26 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:246:42:246:54 | args : String[] | provenance |  |
+| AllowListSanitizerWithJavaUtilSet.java:54:14:54:17 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:282:33:282:45 | args : String[] | provenance |  |
+| AllowListSanitizerWithJavaUtilSet.java:57:39:57:51 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:87:66:87:70 | query | provenance | Sink:MaD:4 |
+| AllowListSanitizerWithJavaUtilSet.java:57:39:57:51 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:93:66:93:70 | query | provenance | Sink:MaD:4 |
+| AllowListSanitizerWithJavaUtilSet.java:57:39:57:51 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:99:66:99:70 | query | provenance | Sink:MaD:4 |
+| AllowListSanitizerWithJavaUtilSet.java:57:39:57:51 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:105:66:105:70 | query | provenance | Sink:MaD:4 |
+| AllowListSanitizerWithJavaUtilSet.java:57:39:57:51 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:117:66:117:70 | query | provenance | Sink:MaD:4 |
+| AllowListSanitizerWithJavaUtilSet.java:131:32:131:44 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:148:67:148:71 | query | provenance | Sink:MaD:4 |
+| AllowListSanitizerWithJavaUtilSet.java:131:32:131:44 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:168:67:168:71 | query | provenance | Sink:MaD:4 |
+| AllowListSanitizerWithJavaUtilSet.java:131:32:131:44 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:186:67:186:71 | query | provenance | Sink:MaD:4 |
+| AllowListSanitizerWithJavaUtilSet.java:131:32:131:44 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:206:67:206:71 | query | provenance | Sink:MaD:4 |
+| AllowListSanitizerWithJavaUtilSet.java:131:32:131:44 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:230:67:230:71 | query | provenance | Sink:MaD:4 |
+| AllowListSanitizerWithJavaUtilSet.java:131:32:131:44 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:241:67:241:71 | query | provenance | Sink:MaD:4 |
+| AllowListSanitizerWithJavaUtilSet.java:246:42:246:54 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:259:67:259:71 | query | provenance | Sink:MaD:4 |
+| AllowListSanitizerWithJavaUtilSet.java:246:42:246:54 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:268:67:268:71 | query | provenance | Sink:MaD:4 |
+| AllowListSanitizerWithJavaUtilSet.java:246:42:246:54 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:277:67:277:71 | query | provenance | Sink:MaD:4 |
+| AllowListSanitizerWithJavaUtilSet.java:282:33:282:45 | args : String[] | AllowListSanitizerWithJavaUtilSet.java:292:67:292:71 | query | provenance | Sink:MaD:4 |
 | Mongo.java:10:29:10:41 | args : String[] | Mongo.java:17:56:17:66 | stringQuery : String | provenance |  |
 | Mongo.java:10:29:10:41 | args : String[] | Mongo.java:21:49:21:52 | json | provenance |  |
 | Mongo.java:17:56:17:66 | stringQuery : String | Mongo.java:17:45:17:67 | parse(...) | provenance | Config |
@@ -40,6 +116,54 @@ models
 | 6 | Summary: java.lang; AbstractStringBuilder; true; append; ; ; Argument[0]; Argument[this]; taint; manual |
 | 7 | Summary: java.lang; CharSequence; true; toString; ; ; Argument[this]; ReturnValue; taint; manual |
 nodes
+| AllowListSanitizerWithJavaUtilList.java:48:26:48:38 | args : String[] | semmle.label | args : String[] |
+| AllowListSanitizerWithJavaUtilList.java:50:20:50:23 | args : String[] | semmle.label | args : String[] |
+| AllowListSanitizerWithJavaUtilList.java:51:13:51:16 | args : String[] | semmle.label | args : String[] |
+| AllowListSanitizerWithJavaUtilList.java:54:23:54:26 | args : String[] | semmle.label | args : String[] |
+| AllowListSanitizerWithJavaUtilList.java:55:14:55:17 | args : String[] | semmle.label | args : String[] |
+| AllowListSanitizerWithJavaUtilList.java:58:39:58:51 | args : String[] | semmle.label | args : String[] |
+| AllowListSanitizerWithJavaUtilList.java:88:66:88:70 | query | semmle.label | query |
+| AllowListSanitizerWithJavaUtilList.java:94:66:94:70 | query | semmle.label | query |
+| AllowListSanitizerWithJavaUtilList.java:100:66:100:70 | query | semmle.label | query |
+| AllowListSanitizerWithJavaUtilList.java:106:66:106:70 | query | semmle.label | query |
+| AllowListSanitizerWithJavaUtilList.java:118:66:118:70 | query | semmle.label | query |
+| AllowListSanitizerWithJavaUtilList.java:132:32:132:44 | args : String[] | semmle.label | args : String[] |
+| AllowListSanitizerWithJavaUtilList.java:149:67:149:71 | query | semmle.label | query |
+| AllowListSanitizerWithJavaUtilList.java:169:67:169:71 | query | semmle.label | query |
+| AllowListSanitizerWithJavaUtilList.java:187:67:187:71 | query | semmle.label | query |
+| AllowListSanitizerWithJavaUtilList.java:207:67:207:71 | query | semmle.label | query |
+| AllowListSanitizerWithJavaUtilList.java:231:67:231:71 | query | semmle.label | query |
+| AllowListSanitizerWithJavaUtilList.java:242:67:242:71 | query | semmle.label | query |
+| AllowListSanitizerWithJavaUtilList.java:247:42:247:54 | args : String[] | semmle.label | args : String[] |
+| AllowListSanitizerWithJavaUtilList.java:260:67:260:71 | query | semmle.label | query |
+| AllowListSanitizerWithJavaUtilList.java:269:67:269:71 | query | semmle.label | query |
+| AllowListSanitizerWithJavaUtilList.java:278:67:278:71 | query | semmle.label | query |
+| AllowListSanitizerWithJavaUtilList.java:283:33:283:45 | args : String[] | semmle.label | args : String[] |
+| AllowListSanitizerWithJavaUtilList.java:293:67:293:71 | query | semmle.label | query |
+| AllowListSanitizerWithJavaUtilSet.java:47:26:47:38 | args : String[] | semmle.label | args : String[] |
+| AllowListSanitizerWithJavaUtilSet.java:49:20:49:23 | args : String[] | semmle.label | args : String[] |
+| AllowListSanitizerWithJavaUtilSet.java:50:13:50:16 | args : String[] | semmle.label | args : String[] |
+| AllowListSanitizerWithJavaUtilSet.java:53:23:53:26 | args : String[] | semmle.label | args : String[] |
+| AllowListSanitizerWithJavaUtilSet.java:54:14:54:17 | args : String[] | semmle.label | args : String[] |
+| AllowListSanitizerWithJavaUtilSet.java:57:39:57:51 | args : String[] | semmle.label | args : String[] |
+| AllowListSanitizerWithJavaUtilSet.java:87:66:87:70 | query | semmle.label | query |
+| AllowListSanitizerWithJavaUtilSet.java:93:66:93:70 | query | semmle.label | query |
+| AllowListSanitizerWithJavaUtilSet.java:99:66:99:70 | query | semmle.label | query |
+| AllowListSanitizerWithJavaUtilSet.java:105:66:105:70 | query | semmle.label | query |
+| AllowListSanitizerWithJavaUtilSet.java:117:66:117:70 | query | semmle.label | query |
+| AllowListSanitizerWithJavaUtilSet.java:131:32:131:44 | args : String[] | semmle.label | args : String[] |
+| AllowListSanitizerWithJavaUtilSet.java:148:67:148:71 | query | semmle.label | query |
+| AllowListSanitizerWithJavaUtilSet.java:168:67:168:71 | query | semmle.label | query |
+| AllowListSanitizerWithJavaUtilSet.java:186:67:186:71 | query | semmle.label | query |
+| AllowListSanitizerWithJavaUtilSet.java:206:67:206:71 | query | semmle.label | query |
+| AllowListSanitizerWithJavaUtilSet.java:230:67:230:71 | query | semmle.label | query |
+| AllowListSanitizerWithJavaUtilSet.java:241:67:241:71 | query | semmle.label | query |
+| AllowListSanitizerWithJavaUtilSet.java:246:42:246:54 | args : String[] | semmle.label | args : String[] |
+| AllowListSanitizerWithJavaUtilSet.java:259:67:259:71 | query | semmle.label | query |
+| AllowListSanitizerWithJavaUtilSet.java:268:67:268:71 | query | semmle.label | query |
+| AllowListSanitizerWithJavaUtilSet.java:277:67:277:71 | query | semmle.label | query |
+| AllowListSanitizerWithJavaUtilSet.java:282:33:282:45 | args : String[] | semmle.label | args : String[] |
+| AllowListSanitizerWithJavaUtilSet.java:292:67:292:71 | query | semmle.label | query |
 | Mongo.java:10:29:10:41 | args : String[] | semmle.label | args : String[] |
 | Mongo.java:17:45:17:67 | parse(...) | semmle.label | parse(...) |
 | Mongo.java:17:56:17:66 | stringQuery : String | semmle.label | stringQuery : String |
diff --git a/java/ql/test/query-tests/security/CWE-089/semmle/examples/springjdbc.expected b/java/ql/test/query-tests/security/CWE-089/semmle/examples/springjdbc.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-089/semmle/examples/springjdbc.expected
+++ b/java/ql/test/query-tests/security/CWE-089/semmle/examples/springjdbc.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-094/ApkInstallationTest.expected b/java/ql/test/query-tests/security/CWE-094/ApkInstallationTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-094/ApkInstallationTest.expected
+++ b/java/ql/test/query-tests/security/CWE-094/ApkInstallationTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-094/GroovyInjectionTest.expected b/java/ql/test/query-tests/security/CWE-094/GroovyInjectionTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-094/GroovyInjectionTest.expected
+++ b/java/ql/test/query-tests/security/CWE-094/GroovyInjectionTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-094/JexlInjectionTest.expected b/java/ql/test/query-tests/security/CWE-094/JexlInjectionTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-094/JexlInjectionTest.expected
+++ b/java/ql/test/query-tests/security/CWE-094/JexlInjectionTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-094/MvelInjectionTest.expected b/java/ql/test/query-tests/security/CWE-094/MvelInjectionTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-094/MvelInjectionTest.expected
+++ b/java/ql/test/query-tests/security/CWE-094/MvelInjectionTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-094/SpelInjectionTest.expected b/java/ql/test/query-tests/security/CWE-094/SpelInjectionTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-094/SpelInjectionTest.expected
+++ b/java/ql/test/query-tests/security/CWE-094/SpelInjectionTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-094/TemplateInjectionTest.expected b/java/ql/test/query-tests/security/CWE-094/TemplateInjectionTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-094/TemplateInjectionTest.expected
+++ b/java/ql/test/query-tests/security/CWE-094/TemplateInjectionTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-1204/StaticInitializationVectorTest.expected b/java/ql/test/query-tests/security/CWE-1204/StaticInitializationVectorTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-1204/StaticInitializationVectorTest.expected
+++ b/java/ql/test/query-tests/security/CWE-1204/StaticInitializationVectorTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SensitiveNotification/test.expected b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SensitiveNotification/test.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SensitiveNotification/test.expected
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SensitiveNotification/test.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SensitiveTextView/test.expected b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SensitiveTextView/test.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SensitiveTextView/test.expected
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SensitiveTextView/test.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/java/ql/test/query-tests/security/CWE-273/UnsafeCertTrustTest.expected b/java/ql/test/query-tests/security/CWE-273/UnsafeCertTrustTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-273/UnsafeCertTrustTest.expected
+++ b/java/ql/test/query-tests/security/CWE-273/UnsafeCertTrustTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-287/InsecureKeys/Test1/InsecureKeys.expected b/java/ql/test/query-tests/security/CWE-287/InsecureKeys/Test1/InsecureKeys.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-287/InsecureKeys/Test1/InsecureKeys.expected
+++ b/java/ql/test/query-tests/security/CWE-287/InsecureKeys/Test1/InsecureKeys.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/java/ql/test/query-tests/security/CWE-287/InsecureKeys/Test2/InsecureKeys.expected b/java/ql/test/query-tests/security/CWE-287/InsecureKeys/Test2/InsecureKeys.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-287/InsecureKeys/Test2/InsecureKeys.expected
+++ b/java/ql/test/query-tests/security/CWE-287/InsecureKeys/Test2/InsecureKeys.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/java/ql/test/query-tests/security/CWE-287/InsecureLocalAuth/InsecureLocalAuth.expected b/java/ql/test/query-tests/security/CWE-287/InsecureLocalAuth/InsecureLocalAuth.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-287/InsecureLocalAuth/InsecureLocalAuth.expected
+++ b/java/ql/test/query-tests/security/CWE-287/InsecureLocalAuth/InsecureLocalAuth.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test1/test.expected b/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test1/test.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test1/test.expected
+++ b/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test1/test.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test2/test.expected b/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test2/test.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test2/test.expected
+++ b/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test2/test.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test3/test.expected b/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test3/test.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test3/test.expected
+++ b/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test3/test.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test4/test.expected b/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test4/test.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test4/test.expected
+++ b/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test4/test.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test5/test.expected b/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test5/test.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test5/test.expected
+++ b/java/ql/test/query-tests/security/CWE-295/AndroidMissingCertificatePinning/Test5/test.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-295/ImproperWebVeiwCertificateValidation/test.expected b/java/ql/test/query-tests/security/CWE-295/ImproperWebVeiwCertificateValidation/test.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-295/ImproperWebVeiwCertificateValidation/test.expected
+++ b/java/ql/test/query-tests/security/CWE-295/ImproperWebVeiwCertificateValidation/test.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-295/InsecureTrustManager/InsecureTrustManagerTest.expected b/java/ql/test/query-tests/security/CWE-295/InsecureTrustManager/InsecureTrustManagerTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-295/InsecureTrustManager/InsecureTrustManagerTest.expected
+++ b/java/ql/test/query-tests/security/CWE-295/InsecureTrustManager/InsecureTrustManagerTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-297/InsecureJavaMailTest.expected b/java/ql/test/query-tests/security/CWE-297/InsecureJavaMailTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-297/InsecureJavaMailTest.expected
+++ b/java/ql/test/query-tests/security/CWE-297/InsecureJavaMailTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-312/android/CleartextStorage/CleartextStorageAndroidDatabaseTest.expected b/java/ql/test/query-tests/security/CWE-312/android/CleartextStorage/CleartextStorageAndroidDatabaseTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-312/android/CleartextStorage/CleartextStorageAndroidDatabaseTest.expected
+++ b/java/ql/test/query-tests/security/CWE-312/android/CleartextStorage/CleartextStorageAndroidDatabaseTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-312/android/CleartextStorage/CleartextStorageAndroidFilesystemTest.expected b/java/ql/test/query-tests/security/CWE-312/android/CleartextStorage/CleartextStorageAndroidFilesystemTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-312/android/CleartextStorage/CleartextStorageAndroidFilesystemTest.expected
+++ b/java/ql/test/query-tests/security/CWE-312/android/CleartextStorage/CleartextStorageAndroidFilesystemTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-312/android/CleartextStorage/CleartextStorageSharedPrefsTest.expected b/java/ql/test/query-tests/security/CWE-312/android/CleartextStorage/CleartextStorageSharedPrefsTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-312/android/CleartextStorage/CleartextStorageSharedPrefsTest.expected
+++ b/java/ql/test/query-tests/security/CWE-312/android/CleartextStorage/CleartextStorageSharedPrefsTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-326/InsufficientKeySizeTest.expected b/java/ql/test/query-tests/security/CWE-326/InsufficientKeySizeTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-326/InsufficientKeySizeTest.expected
+++ b/java/ql/test/query-tests/security/CWE-326/InsufficientKeySizeTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-327/semmle/tests/BrokenCryptoAlgorithm.expected b/java/ql/test/query-tests/security/CWE-327/semmle/tests/BrokenCryptoAlgorithm.expected
index 612e1c73054..94719b47739 100644
--- a/java/ql/test/query-tests/security/CWE-327/semmle/tests/BrokenCryptoAlgorithm.expected
+++ b/java/ql/test/query-tests/security/CWE-327/semmle/tests/BrokenCryptoAlgorithm.expected
@@ -1,14 +1,8 @@
 #select
 | Test.java:19:20:19:50 | getInstance(...) | Test.java:19:45:19:49 | "DES" | Test.java:19:45:19:49 | "DES" | Cryptographic algorithm $@ is weak and should not be used. | Test.java:19:45:19:49 | "DES" | DES |
 | Test.java:42:14:42:38 | getInstance(...) | Test.java:42:33:42:37 | "RC2" | Test.java:42:33:42:37 | "RC2" | Cryptographic algorithm $@ is weak and should not be used. | Test.java:42:33:42:37 | "RC2" | RC2 |
-| WeakHashing.java:21:30:21:92 | getInstance(...) | WeakHashing.java:21:86:21:90 | "MD5" : String | WeakHashing.java:21:56:21:91 | getProperty(...) | Cryptographic algorithm $@ is weak and should not be used. | WeakHashing.java:21:86:21:90 | "MD5" | MD5 |
 edges
-| WeakHashing.java:21:86:21:90 | "MD5" : String | WeakHashing.java:21:56:21:91 | getProperty(...) | provenance | MaD:1 |
-models
-| 1 | Summary: java.util; Properties; true; getProperty; (String,String); ; Argument[1]; ReturnValue; value; manual |
 nodes
 | Test.java:19:45:19:49 | "DES" | semmle.label | "DES" |
 | Test.java:42:33:42:37 | "RC2" | semmle.label | "RC2" |
-| WeakHashing.java:21:56:21:91 | getProperty(...) | semmle.label | getProperty(...) |
-| WeakHashing.java:21:86:21:90 | "MD5" : String | semmle.label | "MD5" : String |
 subpaths
diff --git a/java/ql/test/query-tests/security/CWE-327/semmle/tests/WeakHashing.java b/java/ql/test/query-tests/security/CWE-327/semmle/tests/WeakHashing.java
index 6a3565fc141..c79c025a41c 100644
--- a/java/ql/test/query-tests/security/CWE-327/semmle/tests/WeakHashing.java
+++ b/java/ql/test/query-tests/security/CWE-327/semmle/tests/WeakHashing.java
@@ -19,11 +19,17 @@ public class WeakHashing {
 
         // BAD: Using a strong hashing algorithm but with a weak default
         MessageDigest bad3 = MessageDigest.getInstance(props.getProperty("hashAlg2", "MD5"));
-        
+
         // GOOD: Using a strong hashing algorithm
         MessageDigest ok = MessageDigest.getInstance(props.getProperty("hashAlg2"));
 
         // OK: Property does not exist and default is secure
         MessageDigest ok2 = MessageDigest.getInstance(props.getProperty("hashAlg3", "SHA-256"));
+
+        // GOOD: Using a strong hashing algorithm
+        MessageDigest ok3 = MessageDigest.getInstance("SHA3-512");
+
+         // GOOD: Using a strong hashing algorithm
+        MessageDigest ok4 = MessageDigest.getInstance("SHA384");
     }
-}
\ No newline at end of file
+}
diff --git a/java/ql/test/query-tests/security/CWE-330/InsecureRandomnessTest.expected b/java/ql/test/query-tests/security/CWE-330/InsecureRandomnessTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-330/InsecureRandomnessTest.expected
+++ b/java/ql/test/query-tests/security/CWE-330/InsecureRandomnessTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-347/MissingJWTSignatureCheckTest.expected b/java/ql/test/query-tests/security/CWE-347/MissingJWTSignatureCheckTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-347/MissingJWTSignatureCheckTest.expected
+++ b/java/ql/test/query-tests/security/CWE-347/MissingJWTSignatureCheckTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-352/SpringCsrfProtectionTest.expected b/java/ql/test/query-tests/security/CWE-352/SpringCsrfProtectionTest.expected
index a74f2c23cda..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-352/SpringCsrfProtectionTest.expected
+++ b/java/ql/test/query-tests/security/CWE-352/SpringCsrfProtectionTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-470/FragmentInjectionInPreferenceActivityTest.expected b/java/ql/test/query-tests/security/CWE-470/FragmentInjectionInPreferenceActivityTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-470/FragmentInjectionInPreferenceActivityTest.expected
+++ b/java/ql/test/query-tests/security/CWE-470/FragmentInjectionInPreferenceActivityTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-489/debuggable-attribute/DebuggableAttributeEnabledTest.expected b/java/ql/test/query-tests/security/CWE-489/debuggable-attribute/DebuggableAttributeEnabledTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-489/debuggable-attribute/DebuggableAttributeEnabledTest.expected
+++ b/java/ql/test/query-tests/security/CWE-489/debuggable-attribute/DebuggableAttributeEnabledTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-502/UnsafeDeserialization.expected b/java/ql/test/query-tests/security/CWE-502/UnsafeDeserialization.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-502/UnsafeDeserialization.expected
+++ b/java/ql/test/query-tests/security/CWE-502/UnsafeDeserialization.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-522/InsecureBasicAuthTest.expected b/java/ql/test/query-tests/security/CWE-522/InsecureBasicAuthTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-522/InsecureBasicAuthTest.expected
+++ b/java/ql/test/query-tests/security/CWE-522/InsecureBasicAuthTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-522/InsecureLdapAuthTest.expected b/java/ql/test/query-tests/security/CWE-522/InsecureLdapAuthTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-522/InsecureLdapAuthTest.expected
+++ b/java/ql/test/query-tests/security/CWE-522/InsecureLdapAuthTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-524/SensitiveKeyboardCache.expected b/java/ql/test/query-tests/security/CWE-524/SensitiveKeyboardCache.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-524/SensitiveKeyboardCache.expected
+++ b/java/ql/test/query-tests/security/CWE-524/SensitiveKeyboardCache.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-643/XPathInjectionTest.expected b/java/ql/test/query-tests/security/CWE-643/XPathInjectionTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-643/XPathInjectionTest.expected
+++ b/java/ql/test/query-tests/security/CWE-643/XPathInjectionTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-730/PolynomialReDoS.expected b/java/ql/test/query-tests/security/CWE-730/PolynomialReDoS.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-730/PolynomialReDoS.expected
+++ b/java/ql/test/query-tests/security/CWE-730/PolynomialReDoS.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-730/ReDoS.expected b/java/ql/test/query-tests/security/CWE-730/ReDoS.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-730/ReDoS.expected
+++ b/java/ql/test/query-tests/security/CWE-730/ReDoS.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-730/RegexInjectionTest.expected b/java/ql/test/query-tests/security/CWE-730/RegexInjectionTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-730/RegexInjectionTest.expected
+++ b/java/ql/test/query-tests/security/CWE-730/RegexInjectionTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-749/UnsafeAndroidAccessTest.expected b/java/ql/test/query-tests/security/CWE-749/UnsafeAndroidAccessTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-749/UnsafeAndroidAccessTest.expected
+++ b/java/ql/test/query-tests/security/CWE-749/UnsafeAndroidAccessTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-798/semmle/tests/HardcodedCredentialsApiCall.expected b/java/ql/test/query-tests/security/CWE-798/semmle/tests/HardcodedCredentialsApiCall.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-798/semmle/tests/HardcodedCredentialsApiCall.expected
+++ b/java/ql/test/query-tests/security/CWE-798/semmle/tests/HardcodedCredentialsApiCall.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-798/semmle/tests/HardcodedCredentialsComparison.expected b/java/ql/test/query-tests/security/CWE-798/semmle/tests/HardcodedCredentialsComparison.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-798/semmle/tests/HardcodedCredentialsComparison.expected
+++ b/java/ql/test/query-tests/security/CWE-798/semmle/tests/HardcodedCredentialsComparison.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-798/semmle/tests/HardcodedCredentialsSourceCall.expected b/java/ql/test/query-tests/security/CWE-798/semmle/tests/HardcodedCredentialsSourceCall.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-798/semmle/tests/HardcodedCredentialsSourceCall.expected
+++ b/java/ql/test/query-tests/security/CWE-798/semmle/tests/HardcodedCredentialsSourceCall.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-798/semmle/tests/HardcodedPasswordField.expected b/java/ql/test/query-tests/security/CWE-798/semmle/tests/HardcodedPasswordField.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-798/semmle/tests/HardcodedPasswordField.expected
+++ b/java/ql/test/query-tests/security/CWE-798/semmle/tests/HardcodedPasswordField.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-807/semmle/tests/ConditionalBypassTest.expected b/java/ql/test/query-tests/security/CWE-807/semmle/tests/ConditionalBypassTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-807/semmle/tests/ConditionalBypassTest.expected
+++ b/java/ql/test/query-tests/security/CWE-807/semmle/tests/ConditionalBypassTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-917/OgnlInjectionTest.expected b/java/ql/test/query-tests/security/CWE-917/OgnlInjectionTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-917/OgnlInjectionTest.expected
+++ b/java/ql/test/query-tests/security/CWE-917/OgnlInjectionTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-918/RequestForgery.expected b/java/ql/test/query-tests/security/CWE-918/RequestForgery.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-918/RequestForgery.expected
+++ b/java/ql/test/query-tests/security/CWE-918/RequestForgery.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-925/ImproperIntentVerification.expected b/java/ql/test/query-tests/security/CWE-925/ImproperIntentVerification.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-925/ImproperIntentVerification.expected
+++ b/java/ql/test/query-tests/security/CWE-925/ImproperIntentVerification.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-926/ImplicitlyExportedAndroidComponentTest.expected b/java/ql/test/query-tests/security/CWE-926/ImplicitlyExportedAndroidComponentTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-926/ImplicitlyExportedAndroidComponentTest.expected
+++ b/java/ql/test/query-tests/security/CWE-926/ImplicitlyExportedAndroidComponentTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-926/incomplete_provider_permissions/ContentProviderIncompletePermissionsTest.expected b/java/ql/test/query-tests/security/CWE-926/incomplete_provider_permissions/ContentProviderIncompletePermissionsTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-926/incomplete_provider_permissions/ContentProviderIncompletePermissionsTest.expected
+++ b/java/ql/test/query-tests/security/CWE-926/incomplete_provider_permissions/ContentProviderIncompletePermissionsTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/java/ql/test/query-tests/security/CWE-927/ImplicitPendingIntentsTest.expected b/java/ql/test/query-tests/security/CWE-927/ImplicitPendingIntentsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-927/ImplicitPendingIntentsTest.expected
+++ b/java/ql/test/query-tests/security/CWE-927/ImplicitPendingIntentsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/java/ql/test/query-tests/security/CWE-927/SensitiveResultReceiver.expected b/java/ql/test/query-tests/security/CWE-927/SensitiveResultReceiver.expected
index 48de9172b36..e69de29bb2d 100644
--- a/java/ql/test/query-tests/security/CWE-927/SensitiveResultReceiver.expected
+++ b/java/ql/test/query-tests/security/CWE-927/SensitiveResultReceiver.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/javascript/extractor/lib/typescript/package-lock.json b/javascript/extractor/lib/typescript/package-lock.json
index 50a9e0a66ca..1978e396324 100644
--- a/javascript/extractor/lib/typescript/package-lock.json
+++ b/javascript/extractor/lib/typescript/package-lock.json
@@ -6,7 +6,7 @@
         "": {
             "name": "typescript-parser-wrapper",
             "dependencies": {
-                "typescript": "^5.6.2"
+                "typescript": "^5.7.2"
             },
             "devDependencies": {
                 "@types/node": "18.15.3"
@@ -20,9 +20,9 @@
             "license": "MIT"
         },
         "node_modules/typescript": {
-            "version": "5.6.2",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz",
-            "integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==",
+            "version": "5.7.2",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.2.tgz",
+            "integrity": "sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==",
             "license": "Apache-2.0",
             "bin": {
                 "tsc": "bin/tsc",
diff --git a/javascript/extractor/lib/typescript/package.json b/javascript/extractor/lib/typescript/package.json
index bf650ec457a..9d77f4ab740 100644
--- a/javascript/extractor/lib/typescript/package.json
+++ b/javascript/extractor/lib/typescript/package.json
@@ -2,7 +2,7 @@
     "name": "typescript-parser-wrapper",
     "private": true,
     "dependencies": {
-        "typescript": "5.6.2"
+        "typescript": "^5.7.2"
     },
     "scripts": {
         "build": "tsc --project tsconfig.json",
diff --git a/javascript/ql/integration-tests/diagnostics/internal-error/src/my_failure.ts b/javascript/ql/integration-tests/diagnostics/internal-error/src/my_failure.ts
index 29e78b136e8..f2a1644e18f 100644
--- a/javascript/ql/integration-tests/diagnostics/internal-error/src/my_failure.ts
+++ b/javascript/ql/integration-tests/diagnostics/internal-error/src/my_failure.ts
@@ -1,17 +1,3022 @@
-type Output<K, S extends any[]> = {
-  (...args: S): any;
-};
-
-declare function createThing<K extends string, S extends any[]>(
-  type: K,
-  fn: (...args: S) => any
-): Output<K, S>;
-
-const one = createThing("one", () => ({}));
-
-const two = createThing("two", () => ({}));
-
-const three = createThing("three", (cursor: string) => null);
-const four = createThing("four", (error: number) => null);
-
-type Events = Array<typeof one | typeof two | typeof three | typeof four>;
+console.log(
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +    
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +    
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 +
+  1 
+);
diff --git a/javascript/ql/lib/change-notes/2024-11-18-ES2022-find-functions.md b/javascript/ql/lib/change-notes/2024-11-18-ES2022-find-functions.md
new file mode 100644
index 00000000000..e3fe3b6aef2
--- /dev/null
+++ b/javascript/ql/lib/change-notes/2024-11-18-ES2022-find-functions.md
@@ -0,0 +1,5 @@
+---
+category: minorAnalysis
+---
+* Added taint-steps for `Array.prototype.findLast`  
+* Added taint-steps for `Array.prototype.findLastIndex`
diff --git a/javascript/ql/lib/change-notes/2024-11-20-ES2023-string-protytpe-toWellFormed.md b/javascript/ql/lib/change-notes/2024-11-20-ES2023-string-protytpe-toWellFormed.md
new file mode 100644
index 00000000000..dda4d878760
--- /dev/null
+++ b/javascript/ql/lib/change-notes/2024-11-20-ES2023-string-protytpe-toWellFormed.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Added taint-steps for `String.prototype.toWellFormed`.
diff --git a/javascript/ql/lib/change-notes/2024-11-20-ES2024-group-functions.md b/javascript/ql/lib/change-notes/2024-11-20-ES2024-group-functions.md
new file mode 100644
index 00000000000..8511727f8e7
--- /dev/null
+++ b/javascript/ql/lib/change-notes/2024-11-20-ES2024-group-functions.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* Added taint-steps for `Map.groupBy` and `Object.groupBy`.
diff --git a/javascript/ql/lib/change-notes/2024-11-28-regexp-unknown-flags.md b/javascript/ql/lib/change-notes/2024-11-28-regexp-unknown-flags.md
new file mode 100644
index 00000000000..e1db79e5c86
--- /dev/null
+++ b/javascript/ql/lib/change-notes/2024-11-28-regexp-unknown-flags.md
@@ -0,0 +1,6 @@
+---
+category: majorAnalysis
+---
+* The `js/incomplete-sanitization` query now also checks regular expressions constructed using `new RegExp(..)`. Previously it only checked regular expression literals.
+* Regular expression-based sanitisers implemented with `new RegExp(..)` are now detected in more cases.
+* Regular expression related queries now account for unknown flags.
diff --git a/javascript/ql/lib/semmle/javascript/Arrays.qll b/javascript/ql/lib/semmle/javascript/Arrays.qll
index 7ce37130996..bec711b835a 100644
--- a/javascript/ql/lib/semmle/javascript/Arrays.qll
+++ b/javascript/ql/lib/semmle/javascript/Arrays.qll
@@ -384,10 +384,10 @@ private module ArrayLibraries {
   }
 
   /**
-   * Gets a call to `Array.prototype.find` or a polyfill implementing the same functionality.
+   * Gets a call to `Array.prototype.find` or `Array.prototype.findLast` or a polyfill implementing the same functionality.
    */
   DataFlow::CallNode arrayFindCall(DataFlow::Node array) {
-    result.(DataFlow::MethodCallNode).getMethodName() = "find" and
+    result.(DataFlow::MethodCallNode).getMethodName() in ["find", "findLast"] and
     array = result.getReceiver()
     or
     result = DataFlow::moduleImport(["array.prototype.find", "array-find"]).getACall() and
@@ -483,4 +483,31 @@ private module ArrayLibraries {
       )
     }
   }
+
+  /**
+   * Defines a data flow step that tracks the flow of data through callback functions in arrays.
+   */
+  private class ArrayCallBackDataFlowStep extends PreCallGraphStep {
+    override predicate loadStep(DataFlow::Node obj, DataFlow::Node element, string prop) {
+      exists(DataFlow::MethodCallNode call |
+        call.getMethodName() = ["findLast", "find", "findLastIndex"] and
+        prop = arrayLikeElement() and
+        obj = call.getReceiver() and
+        element = call.getCallback(0).getParameter(0)
+      )
+    }
+  }
+
+  /**
+   * This step models the propagation of data from the array to the callback function's parameter.
+   */
+  private class ArrayCallBackDataTaintStep extends TaintTracking::SharedTaintStep {
+    override predicate step(DataFlow::Node obj, DataFlow::Node element) {
+      exists(DataFlow::MethodCallNode call |
+        call.getMethodName() = ["findLast", "find", "findLastIndex"] and
+        obj = call.getReceiver() and
+        element = call.getCallback(0).getParameter(0)
+      )
+    }
+  }
 }
diff --git a/javascript/ql/lib/semmle/javascript/Collections.qll b/javascript/ql/lib/semmle/javascript/Collections.qll
index a0e251554ff..028c3abe4b3 100644
--- a/javascript/ql/lib/semmle/javascript/Collections.qll
+++ b/javascript/ql/lib/semmle/javascript/Collections.qll
@@ -151,4 +151,32 @@ private module CollectionDataFlow {
       )
     }
   }
+
+  /**
+   * A step for a call to `groupBy` on an iterable object.
+   */
+  private class GroupByTaintStep extends TaintTracking::SharedTaintStep {
+    override predicate heapStep(DataFlow::Node pred, DataFlow::Node succ) {
+      exists(DataFlow::MethodCallNode call |
+        call = DataFlow::globalVarRef(["Map", "Object"]).getAMemberCall("groupBy") and
+        pred = call.getArgument(0) and
+        (succ = call.getCallback(1).getParameter(0) or succ = call)
+      )
+    }
+  }
+
+  /**
+   * A step for handling data flow and taint tracking for the groupBy method on iterable objects.
+   * Ensures propagation of taint and data flow through the groupBy operation.
+   */
+  private class GroupByDataFlowStep extends PreCallGraphStep {
+    override predicate storeStep(DataFlow::Node pred, DataFlow::SourceNode succ, string prop) {
+      exists(DataFlow::MethodCallNode call |
+        call = DataFlow::globalVarRef("Map").getAMemberCall("groupBy") and
+        pred = call.getArgument(0) and
+        succ = call and
+        prop = mapValueUnknownKey()
+      )
+    }
+  }
 }
diff --git a/javascript/ql/lib/semmle/javascript/StandardLibrary.qll b/javascript/ql/lib/semmle/javascript/StandardLibrary.qll
index b40f10d9369..0b84e9a734b 100644
--- a/javascript/ql/lib/semmle/javascript/StandardLibrary.qll
+++ b/javascript/ql/lib/semmle/javascript/StandardLibrary.qll
@@ -117,6 +117,12 @@ class StringReplaceCall extends DataFlow::MethodCallNode {
    */
   predicate isGlobal() { this.getRegExp().isGlobal() or this.getMethodName() = "replaceAll" }
 
+  /**
+   * Holds if this is a global replacement, that is, the first argument is a regular expression
+   * with the `g` flag or unknown flags, or this is a call to `.replaceAll()`.
+   */
+  predicate maybeGlobal() { this.getRegExp().maybeGlobal() or this.getMethodName() = "replaceAll" }
+
   /**
    * Holds if this call to `replace` replaces `old` with `new`.
    */
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/Nodes.qll b/javascript/ql/lib/semmle/javascript/dataflow/Nodes.qll
index d88dab4d431..8a7d2d11b91 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/Nodes.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/Nodes.qll
@@ -1685,6 +1685,9 @@ class RegExpCreationNode extends DataFlow::SourceNode {
   /** Holds if the constructed predicate has the `g` flag. */
   predicate isGlobal() { RegExp::isGlobal(this.getFlags()) }
 
+  /** Holds if the constructed predicate has the `g` flag or unknown flags. */
+  predicate maybeGlobal() { RegExp::maybeGlobal(this.tryGetFlags()) }
+
   /** Gets a data flow node referring to this regular expression. */
   private DataFlow::SourceNode getAReference(DataFlow::TypeTracker t) {
     t.start() and
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/TaintTracking.qll b/javascript/ql/lib/semmle/javascript/dataflow/TaintTracking.qll
index a19691e9448..6b6fc9c4b07 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/TaintTracking.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/TaintTracking.qll
@@ -612,7 +612,7 @@ module TaintTracking {
                 "italics", "link", "padEnd", "padStart", "repeat", "replace", "replaceAll", "slice",
                 "small", "split", "strike", "sub", "substr", "substring", "sup",
                 "toLocaleLowerCase", "toLocaleUpperCase", "toLowerCase", "toUpperCase", "trim",
-                "trimLeft", "trimRight"
+                "trimLeft", "trimRight", "toWellFormed"
               ]
             or
             // sorted, interesting, properties of Object.prototype
diff --git a/javascript/ql/lib/semmle/javascript/security/IncompleteBlacklistSanitizer.qll b/javascript/ql/lib/semmle/javascript/security/IncompleteBlacklistSanitizer.qll
index 6b05e2c754d..13d5033458a 100644
--- a/javascript/ql/lib/semmle/javascript/security/IncompleteBlacklistSanitizer.qll
+++ b/javascript/ql/lib/semmle/javascript/security/IncompleteBlacklistSanitizer.qll
@@ -74,7 +74,7 @@ private StringReplaceCall getAStringReplaceMethodCall(StringReplaceCall n) {
 module HtmlSanitization {
   private predicate fixedGlobalReplacement(StringReplaceCallSequence chain) {
     forall(StringReplaceCall member | member = chain.getAMember() |
-      member.isGlobal() and member.getArgument(0) instanceof DataFlow::RegExpLiteralNode
+      member.maybeGlobal() and member.getArgument(0) instanceof DataFlow::RegExpCreationNode
     )
   }
 
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/CleartextLoggingCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/CleartextLoggingCustomizations.qll
index c783a9c3cfc..b302a025b2c 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/CleartextLoggingCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/CleartextLoggingCustomizations.qll
@@ -36,9 +36,12 @@ module CleartextLogging {
    */
   class MaskingReplacer extends Barrier, StringReplaceCall {
     MaskingReplacer() {
-      this.isGlobal() and
+      this.maybeGlobal() and
       exists(this.getRawReplacement().getStringValue()) and
-      any(RegExpDot term).getLiteral() = this.getRegExp().asExpr()
+      exists(DataFlow::RegExpCreationNode regexpObj |
+        this.(StringReplaceCall).getRegExp() = regexpObj and
+        regexpObj.getRoot() = any(RegExpDot term).getRootTerm()
+      )
     }
   }
 
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/PrototypePollutingAssignmentQuery.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/PrototypePollutingAssignmentQuery.qll
index 0ba2f26b24c..197b8594244 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/PrototypePollutingAssignmentQuery.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/PrototypePollutingAssignmentQuery.qll
@@ -46,7 +46,7 @@ class Configuration extends TaintTracking::Configuration {
       // Replacing with "_" is likely to be exploitable
       not replace.getRawReplacement().getStringValue() = "_" and
       (
-        replace.isGlobal()
+        replace.maybeGlobal()
         or
         // Non-global replace with a non-empty string can also prevent __proto__ by
         // inserting a chunk of text that doesn't fit anywhere in __proto__
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/RegExpInjectionCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/RegExpInjectionCustomizations.qll
index 291d6eebc1c..03cbd01b630 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/RegExpInjectionCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/RegExpInjectionCustomizations.qll
@@ -76,7 +76,7 @@ module RegExpInjection {
    */
   class MetacharEscapeSanitizer extends Sanitizer, StringReplaceCall {
     MetacharEscapeSanitizer() {
-      this.isGlobal() and
+      this.maybeGlobal() and
       (
         RegExp::alwaysMatchesMetaCharacter(this.getRegExp().getRoot(), ["{", "[", "+"])
         or
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/TaintedPathCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/TaintedPathCustomizations.qll
index c24ea7f6110..8798c926086 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/TaintedPathCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/TaintedPathCustomizations.qll
@@ -221,10 +221,10 @@ module TaintedPath {
       this instanceof StringReplaceCall and
       input = this.getReceiver() and
       output = this and
-      not exists(RegExpLiteral literal, RegExpTerm term |
-        this.(StringReplaceCall).getRegExp().asExpr() = literal and
-        this.(StringReplaceCall).isGlobal() and
-        literal.getRoot() = term
+      not exists(DataFlow::RegExpCreationNode regexp, RegExpTerm term |
+        this.(StringReplaceCall).getRegExp() = regexp and
+        this.(StringReplaceCall).maybeGlobal() and
+        regexp.getRoot() = term
       |
         term.getAMatchedString() = "/" or
         term.getAMatchedString() = "." or
@@ -305,9 +305,9 @@ module TaintedPath {
       input = this.getReceiver() and
       output = this and
       this.isGlobal() and
-      exists(RegExpLiteral literal, RegExpTerm term |
-        this.getRegExp().asExpr() = literal and
-        literal.getRoot() = term and
+      exists(DataFlow::RegExpCreationNode regexp, RegExpTerm term |
+        this.getRegExp() = regexp and
+        regexp.getRoot() = term and
         not term.getAMatchedString() = "/"
       |
         term.getAMatchedString() = "." or
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeShellCommandConstructionCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeShellCommandConstructionCustomizations.qll
index 77625874df9..8e753a5ef63 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeShellCommandConstructionCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeShellCommandConstructionCustomizations.qll
@@ -245,7 +245,7 @@ module UnsafeShellCommandConstruction {
   class ReplaceQuotesSanitizer extends Sanitizer, StringReplaceCall {
     ReplaceQuotesSanitizer() {
       this.getAReplacedString() = "'" and
-      this.isGlobal() and
+      this.maybeGlobal() and
       this.getRawReplacement().mayHaveStringValue(["'\\''", ""])
     }
   }
diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/Xss.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/Xss.qll
index fc2db8e9f87..a0def5b7b74 100644
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/Xss.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/Xss.qll
@@ -36,7 +36,7 @@ module Shared {
    */
   class MetacharEscapeSanitizer extends Sanitizer, StringReplaceCall {
     MetacharEscapeSanitizer() {
-      this.isGlobal() and
+      this.maybeGlobal() and
       (
         RegExp::alwaysMatchesMetaCharacter(this.getRegExp().getRoot(), ["<", "'", "\""])
         or
diff --git a/javascript/ql/src/Security/CWE-116/IncompleteSanitization.ql b/javascript/ql/src/Security/CWE-116/IncompleteSanitization.ql
index dc92b24abef..7d0dc71a2a8 100644
--- a/javascript/ql/src/Security/CWE-116/IncompleteSanitization.ql
+++ b/javascript/ql/src/Security/CWE-116/IncompleteSanitization.ql
@@ -23,7 +23,7 @@ string metachar() { result = "'\"\\&<>\n\r\t*|{}[]%$".charAt(_) }
 
 /** Gets a string matched by `e` in a `replace` call. */
 string getAMatchedString(DataFlow::Node e) {
-  result = e.(DataFlow::RegExpLiteralNode).getRoot().getAMatchedString()
+  result = e.(DataFlow::RegExpCreationNode).getRoot().getAMatchedString()
   or
   result = e.getStringValue()
 }
@@ -52,8 +52,8 @@ predicate isSimpleAlt(RegExpAlt t) { forall(RegExpTerm ch | ch = t.getAChild() |
  * Holds if `mce` is of the form `x.replace(re, new)`, where `re` is a global
  * regular expression and `new` prefixes the matched string with a backslash.
  */
-predicate isBackslashEscape(StringReplaceCall mce, DataFlow::RegExpLiteralNode re) {
-  mce.isGlobal() and
+predicate isBackslashEscape(StringReplaceCall mce, DataFlow::RegExpCreationNode re) {
+  mce.maybeGlobal() and
   re = mce.getRegExp() and
   (
     // replacement with `\$&`, `\$1` or similar
@@ -72,7 +72,7 @@ predicate allBackslashesEscaped(DataFlow::Node nd) {
   nd instanceof JsonStringifyCall
   or
   // check whether `nd` itself escapes backslashes
-  exists(DataFlow::RegExpLiteralNode rel | isBackslashEscape(nd, rel) |
+  exists(DataFlow::RegExpCreationNode rel | isBackslashEscape(nd, rel) |
     // if it's a complex regexp, we conservatively assume that it probably escapes backslashes
     not isSimple(rel.getRoot()) or
     getAMatchedString(rel) = "\\"
@@ -143,12 +143,21 @@ predicate whitelistedRemoval(StringReplaceCall repl) {
   )
 }
 
+/**
+ * Gets a nice string representation of the pattern or value of the node.
+ */
+string getPatternOrValueString(DataFlow::Node node) {
+  if node instanceof DataFlow::RegExpConstructorInvokeNode
+  then result = "/" + node.(DataFlow::RegExpConstructorInvokeNode).getRoot() + "/"
+  else result = node.toString()
+}
+
 from StringReplaceCall repl, DataFlow::Node old, string msg
 where
   (old = repl.getArgument(0) or old = repl.getRegExp()) and
   (
-    not repl.isGlobal() and
-    msg = "This replaces only the first occurrence of " + old + "." and
+    not repl.maybeGlobal() and
+    msg = "This replaces only the first occurrence of " + getPatternOrValueString(old) + "." and
     // only flag if this is likely to be a sanitizer or URL encoder or decoder
     exists(string m | m = getAMatchedString(old) |
       // sanitizer
diff --git a/javascript/ql/src/Security/CWE-178/CaseSensitiveMiddlewarePath.ql b/javascript/ql/src/Security/CWE-178/CaseSensitiveMiddlewarePath.ql
index d16f72d4172..997ee8971a5 100644
--- a/javascript/ql/src/Security/CWE-178/CaseSensitiveMiddlewarePath.ql
+++ b/javascript/ql/src/Security/CWE-178/CaseSensitiveMiddlewarePath.ql
@@ -65,8 +65,8 @@ predicate isCaseSensitiveMiddleware(
     arg = call.getArgument(0) and
     regexp.getAReference().flowsTo(arg) and
     exists(string flags |
-      flags = regexp.getFlags() and
-      not RegExp::isIgnoreCase(flags)
+      flags = regexp.tryGetFlags() and
+      not RegExp::maybeIgnoreCase(flags)
     )
   )
 }
diff --git a/javascript/ql/src/Statements/UseOfReturnlessFunction.ql b/javascript/ql/src/Statements/UseOfReturnlessFunction.ql
index ea5f2fb9755..818f0d922d4 100644
--- a/javascript/ql/src/Statements/UseOfReturnlessFunction.ql
+++ b/javascript/ql/src/Statements/UseOfReturnlessFunction.ql
@@ -114,7 +114,7 @@ predicate hasNonVoidCallbackMethod(string name) {
   name =
     [
       "every", "filter", "find", "findIndex", "flatMap", "map", "reduce", "reduceRight", "some",
-      "sort"
+      "sort", "findLastIndex", "findLast"
     ]
 }
 
diff --git a/javascript/ql/test/library-tests/Arrays/DataFlow.expected b/javascript/ql/test/library-tests/Arrays/DataFlow.expected
index 4332f14c45e..07fabfb7270 100644
--- a/javascript/ql/test/library-tests/Arrays/DataFlow.expected
+++ b/javascript/ql/test/library-tests/Arrays/DataFlow.expected
@@ -14,6 +14,7 @@
 | arrays.js:2:16:2:23 | "source" | arrays.js:90:10:90:10 | x |
 | arrays.js:2:16:2:23 | "source" | arrays.js:93:8:93:17 | arr.at(-1) |
 | arrays.js:2:16:2:23 | "source" | arrays.js:109:8:109:24 | arr8_spread.pop() |
+| arrays.js:2:16:2:23 | "source" | arrays.js:111:8:111:33 | arr.fin ... llback) |
 | arrays.js:18:22:18:29 | "source" | arrays.js:18:50:18:50 | e |
 | arrays.js:22:15:22:22 | "source" | arrays.js:23:8:23:17 | arr2.pop() |
 | arrays.js:25:15:25:22 | "source" | arrays.js:26:8:26:17 | arr3.pop() |
@@ -25,3 +26,8 @@
 | arrays.js:53:4:53:11 | "source" | arrays.js:54:10:54:18 | ary.pop() |
 | arrays.js:99:31:99:38 | "source" | arrays.js:100:8:100:17 | arr8.pop() |
 | arrays.js:103:55:103:62 | "source" | arrays.js:105:8:105:25 | arr8_variant.pop() |
+| arrays.js:114:19:114:26 | "source" | arrays.js:115:50:115:53 | item |
+| arrays.js:114:19:114:26 | "source" | arrays.js:116:10:116:16 | element |
+| arrays.js:120:19:120:26 | "source" | arrays.js:121:46:121:49 | item |
+| arrays.js:120:19:120:26 | "source" | arrays.js:122:10:122:16 | element |
+| arrays.js:126:19:126:26 | "source" | arrays.js:127:55:127:58 | item |
diff --git a/javascript/ql/test/library-tests/Arrays/DataFlow.ql b/javascript/ql/test/library-tests/Arrays/DataFlow.ql
index 80c9f068a10..5c5f4a0d10e 100644
--- a/javascript/ql/test/library-tests/Arrays/DataFlow.ql
+++ b/javascript/ql/test/library-tests/Arrays/DataFlow.ql
@@ -3,7 +3,10 @@ import javascript
 class ArrayFlowConfig extends DataFlow::Configuration {
   ArrayFlowConfig() { this = "ArrayFlowConfig" }
 
-  override predicate isSource(DataFlow::Node source) { source.asExpr().getStringValue() = "source" }
+  override predicate isSource(DataFlow::Node source) {
+    source.asExpr().getStringValue() = "source" or
+    source.(DataFlow::CallNode).getCalleeName() = "source"
+  }
 
   override predicate isSink(DataFlow::Node sink) {
     sink = any(DataFlow::CallNode call | call.getCalleeName() = "sink").getAnArgument()
diff --git a/javascript/ql/test/library-tests/Arrays/TaintFlow.expected b/javascript/ql/test/library-tests/Arrays/TaintFlow.expected
index a531715bfb6..246a52e803b 100644
--- a/javascript/ql/test/library-tests/Arrays/TaintFlow.expected
+++ b/javascript/ql/test/library-tests/Arrays/TaintFlow.expected
@@ -15,6 +15,7 @@
 | arrays.js:2:16:2:23 | "source" | arrays.js:90:10:90:10 | x |
 | arrays.js:2:16:2:23 | "source" | arrays.js:93:8:93:17 | arr.at(-1) |
 | arrays.js:2:16:2:23 | "source" | arrays.js:109:8:109:24 | arr8_spread.pop() |
+| arrays.js:2:16:2:23 | "source" | arrays.js:111:8:111:33 | arr.fin ... llback) |
 | arrays.js:18:22:18:29 | "source" | arrays.js:18:50:18:50 | e |
 | arrays.js:22:15:22:22 | "source" | arrays.js:23:8:23:17 | arr2.pop() |
 | arrays.js:25:15:25:22 | "source" | arrays.js:26:8:26:17 | arr3.pop() |
@@ -29,3 +30,13 @@
 | arrays.js:96:9:96:16 | "source" | arrays.js:96:8:96:36 | ["sourc ... => !!x) |
 | arrays.js:99:31:99:38 | "source" | arrays.js:100:8:100:17 | arr8.pop() |
 | arrays.js:103:55:103:62 | "source" | arrays.js:105:8:105:25 | arr8_variant.pop() |
+| arrays.js:114:19:114:26 | "source" | arrays.js:115:50:115:53 | item |
+| arrays.js:114:19:114:26 | "source" | arrays.js:116:10:116:16 | element |
+| arrays.js:120:19:120:26 | "source" | arrays.js:121:46:121:49 | item |
+| arrays.js:120:19:120:26 | "source" | arrays.js:122:10:122:16 | element |
+| arrays.js:126:19:126:26 | "source" | arrays.js:127:55:127:58 | item |
+| arrays.js:131:17:131:24 | source() | arrays.js:132:46:132:49 | item |
+| arrays.js:131:17:131:24 | source() | arrays.js:133:10:133:17 | element1 |
+| arrays.js:137:17:137:24 | source() | arrays.js:138:50:138:53 | item |
+| arrays.js:137:17:137:24 | source() | arrays.js:139:10:139:17 | element1 |
+| arrays.js:143:17:143:24 | source() | arrays.js:144:55:144:58 | item |
diff --git a/javascript/ql/test/library-tests/Arrays/TaintFlow.ql b/javascript/ql/test/library-tests/Arrays/TaintFlow.ql
index cee2f294a34..d8f18759162 100644
--- a/javascript/ql/test/library-tests/Arrays/TaintFlow.ql
+++ b/javascript/ql/test/library-tests/Arrays/TaintFlow.ql
@@ -3,7 +3,10 @@ import javascript
 class ArrayTaintFlowConfig extends TaintTracking::Configuration {
   ArrayTaintFlowConfig() { this = "ArrayTaintFlowConfig" }
 
-  override predicate isSource(DataFlow::Node source) { source.asExpr().getStringValue() = "source" }
+  override predicate isSource(DataFlow::Node source) {
+    source.asExpr().getStringValue() = "source" or
+    source.(DataFlow::CallNode).getCalleeName() = "source"
+  }
 
   override predicate isSink(DataFlow::Node sink) {
     sink = any(DataFlow::CallNode call | call.getCalleeName() = "sink").getAnArgument()
diff --git a/javascript/ql/test/library-tests/Arrays/arrays.js b/javascript/ql/test/library-tests/Arrays/arrays.js
index 579741fa3aa..deedf29f6f6 100644
--- a/javascript/ql/test/library-tests/Arrays/arrays.js
+++ b/javascript/ql/test/library-tests/Arrays/arrays.js
@@ -107,4 +107,41 @@
   var arr8_spread = [];
   arr8_spread = arr8_spread.toSpliced(0, 0, ...arr);
   sink(arr8_spread.pop()); // NOT OK
+
+  sink(arr.findLast(someCallback)); // NOT OK
+
+  {  // Test for findLast function
+    const list = ["source"];
+    const element = list.findLast((item) => sink(item)); // NOT OK
+    sink(element); // NOT OK
+  }
+
+  {  // Test for find function
+    const list = ["source"];
+    const element = list.find((item) => sink(item)); // NOT OK
+    sink(element); // NOT OK
+  }
+
+  {  // Test for findLastIndex function
+    const list = ["source"];
+    const element = list.findLastIndex((item) => sink(item)); // NOT OK
+    sink(element); // OK
+  }
+  {
+    const arr = source();
+    const element1 = arr.find((item) => sink(item)); // NOT OK
+    sink(element1); // NOT OK
+  }
+
+  {
+    const arr = source();
+    const element1 = arr.findLast((item) => sink(item)); // NOT OK
+    sink(element1); // NOT OK
+  }
+  
+  {
+    const arr = source();
+    const element1 = arr.findLastIndex((item) => sink(item)); // NOT OK
+    sink(element1); // OK
+  }
 });
diff --git a/javascript/ql/test/library-tests/Arrays/printAst.expected b/javascript/ql/test/library-tests/Arrays/printAst.expected
index a7333b29485..a825b12f3fb 100644
--- a/javascript/ql/test/library-tests/Arrays/printAst.expected
+++ b/javascript/ql/test/library-tests/Arrays/printAst.expected
@@ -1,9 +1,9 @@
 nodes
-| arrays.js:1:1:110:2 | [ParExpr] (functi ... T OK }) | semmle.label | [ParExpr] (functi ... T OK }) |
-| arrays.js:1:1:110:3 | [ExprStmt] (functi ... OK }); | semmle.label | [ExprStmt] (functi ... OK }); |
-| arrays.js:1:1:110:3 | [ExprStmt] (functi ... OK }); | semmle.order | 1 |
-| arrays.js:1:2:110:1 | [FunctionExpr] functio ... OT OK } | semmle.label | [FunctionExpr] functio ... OT OK } |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | semmle.label | [BlockStmt] { let ... OT OK } |
+| arrays.js:1:1:147:2 | [ParExpr] (functi ... } }) | semmle.label | [ParExpr] (functi ... } }) |
+| arrays.js:1:1:147:3 | [ExprStmt] (functi ... } }); | semmle.label | [ExprStmt] (functi ... } }); |
+| arrays.js:1:1:147:3 | [ExprStmt] (functi ... } }); | semmle.order | 1 |
+| arrays.js:1:2:147:1 | [FunctionExpr] functio ... K } } | semmle.label | [FunctionExpr] functio ... K } } |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | semmle.label | [BlockStmt] { let ... K } } |
 | arrays.js:2:3:2:24 | [DeclStmt] let source = ... | semmle.label | [DeclStmt] let source = ... |
 | arrays.js:2:7:2:12 | [VarDecl] source | semmle.label | [VarDecl] source |
 | arrays.js:2:7:2:23 | [VariableDeclarator] source = "source" | semmle.label | [VariableDeclarator] source = "source" |
@@ -487,6 +487,146 @@ nodes
 | arrays.js:109:8:109:22 | [DotExpr] arr8_spread.pop | semmle.label | [DotExpr] arr8_spread.pop |
 | arrays.js:109:8:109:24 | [MethodCallExpr] arr8_spread.pop() | semmle.label | [MethodCallExpr] arr8_spread.pop() |
 | arrays.js:109:20:109:22 | [Label] pop | semmle.label | [Label] pop |
+| arrays.js:111:3:111:6 | [VarRef] sink | semmle.label | [VarRef] sink |
+| arrays.js:111:3:111:34 | [CallExpr] sink(ar ... lback)) | semmle.label | [CallExpr] sink(ar ... lback)) |
+| arrays.js:111:3:111:35 | [ExprStmt] sink(ar ... back)); | semmle.label | [ExprStmt] sink(ar ... back)); |
+| arrays.js:111:8:111:10 | [VarRef] arr | semmle.label | [VarRef] arr |
+| arrays.js:111:8:111:19 | [DotExpr] arr.findLast | semmle.label | [DotExpr] arr.findLast |
+| arrays.js:111:8:111:33 | [MethodCallExpr] arr.fin ... llback) | semmle.label | [MethodCallExpr] arr.fin ... llback) |
+| arrays.js:111:12:111:19 | [Label] findLast | semmle.label | [Label] findLast |
+| arrays.js:111:21:111:32 | [VarRef] someCallback | semmle.label | [VarRef] someCallback |
+| arrays.js:113:3:117:3 | [BlockStmt] { // T ... OK } | semmle.label | [BlockStmt] { // T ... OK } |
+| arrays.js:114:5:114:28 | [DeclStmt] const list = ... | semmle.label | [DeclStmt] const list = ... |
+| arrays.js:114:11:114:14 | [VarDecl] list | semmle.label | [VarDecl] list |
+| arrays.js:114:11:114:27 | [VariableDeclarator] list = ["source"] | semmle.label | [VariableDeclarator] list = ["source"] |
+| arrays.js:114:18:114:27 | [ArrayExpr] ["source"] | semmle.label | [ArrayExpr] ["source"] |
+| arrays.js:114:19:114:26 | [Literal] "source" | semmle.label | [Literal] "source" |
+| arrays.js:115:5:115:56 | [DeclStmt] const element = ... | semmle.label | [DeclStmt] const element = ... |
+| arrays.js:115:11:115:17 | [VarDecl] element | semmle.label | [VarDecl] element |
+| arrays.js:115:11:115:55 | [VariableDeclarator] element ... (item)) | semmle.label | [VariableDeclarator] element ... (item)) |
+| arrays.js:115:21:115:24 | [VarRef] list | semmle.label | [VarRef] list |
+| arrays.js:115:21:115:33 | [DotExpr] list.findLast | semmle.label | [DotExpr] list.findLast |
+| arrays.js:115:21:115:55 | [MethodCallExpr] list.fi ... (item)) | semmle.label | [MethodCallExpr] list.fi ... (item)) |
+| arrays.js:115:26:115:33 | [Label] findLast | semmle.label | [Label] findLast |
+| arrays.js:115:35:115:54 | [ArrowFunctionExpr] (item) => sink(item) | semmle.label | [ArrowFunctionExpr] (item) => sink(item) |
+| arrays.js:115:36:115:39 | [SimpleParameter] item | semmle.label | [SimpleParameter] item |
+| arrays.js:115:45:115:48 | [VarRef] sink | semmle.label | [VarRef] sink |
+| arrays.js:115:45:115:54 | [CallExpr] sink(item) | semmle.label | [CallExpr] sink(item) |
+| arrays.js:115:50:115:53 | [VarRef] item | semmle.label | [VarRef] item |
+| arrays.js:116:5:116:8 | [VarRef] sink | semmle.label | [VarRef] sink |
+| arrays.js:116:5:116:17 | [CallExpr] sink(element) | semmle.label | [CallExpr] sink(element) |
+| arrays.js:116:5:116:18 | [ExprStmt] sink(element); | semmle.label | [ExprStmt] sink(element); |
+| arrays.js:116:10:116:16 | [VarRef] element | semmle.label | [VarRef] element |
+| arrays.js:119:3:123:3 | [BlockStmt] { // T ... OK } | semmle.label | [BlockStmt] { // T ... OK } |
+| arrays.js:120:5:120:28 | [DeclStmt] const list = ... | semmle.label | [DeclStmt] const list = ... |
+| arrays.js:120:11:120:14 | [VarDecl] list | semmle.label | [VarDecl] list |
+| arrays.js:120:11:120:27 | [VariableDeclarator] list = ["source"] | semmle.label | [VariableDeclarator] list = ["source"] |
+| arrays.js:120:18:120:27 | [ArrayExpr] ["source"] | semmle.label | [ArrayExpr] ["source"] |
+| arrays.js:120:19:120:26 | [Literal] "source" | semmle.label | [Literal] "source" |
+| arrays.js:121:5:121:52 | [DeclStmt] const element = ... | semmle.label | [DeclStmt] const element = ... |
+| arrays.js:121:11:121:17 | [VarDecl] element | semmle.label | [VarDecl] element |
+| arrays.js:121:11:121:51 | [VariableDeclarator] element ... (item)) | semmle.label | [VariableDeclarator] element ... (item)) |
+| arrays.js:121:21:121:24 | [VarRef] list | semmle.label | [VarRef] list |
+| arrays.js:121:21:121:29 | [DotExpr] list.find | semmle.label | [DotExpr] list.find |
+| arrays.js:121:21:121:51 | [MethodCallExpr] list.fi ... (item)) | semmle.label | [MethodCallExpr] list.fi ... (item)) |
+| arrays.js:121:26:121:29 | [Label] find | semmle.label | [Label] find |
+| arrays.js:121:31:121:50 | [ArrowFunctionExpr] (item) => sink(item) | semmle.label | [ArrowFunctionExpr] (item) => sink(item) |
+| arrays.js:121:32:121:35 | [SimpleParameter] item | semmle.label | [SimpleParameter] item |
+| arrays.js:121:41:121:44 | [VarRef] sink | semmle.label | [VarRef] sink |
+| arrays.js:121:41:121:50 | [CallExpr] sink(item) | semmle.label | [CallExpr] sink(item) |
+| arrays.js:121:46:121:49 | [VarRef] item | semmle.label | [VarRef] item |
+| arrays.js:122:5:122:8 | [VarRef] sink | semmle.label | [VarRef] sink |
+| arrays.js:122:5:122:17 | [CallExpr] sink(element) | semmle.label | [CallExpr] sink(element) |
+| arrays.js:122:5:122:18 | [ExprStmt] sink(element); | semmle.label | [ExprStmt] sink(element); |
+| arrays.js:122:10:122:16 | [VarRef] element | semmle.label | [VarRef] element |
+| arrays.js:125:3:129:3 | [BlockStmt] { // T ... OK } | semmle.label | [BlockStmt] { // T ... OK } |
+| arrays.js:126:5:126:28 | [DeclStmt] const list = ... | semmle.label | [DeclStmt] const list = ... |
+| arrays.js:126:11:126:14 | [VarDecl] list | semmle.label | [VarDecl] list |
+| arrays.js:126:11:126:27 | [VariableDeclarator] list = ["source"] | semmle.label | [VariableDeclarator] list = ["source"] |
+| arrays.js:126:18:126:27 | [ArrayExpr] ["source"] | semmle.label | [ArrayExpr] ["source"] |
+| arrays.js:126:19:126:26 | [Literal] "source" | semmle.label | [Literal] "source" |
+| arrays.js:127:5:127:61 | [DeclStmt] const element = ... | semmle.label | [DeclStmt] const element = ... |
+| arrays.js:127:11:127:17 | [VarDecl] element | semmle.label | [VarDecl] element |
+| arrays.js:127:11:127:60 | [VariableDeclarator] element ... (item)) | semmle.label | [VariableDeclarator] element ... (item)) |
+| arrays.js:127:21:127:24 | [VarRef] list | semmle.label | [VarRef] list |
+| arrays.js:127:21:127:38 | [DotExpr] list.findLastIndex | semmle.label | [DotExpr] list.findLastIndex |
+| arrays.js:127:21:127:60 | [MethodCallExpr] list.fi ... (item)) | semmle.label | [MethodCallExpr] list.fi ... (item)) |
+| arrays.js:127:26:127:38 | [Label] findLastIndex | semmle.label | [Label] findLastIndex |
+| arrays.js:127:40:127:59 | [ArrowFunctionExpr] (item) => sink(item) | semmle.label | [ArrowFunctionExpr] (item) => sink(item) |
+| arrays.js:127:41:127:44 | [SimpleParameter] item | semmle.label | [SimpleParameter] item |
+| arrays.js:127:50:127:53 | [VarRef] sink | semmle.label | [VarRef] sink |
+| arrays.js:127:50:127:59 | [CallExpr] sink(item) | semmle.label | [CallExpr] sink(item) |
+| arrays.js:127:55:127:58 | [VarRef] item | semmle.label | [VarRef] item |
+| arrays.js:128:5:128:8 | [VarRef] sink | semmle.label | [VarRef] sink |
+| arrays.js:128:5:128:17 | [CallExpr] sink(element) | semmle.label | [CallExpr] sink(element) |
+| arrays.js:128:5:128:18 | [ExprStmt] sink(element); | semmle.label | [ExprStmt] sink(element); |
+| arrays.js:128:10:128:16 | [VarRef] element | semmle.label | [VarRef] element |
+| arrays.js:130:3:134:3 | [BlockStmt] { c ... OK } | semmle.label | [BlockStmt] { c ... OK } |
+| arrays.js:131:5:131:25 | [DeclStmt] const arr = ... | semmle.label | [DeclStmt] const arr = ... |
+| arrays.js:131:11:131:13 | [VarDecl] arr | semmle.label | [VarDecl] arr |
+| arrays.js:131:11:131:24 | [VariableDeclarator] arr = source() | semmle.label | [VariableDeclarator] arr = source() |
+| arrays.js:131:17:131:22 | [VarRef] source | semmle.label | [VarRef] source |
+| arrays.js:131:17:131:24 | [CallExpr] source() | semmle.label | [CallExpr] source() |
+| arrays.js:132:5:132:52 | [DeclStmt] const element1 = ... | semmle.label | [DeclStmt] const element1 = ... |
+| arrays.js:132:11:132:18 | [VarDecl] element1 | semmle.label | [VarDecl] element1 |
+| arrays.js:132:11:132:51 | [VariableDeclarator] element ... (item)) | semmle.label | [VariableDeclarator] element ... (item)) |
+| arrays.js:132:22:132:24 | [VarRef] arr | semmle.label | [VarRef] arr |
+| arrays.js:132:22:132:29 | [DotExpr] arr.find | semmle.label | [DotExpr] arr.find |
+| arrays.js:132:22:132:51 | [MethodCallExpr] arr.fin ... (item)) | semmle.label | [MethodCallExpr] arr.fin ... (item)) |
+| arrays.js:132:26:132:29 | [Label] find | semmle.label | [Label] find |
+| arrays.js:132:31:132:50 | [ArrowFunctionExpr] (item) => sink(item) | semmle.label | [ArrowFunctionExpr] (item) => sink(item) |
+| arrays.js:132:32:132:35 | [SimpleParameter] item | semmle.label | [SimpleParameter] item |
+| arrays.js:132:41:132:44 | [VarRef] sink | semmle.label | [VarRef] sink |
+| arrays.js:132:41:132:50 | [CallExpr] sink(item) | semmle.label | [CallExpr] sink(item) |
+| arrays.js:132:46:132:49 | [VarRef] item | semmle.label | [VarRef] item |
+| arrays.js:133:5:133:8 | [VarRef] sink | semmle.label | [VarRef] sink |
+| arrays.js:133:5:133:18 | [CallExpr] sink(element1) | semmle.label | [CallExpr] sink(element1) |
+| arrays.js:133:5:133:19 | [ExprStmt] sink(element1); | semmle.label | [ExprStmt] sink(element1); |
+| arrays.js:133:10:133:17 | [VarRef] element1 | semmle.label | [VarRef] element1 |
+| arrays.js:136:3:140:3 | [BlockStmt] { c ... OK } | semmle.label | [BlockStmt] { c ... OK } |
+| arrays.js:137:5:137:25 | [DeclStmt] const arr = ... | semmle.label | [DeclStmt] const arr = ... |
+| arrays.js:137:11:137:13 | [VarDecl] arr | semmle.label | [VarDecl] arr |
+| arrays.js:137:11:137:24 | [VariableDeclarator] arr = source() | semmle.label | [VariableDeclarator] arr = source() |
+| arrays.js:137:17:137:22 | [VarRef] source | semmle.label | [VarRef] source |
+| arrays.js:137:17:137:24 | [CallExpr] source() | semmle.label | [CallExpr] source() |
+| arrays.js:138:5:138:56 | [DeclStmt] const element1 = ... | semmle.label | [DeclStmt] const element1 = ... |
+| arrays.js:138:11:138:18 | [VarDecl] element1 | semmle.label | [VarDecl] element1 |
+| arrays.js:138:11:138:55 | [VariableDeclarator] element ... (item)) | semmle.label | [VariableDeclarator] element ... (item)) |
+| arrays.js:138:22:138:24 | [VarRef] arr | semmle.label | [VarRef] arr |
+| arrays.js:138:22:138:33 | [DotExpr] arr.findLast | semmle.label | [DotExpr] arr.findLast |
+| arrays.js:138:22:138:55 | [MethodCallExpr] arr.fin ... (item)) | semmle.label | [MethodCallExpr] arr.fin ... (item)) |
+| arrays.js:138:26:138:33 | [Label] findLast | semmle.label | [Label] findLast |
+| arrays.js:138:35:138:54 | [ArrowFunctionExpr] (item) => sink(item) | semmle.label | [ArrowFunctionExpr] (item) => sink(item) |
+| arrays.js:138:36:138:39 | [SimpleParameter] item | semmle.label | [SimpleParameter] item |
+| arrays.js:138:45:138:48 | [VarRef] sink | semmle.label | [VarRef] sink |
+| arrays.js:138:45:138:54 | [CallExpr] sink(item) | semmle.label | [CallExpr] sink(item) |
+| arrays.js:138:50:138:53 | [VarRef] item | semmle.label | [VarRef] item |
+| arrays.js:139:5:139:8 | [VarRef] sink | semmle.label | [VarRef] sink |
+| arrays.js:139:5:139:18 | [CallExpr] sink(element1) | semmle.label | [CallExpr] sink(element1) |
+| arrays.js:139:5:139:19 | [ExprStmt] sink(element1); | semmle.label | [ExprStmt] sink(element1); |
+| arrays.js:139:10:139:17 | [VarRef] element1 | semmle.label | [VarRef] element1 |
+| arrays.js:142:3:146:3 | [BlockStmt] { c ... OK } | semmle.label | [BlockStmt] { c ... OK } |
+| arrays.js:143:5:143:25 | [DeclStmt] const arr = ... | semmle.label | [DeclStmt] const arr = ... |
+| arrays.js:143:11:143:13 | [VarDecl] arr | semmle.label | [VarDecl] arr |
+| arrays.js:143:11:143:24 | [VariableDeclarator] arr = source() | semmle.label | [VariableDeclarator] arr = source() |
+| arrays.js:143:17:143:22 | [VarRef] source | semmle.label | [VarRef] source |
+| arrays.js:143:17:143:24 | [CallExpr] source() | semmle.label | [CallExpr] source() |
+| arrays.js:144:5:144:61 | [DeclStmt] const element1 = ... | semmle.label | [DeclStmt] const element1 = ... |
+| arrays.js:144:11:144:18 | [VarDecl] element1 | semmle.label | [VarDecl] element1 |
+| arrays.js:144:11:144:60 | [VariableDeclarator] element ... (item)) | semmle.label | [VariableDeclarator] element ... (item)) |
+| arrays.js:144:22:144:24 | [VarRef] arr | semmle.label | [VarRef] arr |
+| arrays.js:144:22:144:38 | [DotExpr] arr.findLastIndex | semmle.label | [DotExpr] arr.findLastIndex |
+| arrays.js:144:22:144:60 | [MethodCallExpr] arr.fin ... (item)) | semmle.label | [MethodCallExpr] arr.fin ... (item)) |
+| arrays.js:144:26:144:38 | [Label] findLastIndex | semmle.label | [Label] findLastIndex |
+| arrays.js:144:40:144:59 | [ArrowFunctionExpr] (item) => sink(item) | semmle.label | [ArrowFunctionExpr] (item) => sink(item) |
+| arrays.js:144:41:144:44 | [SimpleParameter] item | semmle.label | [SimpleParameter] item |
+| arrays.js:144:50:144:53 | [VarRef] sink | semmle.label | [VarRef] sink |
+| arrays.js:144:50:144:59 | [CallExpr] sink(item) | semmle.label | [CallExpr] sink(item) |
+| arrays.js:144:55:144:58 | [VarRef] item | semmle.label | [VarRef] item |
+| arrays.js:145:5:145:8 | [VarRef] sink | semmle.label | [VarRef] sink |
+| arrays.js:145:5:145:18 | [CallExpr] sink(element1) | semmle.label | [CallExpr] sink(element1) |
+| arrays.js:145:5:145:19 | [ExprStmt] sink(element1); | semmle.label | [ExprStmt] sink(element1); |
+| arrays.js:145:10:145:17 | [VarRef] element1 | semmle.label | [VarRef] element1 |
 | file://:0:0:0:0 | (Arguments) | semmle.label | (Arguments) |
 | file://:0:0:0:0 | (Arguments) | semmle.label | (Arguments) |
 | file://:0:0:0:0 | (Arguments) | semmle.label | (Arguments) |
@@ -544,6 +684,32 @@ nodes
 | file://:0:0:0:0 | (Arguments) | semmle.label | (Arguments) |
 | file://:0:0:0:0 | (Arguments) | semmle.label | (Arguments) |
 | file://:0:0:0:0 | (Arguments) | semmle.label | (Arguments) |
+| file://:0:0:0:0 | (Arguments) | semmle.label | (Arguments) |
+| file://:0:0:0:0 | (Arguments) | semmle.label | (Arguments) |
+| file://:0:0:0:0 | (Arguments) | semmle.label | (Arguments) |
+| file://:0:0:0:0 | (Arguments) | semmle.label | (Arguments) |
+| file://:0:0:0:0 | (Arguments) | semmle.label | (Arguments) |
+| file://:0:0:0:0 | (Arguments) | semmle.label | (Arguments) |
+| file://:0:0:0:0 | (Arguments) | semmle.label | (Arguments) |
+| file://:0:0:0:0 | (Arguments) | semmle.label | (Arguments) |
+| file://:0:0:0:0 | (Arguments) | semmle.label | (Arguments) |
+| file://:0:0:0:0 | (Arguments) | semmle.label | (Arguments) |
+| file://:0:0:0:0 | (Arguments) | semmle.label | (Arguments) |
+| file://:0:0:0:0 | (Arguments) | semmle.label | (Arguments) |
+| file://:0:0:0:0 | (Arguments) | semmle.label | (Arguments) |
+| file://:0:0:0:0 | (Arguments) | semmle.label | (Arguments) |
+| file://:0:0:0:0 | (Arguments) | semmle.label | (Arguments) |
+| file://:0:0:0:0 | (Arguments) | semmle.label | (Arguments) |
+| file://:0:0:0:0 | (Arguments) | semmle.label | (Arguments) |
+| file://:0:0:0:0 | (Arguments) | semmle.label | (Arguments) |
+| file://:0:0:0:0 | (Arguments) | semmle.label | (Arguments) |
+| file://:0:0:0:0 | (Arguments) | semmle.label | (Arguments) |
+| file://:0:0:0:0 | (Parameters) | semmle.label | (Parameters) |
+| file://:0:0:0:0 | (Parameters) | semmle.label | (Parameters) |
+| file://:0:0:0:0 | (Parameters) | semmle.label | (Parameters) |
+| file://:0:0:0:0 | (Parameters) | semmle.label | (Parameters) |
+| file://:0:0:0:0 | (Parameters) | semmle.label | (Parameters) |
+| file://:0:0:0:0 | (Parameters) | semmle.label | (Parameters) |
 | file://:0:0:0:0 | (Parameters) | semmle.label | (Parameters) |
 | file://:0:0:0:0 | (Parameters) | semmle.label | (Parameters) |
 | file://:0:0:0:0 | (Parameters) | semmle.label | (Parameters) |
@@ -552,128 +718,142 @@ nodes
 | file://:0:0:0:0 | (Parameters) | semmle.label | (Parameters) |
 | file://:0:0:0:0 | (Parameters) | semmle.label | (Parameters) |
 edges
-| arrays.js:1:1:110:2 | [ParExpr] (functi ... T OK }) | arrays.js:1:2:110:1 | [FunctionExpr] functio ... OT OK } | semmle.label | 1 |
-| arrays.js:1:1:110:2 | [ParExpr] (functi ... T OK }) | arrays.js:1:2:110:1 | [FunctionExpr] functio ... OT OK } | semmle.order | 1 |
-| arrays.js:1:1:110:3 | [ExprStmt] (functi ... OK }); | arrays.js:1:1:110:2 | [ParExpr] (functi ... T OK }) | semmle.label | 1 |
-| arrays.js:1:1:110:3 | [ExprStmt] (functi ... OK }); | arrays.js:1:1:110:2 | [ParExpr] (functi ... T OK }) | semmle.order | 1 |
-| arrays.js:1:2:110:1 | [FunctionExpr] functio ... OT OK } | arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | semmle.label | 5 |
-| arrays.js:1:2:110:1 | [FunctionExpr] functio ... OT OK } | arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | semmle.order | 5 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:2:3:2:24 | [DeclStmt] let source = ... | semmle.label | 1 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:2:3:2:24 | [DeclStmt] let source = ... | semmle.order | 1 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:4:3:4:28 | [DeclStmt] var obj = ... | semmle.label | 2 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:4:3:4:28 | [DeclStmt] var obj = ... | semmle.order | 2 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:5:3:5:16 | [ExprStmt] sink(obj.foo); | semmle.label | 3 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:5:3:5:16 | [ExprStmt] sink(obj.foo); | semmle.order | 3 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:7:3:7:15 | [DeclStmt] var arr = ... | semmle.label | 4 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:7:3:7:15 | [DeclStmt] var arr = ... | semmle.order | 4 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:8:3:8:19 | [ExprStmt] arr.push(source); | semmle.label | 5 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:8:3:8:19 | [ExprStmt] arr.push(source); | semmle.order | 5 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:10:3:12:3 | [ForStmt] for (va ... OK } | semmle.label | 6 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:10:3:12:3 | [ForStmt] for (va ... OK } | semmle.order | 6 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:15:3:15:30 | [ExprStmt] arr.for ... nk(e)); | semmle.label | 7 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:15:3:15:30 | [ExprStmt] arr.for ... nk(e)); | semmle.order | 7 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:16:3:16:26 | [ExprStmt] arr.map ... nk(e)); | semmle.label | 8 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:16:3:16:26 | [ExprStmt] arr.map ... nk(e)); | semmle.order | 8 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:18:3:18:53 | [ExprStmt] [1, 2, ... nk(e)); | semmle.label | 9 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:18:3:18:53 | [ExprStmt] [1, 2, ... nk(e)); | semmle.order | 9 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:20:3:20:18 | [ExprStmt] sink(arr.pop()); | semmle.label | 10 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:20:3:20:18 | [ExprStmt] sink(arr.pop()); | semmle.order | 10 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:22:3:22:24 | [DeclStmt] var arr2 = ... | semmle.label | 11 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:22:3:22:24 | [DeclStmt] var arr2 = ... | semmle.order | 11 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:23:3:23:19 | [ExprStmt] sink(arr2.pop()); | semmle.label | 12 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:23:3:23:19 | [ExprStmt] sink(arr2.pop()); | semmle.order | 12 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:25:3:25:24 | [DeclStmt] var arr3 = ... | semmle.label | 13 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:25:3:25:24 | [DeclStmt] var arr3 = ... | semmle.order | 13 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:26:3:26:19 | [ExprStmt] sink(arr3.pop()); | semmle.label | 14 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:26:3:26:19 | [ExprStmt] sink(arr3.pop()); | semmle.order | 14 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:28:3:28:16 | [DeclStmt] var arr4 = ... | semmle.label | 15 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:28:3:28:16 | [DeclStmt] var arr4 = ... | semmle.order | 15 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:29:3:29:30 | [ExprStmt] arr4.sp ... urce"); | semmle.label | 16 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:29:3:29:30 | [ExprStmt] arr4.sp ... urce"); | semmle.order | 16 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:30:3:30:19 | [ExprStmt] sink(arr4.pop()); | semmle.label | 17 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:30:3:30:19 | [ExprStmt] sink(arr4.pop()); | semmle.order | 17 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:32:3:32:24 | [DeclStmt] var arr4_variant = ... | semmle.label | 18 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:32:3:32:24 | [DeclStmt] var arr4_variant = ... | semmle.order | 18 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:33:3:33:46 | [ExprStmt] arr4_va ... urce"); | semmle.label | 19 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:33:3:33:46 | [ExprStmt] arr4_va ... urce"); | semmle.order | 19 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:34:3:34:21 | [ExprStmt] arr4_variant.pop(); | semmle.label | 20 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:34:3:34:21 | [ExprStmt] arr4_variant.pop(); | semmle.order | 20 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:35:3:35:27 | [ExprStmt] sink(ar ... pop()); | semmle.label | 21 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:35:3:35:27 | [ExprStmt] sink(ar ... pop()); | semmle.order | 21 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:37:3:37:23 | [DeclStmt] var arr4_spread = ... | semmle.label | 22 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:37:3:37:23 | [DeclStmt] var arr4_spread = ... | semmle.order | 22 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:38:3:38:35 | [ExprStmt] arr4_sp ... ..arr); | semmle.label | 23 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:38:3:38:35 | [ExprStmt] arr4_sp ... ..arr); | semmle.order | 23 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:39:3:39:26 | [ExprStmt] sink(ar ... pop()); | semmle.label | 24 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:39:3:39:26 | [ExprStmt] sink(ar ... pop()); | semmle.order | 24 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:41:3:41:29 | [DeclStmt] var arr5 = ... | semmle.label | 25 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:41:3:41:29 | [DeclStmt] var arr5 = ... | semmle.order | 25 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:42:3:42:19 | [ExprStmt] sink(arr5.pop()); | semmle.label | 26 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:42:3:42:19 | [ExprStmt] sink(arr5.pop()); | semmle.order | 26 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:44:3:44:28 | [ExprStmt] sink(ar ... pop()); | semmle.label | 27 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:44:3:44:28 | [ExprStmt] sink(ar ... pop()); | semmle.order | 27 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:46:3:46:16 | [DeclStmt] var arr6 = ... | semmle.label | 28 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:46:3:46:16 | [DeclStmt] var arr6 = ... | semmle.order | 28 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:47:3:49:3 | [ForStmt] for (va ... i]; } | semmle.label | 29 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:47:3:49:3 | [ForStmt] for (va ... i]; } | semmle.order | 29 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:50:3:50:19 | [ExprStmt] sink(arr6.pop()); | semmle.label | 30 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:50:3:50:19 | [ExprStmt] sink(arr6.pop()); | semmle.order | 30 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:53:3:56:5 | [ExprStmt] ["sourc ... . }); | semmle.label | 31 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:53:3:56:5 | [ExprStmt] ["sourc ... . }); | semmle.order | 31 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:58:3:58:15 | [ExprStmt] sink(arr[0]); | semmle.label | 32 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:58:3:58:15 | [ExprStmt] sink(arr[0]); | semmle.order | 32 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:60:3:62:3 | [ForOfStmt] for (co ... OK } | semmle.label | 33 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:60:3:62:3 | [ForOfStmt] for (co ... OK } | semmle.order | 33 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:64:3:66:3 | [ForOfStmt] for (co ... OK } | semmle.label | 34 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:64:3:66:3 | [ForOfStmt] for (co ... OK } | semmle.order | 34 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:68:3:70:3 | [ForOfStmt] for (co ... OK } | semmle.label | 35 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:68:3:70:3 | [ForOfStmt] for (co ... OK } | semmle.order | 35 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:72:3:72:16 | [DeclStmt] var arr7 = ... | semmle.label | 36 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:72:3:72:16 | [DeclStmt] var arr7 = ... | semmle.order | 36 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:73:3:73:20 | [ExprStmt] arr7.push(...arr); | semmle.label | 37 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:73:3:73:20 | [ExprStmt] arr7.push(...arr); | semmle.order | 37 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:74:3:76:3 | [ForOfStmt] for (co ... OK } | semmle.label | 38 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:74:3:76:3 | [ForOfStmt] for (co ... OK } | semmle.order | 38 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:78:3:78:42 | [DeclStmt] const arrayFrom = ... | semmle.label | 39 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:78:3:78:42 | [DeclStmt] const arrayFrom = ... | semmle.order | 39 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:79:3:81:3 | [ForOfStmt] for (co ... OK } | semmle.label | 40 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:79:3:81:3 | [ForOfStmt] for (co ... OK } | semmle.order | 40 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:83:3:83:31 | [ExprStmt] sink(ar ... back)); | semmle.label | 41 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:83:3:83:31 | [ExprStmt] sink(ar ... back)); | semmle.order | 41 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:85:3:85:42 | [DeclStmt] const arrayFind = ... | semmle.label | 42 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:85:3:85:42 | [DeclStmt] const arrayFind = ... | semmle.order | 42 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:86:3:86:37 | [ExprStmt] sink(ar ... back)); | semmle.label | 43 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:86:3:86:37 | [ExprStmt] sink(ar ... back)); | semmle.order | 43 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:88:3:88:31 | [DeclStmt] const uniq = ... | semmle.label | 44 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:88:3:88:31 | [DeclStmt] const uniq = ... | semmle.order | 44 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:89:3:91:3 | [ForOfStmt] for (co ... OK } | semmle.label | 45 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:89:3:91:3 | [ForOfStmt] for (co ... OK } | semmle.order | 45 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:93:3:93:19 | [ExprStmt] sink(arr.at(-1)); | semmle.label | 46 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:93:3:93:19 | [ExprStmt] sink(arr.at(-1)); | semmle.order | 46 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:95:3:95:36 | [ExprStmt] sink([" ... => x)); | semmle.label | 47 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:95:3:95:36 | [ExprStmt] sink([" ... => x)); | semmle.order | 47 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:96:3:96:38 | [ExprStmt] sink([" ... !!x)); | semmle.label | 48 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:96:3:96:38 | [ExprStmt] sink([" ... !!x)); | semmle.order | 48 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:98:3:98:16 | [DeclStmt] var arr8 = ... | semmle.label | 49 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:98:3:98:16 | [DeclStmt] var arr8 = ... | semmle.order | 49 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:99:3:99:40 | [ExprStmt] arr8 = ... urce"); | semmle.label | 50 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:99:3:99:40 | [ExprStmt] arr8 = ... urce"); | semmle.order | 50 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:100:3:100:19 | [ExprStmt] sink(arr8.pop()); | semmle.label | 51 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:100:3:100:19 | [ExprStmt] sink(arr8.pop()); | semmle.order | 51 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:102:3:102:24 | [DeclStmt] var arr8_variant = ... | semmle.label | 52 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:102:3:102:24 | [DeclStmt] var arr8_variant = ... | semmle.order | 52 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:103:3:103:64 | [ExprStmt] arr8_va ... urce"); | semmle.label | 53 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:103:3:103:64 | [ExprStmt] arr8_va ... urce"); | semmle.order | 53 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:104:3:104:21 | [ExprStmt] arr8_variant.pop(); | semmle.label | 54 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:104:3:104:21 | [ExprStmt] arr8_variant.pop(); | semmle.order | 54 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:105:3:105:27 | [ExprStmt] sink(ar ... pop()); | semmle.label | 55 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:105:3:105:27 | [ExprStmt] sink(ar ... pop()); | semmle.order | 55 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:107:3:107:23 | [DeclStmt] var arr8_spread = ... | semmle.label | 56 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:107:3:107:23 | [DeclStmt] var arr8_spread = ... | semmle.order | 56 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:108:3:108:52 | [ExprStmt] arr8_sp ... ..arr); | semmle.label | 57 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:108:3:108:52 | [ExprStmt] arr8_sp ... ..arr); | semmle.order | 57 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:109:3:109:26 | [ExprStmt] sink(ar ... pop()); | semmle.label | 58 |
-| arrays.js:1:14:110:1 | [BlockStmt] { let ... OT OK } | arrays.js:109:3:109:26 | [ExprStmt] sink(ar ... pop()); | semmle.order | 58 |
+| arrays.js:1:1:147:2 | [ParExpr] (functi ... } }) | arrays.js:1:2:147:1 | [FunctionExpr] functio ... K } } | semmle.label | 1 |
+| arrays.js:1:1:147:2 | [ParExpr] (functi ... } }) | arrays.js:1:2:147:1 | [FunctionExpr] functio ... K } } | semmle.order | 1 |
+| arrays.js:1:1:147:3 | [ExprStmt] (functi ... } }); | arrays.js:1:1:147:2 | [ParExpr] (functi ... } }) | semmle.label | 1 |
+| arrays.js:1:1:147:3 | [ExprStmt] (functi ... } }); | arrays.js:1:1:147:2 | [ParExpr] (functi ... } }) | semmle.order | 1 |
+| arrays.js:1:2:147:1 | [FunctionExpr] functio ... K } } | arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | semmle.label | 5 |
+| arrays.js:1:2:147:1 | [FunctionExpr] functio ... K } } | arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | semmle.order | 5 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:2:3:2:24 | [DeclStmt] let source = ... | semmle.label | 1 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:2:3:2:24 | [DeclStmt] let source = ... | semmle.order | 1 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:4:3:4:28 | [DeclStmt] var obj = ... | semmle.label | 2 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:4:3:4:28 | [DeclStmt] var obj = ... | semmle.order | 2 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:5:3:5:16 | [ExprStmt] sink(obj.foo); | semmle.label | 3 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:5:3:5:16 | [ExprStmt] sink(obj.foo); | semmle.order | 3 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:7:3:7:15 | [DeclStmt] var arr = ... | semmle.label | 4 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:7:3:7:15 | [DeclStmt] var arr = ... | semmle.order | 4 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:8:3:8:19 | [ExprStmt] arr.push(source); | semmle.label | 5 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:8:3:8:19 | [ExprStmt] arr.push(source); | semmle.order | 5 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:10:3:12:3 | [ForStmt] for (va ... OK } | semmle.label | 6 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:10:3:12:3 | [ForStmt] for (va ... OK } | semmle.order | 6 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:15:3:15:30 | [ExprStmt] arr.for ... nk(e)); | semmle.label | 7 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:15:3:15:30 | [ExprStmt] arr.for ... nk(e)); | semmle.order | 7 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:16:3:16:26 | [ExprStmt] arr.map ... nk(e)); | semmle.label | 8 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:16:3:16:26 | [ExprStmt] arr.map ... nk(e)); | semmle.order | 8 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:18:3:18:53 | [ExprStmt] [1, 2, ... nk(e)); | semmle.label | 9 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:18:3:18:53 | [ExprStmt] [1, 2, ... nk(e)); | semmle.order | 9 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:20:3:20:18 | [ExprStmt] sink(arr.pop()); | semmle.label | 10 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:20:3:20:18 | [ExprStmt] sink(arr.pop()); | semmle.order | 10 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:22:3:22:24 | [DeclStmt] var arr2 = ... | semmle.label | 11 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:22:3:22:24 | [DeclStmt] var arr2 = ... | semmle.order | 11 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:23:3:23:19 | [ExprStmt] sink(arr2.pop()); | semmle.label | 12 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:23:3:23:19 | [ExprStmt] sink(arr2.pop()); | semmle.order | 12 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:25:3:25:24 | [DeclStmt] var arr3 = ... | semmle.label | 13 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:25:3:25:24 | [DeclStmt] var arr3 = ... | semmle.order | 13 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:26:3:26:19 | [ExprStmt] sink(arr3.pop()); | semmle.label | 14 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:26:3:26:19 | [ExprStmt] sink(arr3.pop()); | semmle.order | 14 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:28:3:28:16 | [DeclStmt] var arr4 = ... | semmle.label | 15 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:28:3:28:16 | [DeclStmt] var arr4 = ... | semmle.order | 15 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:29:3:29:30 | [ExprStmt] arr4.sp ... urce"); | semmle.label | 16 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:29:3:29:30 | [ExprStmt] arr4.sp ... urce"); | semmle.order | 16 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:30:3:30:19 | [ExprStmt] sink(arr4.pop()); | semmle.label | 17 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:30:3:30:19 | [ExprStmt] sink(arr4.pop()); | semmle.order | 17 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:32:3:32:24 | [DeclStmt] var arr4_variant = ... | semmle.label | 18 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:32:3:32:24 | [DeclStmt] var arr4_variant = ... | semmle.order | 18 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:33:3:33:46 | [ExprStmt] arr4_va ... urce"); | semmle.label | 19 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:33:3:33:46 | [ExprStmt] arr4_va ... urce"); | semmle.order | 19 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:34:3:34:21 | [ExprStmt] arr4_variant.pop(); | semmle.label | 20 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:34:3:34:21 | [ExprStmt] arr4_variant.pop(); | semmle.order | 20 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:35:3:35:27 | [ExprStmt] sink(ar ... pop()); | semmle.label | 21 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:35:3:35:27 | [ExprStmt] sink(ar ... pop()); | semmle.order | 21 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:37:3:37:23 | [DeclStmt] var arr4_spread = ... | semmle.label | 22 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:37:3:37:23 | [DeclStmt] var arr4_spread = ... | semmle.order | 22 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:38:3:38:35 | [ExprStmt] arr4_sp ... ..arr); | semmle.label | 23 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:38:3:38:35 | [ExprStmt] arr4_sp ... ..arr); | semmle.order | 23 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:39:3:39:26 | [ExprStmt] sink(ar ... pop()); | semmle.label | 24 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:39:3:39:26 | [ExprStmt] sink(ar ... pop()); | semmle.order | 24 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:41:3:41:29 | [DeclStmt] var arr5 = ... | semmle.label | 25 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:41:3:41:29 | [DeclStmt] var arr5 = ... | semmle.order | 25 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:42:3:42:19 | [ExprStmt] sink(arr5.pop()); | semmle.label | 26 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:42:3:42:19 | [ExprStmt] sink(arr5.pop()); | semmle.order | 26 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:44:3:44:28 | [ExprStmt] sink(ar ... pop()); | semmle.label | 27 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:44:3:44:28 | [ExprStmt] sink(ar ... pop()); | semmle.order | 27 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:46:3:46:16 | [DeclStmt] var arr6 = ... | semmle.label | 28 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:46:3:46:16 | [DeclStmt] var arr6 = ... | semmle.order | 28 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:47:3:49:3 | [ForStmt] for (va ... i]; } | semmle.label | 29 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:47:3:49:3 | [ForStmt] for (va ... i]; } | semmle.order | 29 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:50:3:50:19 | [ExprStmt] sink(arr6.pop()); | semmle.label | 30 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:50:3:50:19 | [ExprStmt] sink(arr6.pop()); | semmle.order | 30 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:53:3:56:5 | [ExprStmt] ["sourc ... . }); | semmle.label | 31 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:53:3:56:5 | [ExprStmt] ["sourc ... . }); | semmle.order | 31 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:58:3:58:15 | [ExprStmt] sink(arr[0]); | semmle.label | 32 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:58:3:58:15 | [ExprStmt] sink(arr[0]); | semmle.order | 32 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:60:3:62:3 | [ForOfStmt] for (co ... OK } | semmle.label | 33 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:60:3:62:3 | [ForOfStmt] for (co ... OK } | semmle.order | 33 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:64:3:66:3 | [ForOfStmt] for (co ... OK } | semmle.label | 34 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:64:3:66:3 | [ForOfStmt] for (co ... OK } | semmle.order | 34 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:68:3:70:3 | [ForOfStmt] for (co ... OK } | semmle.label | 35 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:68:3:70:3 | [ForOfStmt] for (co ... OK } | semmle.order | 35 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:72:3:72:16 | [DeclStmt] var arr7 = ... | semmle.label | 36 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:72:3:72:16 | [DeclStmt] var arr7 = ... | semmle.order | 36 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:73:3:73:20 | [ExprStmt] arr7.push(...arr); | semmle.label | 37 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:73:3:73:20 | [ExprStmt] arr7.push(...arr); | semmle.order | 37 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:74:3:76:3 | [ForOfStmt] for (co ... OK } | semmle.label | 38 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:74:3:76:3 | [ForOfStmt] for (co ... OK } | semmle.order | 38 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:78:3:78:42 | [DeclStmt] const arrayFrom = ... | semmle.label | 39 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:78:3:78:42 | [DeclStmt] const arrayFrom = ... | semmle.order | 39 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:79:3:81:3 | [ForOfStmt] for (co ... OK } | semmle.label | 40 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:79:3:81:3 | [ForOfStmt] for (co ... OK } | semmle.order | 40 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:83:3:83:31 | [ExprStmt] sink(ar ... back)); | semmle.label | 41 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:83:3:83:31 | [ExprStmt] sink(ar ... back)); | semmle.order | 41 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:85:3:85:42 | [DeclStmt] const arrayFind = ... | semmle.label | 42 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:85:3:85:42 | [DeclStmt] const arrayFind = ... | semmle.order | 42 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:86:3:86:37 | [ExprStmt] sink(ar ... back)); | semmle.label | 43 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:86:3:86:37 | [ExprStmt] sink(ar ... back)); | semmle.order | 43 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:88:3:88:31 | [DeclStmt] const uniq = ... | semmle.label | 44 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:88:3:88:31 | [DeclStmt] const uniq = ... | semmle.order | 44 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:89:3:91:3 | [ForOfStmt] for (co ... OK } | semmle.label | 45 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:89:3:91:3 | [ForOfStmt] for (co ... OK } | semmle.order | 45 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:93:3:93:19 | [ExprStmt] sink(arr.at(-1)); | semmle.label | 46 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:93:3:93:19 | [ExprStmt] sink(arr.at(-1)); | semmle.order | 46 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:95:3:95:36 | [ExprStmt] sink([" ... => x)); | semmle.label | 47 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:95:3:95:36 | [ExprStmt] sink([" ... => x)); | semmle.order | 47 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:96:3:96:38 | [ExprStmt] sink([" ... !!x)); | semmle.label | 48 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:96:3:96:38 | [ExprStmt] sink([" ... !!x)); | semmle.order | 48 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:98:3:98:16 | [DeclStmt] var arr8 = ... | semmle.label | 49 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:98:3:98:16 | [DeclStmt] var arr8 = ... | semmle.order | 49 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:99:3:99:40 | [ExprStmt] arr8 = ... urce"); | semmle.label | 50 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:99:3:99:40 | [ExprStmt] arr8 = ... urce"); | semmle.order | 50 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:100:3:100:19 | [ExprStmt] sink(arr8.pop()); | semmle.label | 51 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:100:3:100:19 | [ExprStmt] sink(arr8.pop()); | semmle.order | 51 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:102:3:102:24 | [DeclStmt] var arr8_variant = ... | semmle.label | 52 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:102:3:102:24 | [DeclStmt] var arr8_variant = ... | semmle.order | 52 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:103:3:103:64 | [ExprStmt] arr8_va ... urce"); | semmle.label | 53 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:103:3:103:64 | [ExprStmt] arr8_va ... urce"); | semmle.order | 53 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:104:3:104:21 | [ExprStmt] arr8_variant.pop(); | semmle.label | 54 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:104:3:104:21 | [ExprStmt] arr8_variant.pop(); | semmle.order | 54 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:105:3:105:27 | [ExprStmt] sink(ar ... pop()); | semmle.label | 55 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:105:3:105:27 | [ExprStmt] sink(ar ... pop()); | semmle.order | 55 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:107:3:107:23 | [DeclStmt] var arr8_spread = ... | semmle.label | 56 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:107:3:107:23 | [DeclStmt] var arr8_spread = ... | semmle.order | 56 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:108:3:108:52 | [ExprStmt] arr8_sp ... ..arr); | semmle.label | 57 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:108:3:108:52 | [ExprStmt] arr8_sp ... ..arr); | semmle.order | 57 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:109:3:109:26 | [ExprStmt] sink(ar ... pop()); | semmle.label | 58 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:109:3:109:26 | [ExprStmt] sink(ar ... pop()); | semmle.order | 58 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:111:3:111:35 | [ExprStmt] sink(ar ... back)); | semmle.label | 59 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:111:3:111:35 | [ExprStmt] sink(ar ... back)); | semmle.order | 59 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:113:3:117:3 | [BlockStmt] { // T ... OK } | semmle.label | 60 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:113:3:117:3 | [BlockStmt] { // T ... OK } | semmle.order | 60 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:119:3:123:3 | [BlockStmt] { // T ... OK } | semmle.label | 61 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:119:3:123:3 | [BlockStmt] { // T ... OK } | semmle.order | 61 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:125:3:129:3 | [BlockStmt] { // T ... OK } | semmle.label | 62 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:125:3:129:3 | [BlockStmt] { // T ... OK } | semmle.order | 62 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:130:3:134:3 | [BlockStmt] { c ... OK } | semmle.label | 63 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:130:3:134:3 | [BlockStmt] { c ... OK } | semmle.order | 63 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:136:3:140:3 | [BlockStmt] { c ... OK } | semmle.label | 64 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:136:3:140:3 | [BlockStmt] { c ... OK } | semmle.order | 64 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:142:3:146:3 | [BlockStmt] { c ... OK } | semmle.label | 65 |
+| arrays.js:1:14:147:1 | [BlockStmt] { let ... K } } | arrays.js:142:3:146:3 | [BlockStmt] { c ... OK } | semmle.order | 65 |
 | arrays.js:2:3:2:24 | [DeclStmt] let source = ... | arrays.js:2:7:2:23 | [VariableDeclarator] source = "source" | semmle.label | 1 |
 | arrays.js:2:3:2:24 | [DeclStmt] let source = ... | arrays.js:2:7:2:23 | [VariableDeclarator] source = "source" | semmle.order | 1 |
 | arrays.js:2:7:2:23 | [VariableDeclarator] source = "source" | arrays.js:2:7:2:12 | [VarDecl] source | semmle.label | 1 |
@@ -1490,6 +1670,272 @@ edges
 | arrays.js:109:8:109:22 | [DotExpr] arr8_spread.pop | arrays.js:109:20:109:22 | [Label] pop | semmle.order | 2 |
 | arrays.js:109:8:109:24 | [MethodCallExpr] arr8_spread.pop() | arrays.js:109:8:109:22 | [DotExpr] arr8_spread.pop | semmle.label | 0 |
 | arrays.js:109:8:109:24 | [MethodCallExpr] arr8_spread.pop() | arrays.js:109:8:109:22 | [DotExpr] arr8_spread.pop | semmle.order | 0 |
+| arrays.js:111:3:111:34 | [CallExpr] sink(ar ... lback)) | arrays.js:111:3:111:6 | [VarRef] sink | semmle.label | 0 |
+| arrays.js:111:3:111:34 | [CallExpr] sink(ar ... lback)) | arrays.js:111:3:111:6 | [VarRef] sink | semmle.order | 0 |
+| arrays.js:111:3:111:34 | [CallExpr] sink(ar ... lback)) | file://:0:0:0:0 | (Arguments) | semmle.label | 1 |
+| arrays.js:111:3:111:34 | [CallExpr] sink(ar ... lback)) | file://:0:0:0:0 | (Arguments) | semmle.order | 1 |
+| arrays.js:111:3:111:35 | [ExprStmt] sink(ar ... back)); | arrays.js:111:3:111:34 | [CallExpr] sink(ar ... lback)) | semmle.label | 1 |
+| arrays.js:111:3:111:35 | [ExprStmt] sink(ar ... back)); | arrays.js:111:3:111:34 | [CallExpr] sink(ar ... lback)) | semmle.order | 1 |
+| arrays.js:111:8:111:19 | [DotExpr] arr.findLast | arrays.js:111:8:111:10 | [VarRef] arr | semmle.label | 1 |
+| arrays.js:111:8:111:19 | [DotExpr] arr.findLast | arrays.js:111:8:111:10 | [VarRef] arr | semmle.order | 1 |
+| arrays.js:111:8:111:19 | [DotExpr] arr.findLast | arrays.js:111:12:111:19 | [Label] findLast | semmle.label | 2 |
+| arrays.js:111:8:111:19 | [DotExpr] arr.findLast | arrays.js:111:12:111:19 | [Label] findLast | semmle.order | 2 |
+| arrays.js:111:8:111:33 | [MethodCallExpr] arr.fin ... llback) | arrays.js:111:8:111:19 | [DotExpr] arr.findLast | semmle.label | 0 |
+| arrays.js:111:8:111:33 | [MethodCallExpr] arr.fin ... llback) | arrays.js:111:8:111:19 | [DotExpr] arr.findLast | semmle.order | 0 |
+| arrays.js:111:8:111:33 | [MethodCallExpr] arr.fin ... llback) | file://:0:0:0:0 | (Arguments) | semmle.label | 1 |
+| arrays.js:111:8:111:33 | [MethodCallExpr] arr.fin ... llback) | file://:0:0:0:0 | (Arguments) | semmle.order | 1 |
+| arrays.js:113:3:117:3 | [BlockStmt] { // T ... OK } | arrays.js:114:5:114:28 | [DeclStmt] const list = ... | semmle.label | 1 |
+| arrays.js:113:3:117:3 | [BlockStmt] { // T ... OK } | arrays.js:114:5:114:28 | [DeclStmt] const list = ... | semmle.order | 1 |
+| arrays.js:113:3:117:3 | [BlockStmt] { // T ... OK } | arrays.js:115:5:115:56 | [DeclStmt] const element = ... | semmle.label | 2 |
+| arrays.js:113:3:117:3 | [BlockStmt] { // T ... OK } | arrays.js:115:5:115:56 | [DeclStmt] const element = ... | semmle.order | 2 |
+| arrays.js:113:3:117:3 | [BlockStmt] { // T ... OK } | arrays.js:116:5:116:18 | [ExprStmt] sink(element); | semmle.label | 3 |
+| arrays.js:113:3:117:3 | [BlockStmt] { // T ... OK } | arrays.js:116:5:116:18 | [ExprStmt] sink(element); | semmle.order | 3 |
+| arrays.js:114:5:114:28 | [DeclStmt] const list = ... | arrays.js:114:11:114:27 | [VariableDeclarator] list = ["source"] | semmle.label | 1 |
+| arrays.js:114:5:114:28 | [DeclStmt] const list = ... | arrays.js:114:11:114:27 | [VariableDeclarator] list = ["source"] | semmle.order | 1 |
+| arrays.js:114:11:114:27 | [VariableDeclarator] list = ["source"] | arrays.js:114:11:114:14 | [VarDecl] list | semmle.label | 1 |
+| arrays.js:114:11:114:27 | [VariableDeclarator] list = ["source"] | arrays.js:114:11:114:14 | [VarDecl] list | semmle.order | 1 |
+| arrays.js:114:11:114:27 | [VariableDeclarator] list = ["source"] | arrays.js:114:18:114:27 | [ArrayExpr] ["source"] | semmle.label | 2 |
+| arrays.js:114:11:114:27 | [VariableDeclarator] list = ["source"] | arrays.js:114:18:114:27 | [ArrayExpr] ["source"] | semmle.order | 2 |
+| arrays.js:114:18:114:27 | [ArrayExpr] ["source"] | arrays.js:114:19:114:26 | [Literal] "source" | semmle.label | 1 |
+| arrays.js:114:18:114:27 | [ArrayExpr] ["source"] | arrays.js:114:19:114:26 | [Literal] "source" | semmle.order | 1 |
+| arrays.js:115:5:115:56 | [DeclStmt] const element = ... | arrays.js:115:11:115:55 | [VariableDeclarator] element ... (item)) | semmle.label | 1 |
+| arrays.js:115:5:115:56 | [DeclStmt] const element = ... | arrays.js:115:11:115:55 | [VariableDeclarator] element ... (item)) | semmle.order | 1 |
+| arrays.js:115:11:115:55 | [VariableDeclarator] element ... (item)) | arrays.js:115:11:115:17 | [VarDecl] element | semmle.label | 1 |
+| arrays.js:115:11:115:55 | [VariableDeclarator] element ... (item)) | arrays.js:115:11:115:17 | [VarDecl] element | semmle.order | 1 |
+| arrays.js:115:11:115:55 | [VariableDeclarator] element ... (item)) | arrays.js:115:21:115:55 | [MethodCallExpr] list.fi ... (item)) | semmle.label | 2 |
+| arrays.js:115:11:115:55 | [VariableDeclarator] element ... (item)) | arrays.js:115:21:115:55 | [MethodCallExpr] list.fi ... (item)) | semmle.order | 2 |
+| arrays.js:115:21:115:33 | [DotExpr] list.findLast | arrays.js:115:21:115:24 | [VarRef] list | semmle.label | 1 |
+| arrays.js:115:21:115:33 | [DotExpr] list.findLast | arrays.js:115:21:115:24 | [VarRef] list | semmle.order | 1 |
+| arrays.js:115:21:115:33 | [DotExpr] list.findLast | arrays.js:115:26:115:33 | [Label] findLast | semmle.label | 2 |
+| arrays.js:115:21:115:33 | [DotExpr] list.findLast | arrays.js:115:26:115:33 | [Label] findLast | semmle.order | 2 |
+| arrays.js:115:21:115:55 | [MethodCallExpr] list.fi ... (item)) | arrays.js:115:21:115:33 | [DotExpr] list.findLast | semmle.label | 0 |
+| arrays.js:115:21:115:55 | [MethodCallExpr] list.fi ... (item)) | arrays.js:115:21:115:33 | [DotExpr] list.findLast | semmle.order | 0 |
+| arrays.js:115:21:115:55 | [MethodCallExpr] list.fi ... (item)) | file://:0:0:0:0 | (Arguments) | semmle.label | 1 |
+| arrays.js:115:21:115:55 | [MethodCallExpr] list.fi ... (item)) | file://:0:0:0:0 | (Arguments) | semmle.order | 1 |
+| arrays.js:115:35:115:54 | [ArrowFunctionExpr] (item) => sink(item) | arrays.js:115:45:115:54 | [CallExpr] sink(item) | semmle.label | 5 |
+| arrays.js:115:35:115:54 | [ArrowFunctionExpr] (item) => sink(item) | arrays.js:115:45:115:54 | [CallExpr] sink(item) | semmle.order | 5 |
+| arrays.js:115:35:115:54 | [ArrowFunctionExpr] (item) => sink(item) | file://:0:0:0:0 | (Parameters) | semmle.label | 1 |
+| arrays.js:115:35:115:54 | [ArrowFunctionExpr] (item) => sink(item) | file://:0:0:0:0 | (Parameters) | semmle.order | 1 |
+| arrays.js:115:45:115:54 | [CallExpr] sink(item) | arrays.js:115:45:115:48 | [VarRef] sink | semmle.label | 0 |
+| arrays.js:115:45:115:54 | [CallExpr] sink(item) | arrays.js:115:45:115:48 | [VarRef] sink | semmle.order | 0 |
+| arrays.js:115:45:115:54 | [CallExpr] sink(item) | file://:0:0:0:0 | (Arguments) | semmle.label | 1 |
+| arrays.js:115:45:115:54 | [CallExpr] sink(item) | file://:0:0:0:0 | (Arguments) | semmle.order | 1 |
+| arrays.js:116:5:116:17 | [CallExpr] sink(element) | arrays.js:116:5:116:8 | [VarRef] sink | semmle.label | 0 |
+| arrays.js:116:5:116:17 | [CallExpr] sink(element) | arrays.js:116:5:116:8 | [VarRef] sink | semmle.order | 0 |
+| arrays.js:116:5:116:17 | [CallExpr] sink(element) | file://:0:0:0:0 | (Arguments) | semmle.label | 1 |
+| arrays.js:116:5:116:17 | [CallExpr] sink(element) | file://:0:0:0:0 | (Arguments) | semmle.order | 1 |
+| arrays.js:116:5:116:18 | [ExprStmt] sink(element); | arrays.js:116:5:116:17 | [CallExpr] sink(element) | semmle.label | 1 |
+| arrays.js:116:5:116:18 | [ExprStmt] sink(element); | arrays.js:116:5:116:17 | [CallExpr] sink(element) | semmle.order | 1 |
+| arrays.js:119:3:123:3 | [BlockStmt] { // T ... OK } | arrays.js:120:5:120:28 | [DeclStmt] const list = ... | semmle.label | 1 |
+| arrays.js:119:3:123:3 | [BlockStmt] { // T ... OK } | arrays.js:120:5:120:28 | [DeclStmt] const list = ... | semmle.order | 1 |
+| arrays.js:119:3:123:3 | [BlockStmt] { // T ... OK } | arrays.js:121:5:121:52 | [DeclStmt] const element = ... | semmle.label | 2 |
+| arrays.js:119:3:123:3 | [BlockStmt] { // T ... OK } | arrays.js:121:5:121:52 | [DeclStmt] const element = ... | semmle.order | 2 |
+| arrays.js:119:3:123:3 | [BlockStmt] { // T ... OK } | arrays.js:122:5:122:18 | [ExprStmt] sink(element); | semmle.label | 3 |
+| arrays.js:119:3:123:3 | [BlockStmt] { // T ... OK } | arrays.js:122:5:122:18 | [ExprStmt] sink(element); | semmle.order | 3 |
+| arrays.js:120:5:120:28 | [DeclStmt] const list = ... | arrays.js:120:11:120:27 | [VariableDeclarator] list = ["source"] | semmle.label | 1 |
+| arrays.js:120:5:120:28 | [DeclStmt] const list = ... | arrays.js:120:11:120:27 | [VariableDeclarator] list = ["source"] | semmle.order | 1 |
+| arrays.js:120:11:120:27 | [VariableDeclarator] list = ["source"] | arrays.js:120:11:120:14 | [VarDecl] list | semmle.label | 1 |
+| arrays.js:120:11:120:27 | [VariableDeclarator] list = ["source"] | arrays.js:120:11:120:14 | [VarDecl] list | semmle.order | 1 |
+| arrays.js:120:11:120:27 | [VariableDeclarator] list = ["source"] | arrays.js:120:18:120:27 | [ArrayExpr] ["source"] | semmle.label | 2 |
+| arrays.js:120:11:120:27 | [VariableDeclarator] list = ["source"] | arrays.js:120:18:120:27 | [ArrayExpr] ["source"] | semmle.order | 2 |
+| arrays.js:120:18:120:27 | [ArrayExpr] ["source"] | arrays.js:120:19:120:26 | [Literal] "source" | semmle.label | 1 |
+| arrays.js:120:18:120:27 | [ArrayExpr] ["source"] | arrays.js:120:19:120:26 | [Literal] "source" | semmle.order | 1 |
+| arrays.js:121:5:121:52 | [DeclStmt] const element = ... | arrays.js:121:11:121:51 | [VariableDeclarator] element ... (item)) | semmle.label | 1 |
+| arrays.js:121:5:121:52 | [DeclStmt] const element = ... | arrays.js:121:11:121:51 | [VariableDeclarator] element ... (item)) | semmle.order | 1 |
+| arrays.js:121:11:121:51 | [VariableDeclarator] element ... (item)) | arrays.js:121:11:121:17 | [VarDecl] element | semmle.label | 1 |
+| arrays.js:121:11:121:51 | [VariableDeclarator] element ... (item)) | arrays.js:121:11:121:17 | [VarDecl] element | semmle.order | 1 |
+| arrays.js:121:11:121:51 | [VariableDeclarator] element ... (item)) | arrays.js:121:21:121:51 | [MethodCallExpr] list.fi ... (item)) | semmle.label | 2 |
+| arrays.js:121:11:121:51 | [VariableDeclarator] element ... (item)) | arrays.js:121:21:121:51 | [MethodCallExpr] list.fi ... (item)) | semmle.order | 2 |
+| arrays.js:121:21:121:29 | [DotExpr] list.find | arrays.js:121:21:121:24 | [VarRef] list | semmle.label | 1 |
+| arrays.js:121:21:121:29 | [DotExpr] list.find | arrays.js:121:21:121:24 | [VarRef] list | semmle.order | 1 |
+| arrays.js:121:21:121:29 | [DotExpr] list.find | arrays.js:121:26:121:29 | [Label] find | semmle.label | 2 |
+| arrays.js:121:21:121:29 | [DotExpr] list.find | arrays.js:121:26:121:29 | [Label] find | semmle.order | 2 |
+| arrays.js:121:21:121:51 | [MethodCallExpr] list.fi ... (item)) | arrays.js:121:21:121:29 | [DotExpr] list.find | semmle.label | 0 |
+| arrays.js:121:21:121:51 | [MethodCallExpr] list.fi ... (item)) | arrays.js:121:21:121:29 | [DotExpr] list.find | semmle.order | 0 |
+| arrays.js:121:21:121:51 | [MethodCallExpr] list.fi ... (item)) | file://:0:0:0:0 | (Arguments) | semmle.label | 1 |
+| arrays.js:121:21:121:51 | [MethodCallExpr] list.fi ... (item)) | file://:0:0:0:0 | (Arguments) | semmle.order | 1 |
+| arrays.js:121:31:121:50 | [ArrowFunctionExpr] (item) => sink(item) | arrays.js:121:41:121:50 | [CallExpr] sink(item) | semmle.label | 5 |
+| arrays.js:121:31:121:50 | [ArrowFunctionExpr] (item) => sink(item) | arrays.js:121:41:121:50 | [CallExpr] sink(item) | semmle.order | 5 |
+| arrays.js:121:31:121:50 | [ArrowFunctionExpr] (item) => sink(item) | file://:0:0:0:0 | (Parameters) | semmle.label | 1 |
+| arrays.js:121:31:121:50 | [ArrowFunctionExpr] (item) => sink(item) | file://:0:0:0:0 | (Parameters) | semmle.order | 1 |
+| arrays.js:121:41:121:50 | [CallExpr] sink(item) | arrays.js:121:41:121:44 | [VarRef] sink | semmle.label | 0 |
+| arrays.js:121:41:121:50 | [CallExpr] sink(item) | arrays.js:121:41:121:44 | [VarRef] sink | semmle.order | 0 |
+| arrays.js:121:41:121:50 | [CallExpr] sink(item) | file://:0:0:0:0 | (Arguments) | semmle.label | 1 |
+| arrays.js:121:41:121:50 | [CallExpr] sink(item) | file://:0:0:0:0 | (Arguments) | semmle.order | 1 |
+| arrays.js:122:5:122:17 | [CallExpr] sink(element) | arrays.js:122:5:122:8 | [VarRef] sink | semmle.label | 0 |
+| arrays.js:122:5:122:17 | [CallExpr] sink(element) | arrays.js:122:5:122:8 | [VarRef] sink | semmle.order | 0 |
+| arrays.js:122:5:122:17 | [CallExpr] sink(element) | file://:0:0:0:0 | (Arguments) | semmle.label | 1 |
+| arrays.js:122:5:122:17 | [CallExpr] sink(element) | file://:0:0:0:0 | (Arguments) | semmle.order | 1 |
+| arrays.js:122:5:122:18 | [ExprStmt] sink(element); | arrays.js:122:5:122:17 | [CallExpr] sink(element) | semmle.label | 1 |
+| arrays.js:122:5:122:18 | [ExprStmt] sink(element); | arrays.js:122:5:122:17 | [CallExpr] sink(element) | semmle.order | 1 |
+| arrays.js:125:3:129:3 | [BlockStmt] { // T ... OK } | arrays.js:126:5:126:28 | [DeclStmt] const list = ... | semmle.label | 1 |
+| arrays.js:125:3:129:3 | [BlockStmt] { // T ... OK } | arrays.js:126:5:126:28 | [DeclStmt] const list = ... | semmle.order | 1 |
+| arrays.js:125:3:129:3 | [BlockStmt] { // T ... OK } | arrays.js:127:5:127:61 | [DeclStmt] const element = ... | semmle.label | 2 |
+| arrays.js:125:3:129:3 | [BlockStmt] { // T ... OK } | arrays.js:127:5:127:61 | [DeclStmt] const element = ... | semmle.order | 2 |
+| arrays.js:125:3:129:3 | [BlockStmt] { // T ... OK } | arrays.js:128:5:128:18 | [ExprStmt] sink(element); | semmle.label | 3 |
+| arrays.js:125:3:129:3 | [BlockStmt] { // T ... OK } | arrays.js:128:5:128:18 | [ExprStmt] sink(element); | semmle.order | 3 |
+| arrays.js:126:5:126:28 | [DeclStmt] const list = ... | arrays.js:126:11:126:27 | [VariableDeclarator] list = ["source"] | semmle.label | 1 |
+| arrays.js:126:5:126:28 | [DeclStmt] const list = ... | arrays.js:126:11:126:27 | [VariableDeclarator] list = ["source"] | semmle.order | 1 |
+| arrays.js:126:11:126:27 | [VariableDeclarator] list = ["source"] | arrays.js:126:11:126:14 | [VarDecl] list | semmle.label | 1 |
+| arrays.js:126:11:126:27 | [VariableDeclarator] list = ["source"] | arrays.js:126:11:126:14 | [VarDecl] list | semmle.order | 1 |
+| arrays.js:126:11:126:27 | [VariableDeclarator] list = ["source"] | arrays.js:126:18:126:27 | [ArrayExpr] ["source"] | semmle.label | 2 |
+| arrays.js:126:11:126:27 | [VariableDeclarator] list = ["source"] | arrays.js:126:18:126:27 | [ArrayExpr] ["source"] | semmle.order | 2 |
+| arrays.js:126:18:126:27 | [ArrayExpr] ["source"] | arrays.js:126:19:126:26 | [Literal] "source" | semmle.label | 1 |
+| arrays.js:126:18:126:27 | [ArrayExpr] ["source"] | arrays.js:126:19:126:26 | [Literal] "source" | semmle.order | 1 |
+| arrays.js:127:5:127:61 | [DeclStmt] const element = ... | arrays.js:127:11:127:60 | [VariableDeclarator] element ... (item)) | semmle.label | 1 |
+| arrays.js:127:5:127:61 | [DeclStmt] const element = ... | arrays.js:127:11:127:60 | [VariableDeclarator] element ... (item)) | semmle.order | 1 |
+| arrays.js:127:11:127:60 | [VariableDeclarator] element ... (item)) | arrays.js:127:11:127:17 | [VarDecl] element | semmle.label | 1 |
+| arrays.js:127:11:127:60 | [VariableDeclarator] element ... (item)) | arrays.js:127:11:127:17 | [VarDecl] element | semmle.order | 1 |
+| arrays.js:127:11:127:60 | [VariableDeclarator] element ... (item)) | arrays.js:127:21:127:60 | [MethodCallExpr] list.fi ... (item)) | semmle.label | 2 |
+| arrays.js:127:11:127:60 | [VariableDeclarator] element ... (item)) | arrays.js:127:21:127:60 | [MethodCallExpr] list.fi ... (item)) | semmle.order | 2 |
+| arrays.js:127:21:127:38 | [DotExpr] list.findLastIndex | arrays.js:127:21:127:24 | [VarRef] list | semmle.label | 1 |
+| arrays.js:127:21:127:38 | [DotExpr] list.findLastIndex | arrays.js:127:21:127:24 | [VarRef] list | semmle.order | 1 |
+| arrays.js:127:21:127:38 | [DotExpr] list.findLastIndex | arrays.js:127:26:127:38 | [Label] findLastIndex | semmle.label | 2 |
+| arrays.js:127:21:127:38 | [DotExpr] list.findLastIndex | arrays.js:127:26:127:38 | [Label] findLastIndex | semmle.order | 2 |
+| arrays.js:127:21:127:60 | [MethodCallExpr] list.fi ... (item)) | arrays.js:127:21:127:38 | [DotExpr] list.findLastIndex | semmle.label | 0 |
+| arrays.js:127:21:127:60 | [MethodCallExpr] list.fi ... (item)) | arrays.js:127:21:127:38 | [DotExpr] list.findLastIndex | semmle.order | 0 |
+| arrays.js:127:21:127:60 | [MethodCallExpr] list.fi ... (item)) | file://:0:0:0:0 | (Arguments) | semmle.label | 1 |
+| arrays.js:127:21:127:60 | [MethodCallExpr] list.fi ... (item)) | file://:0:0:0:0 | (Arguments) | semmle.order | 1 |
+| arrays.js:127:40:127:59 | [ArrowFunctionExpr] (item) => sink(item) | arrays.js:127:50:127:59 | [CallExpr] sink(item) | semmle.label | 5 |
+| arrays.js:127:40:127:59 | [ArrowFunctionExpr] (item) => sink(item) | arrays.js:127:50:127:59 | [CallExpr] sink(item) | semmle.order | 5 |
+| arrays.js:127:40:127:59 | [ArrowFunctionExpr] (item) => sink(item) | file://:0:0:0:0 | (Parameters) | semmle.label | 1 |
+| arrays.js:127:40:127:59 | [ArrowFunctionExpr] (item) => sink(item) | file://:0:0:0:0 | (Parameters) | semmle.order | 1 |
+| arrays.js:127:50:127:59 | [CallExpr] sink(item) | arrays.js:127:50:127:53 | [VarRef] sink | semmle.label | 0 |
+| arrays.js:127:50:127:59 | [CallExpr] sink(item) | arrays.js:127:50:127:53 | [VarRef] sink | semmle.order | 0 |
+| arrays.js:127:50:127:59 | [CallExpr] sink(item) | file://:0:0:0:0 | (Arguments) | semmle.label | 1 |
+| arrays.js:127:50:127:59 | [CallExpr] sink(item) | file://:0:0:0:0 | (Arguments) | semmle.order | 1 |
+| arrays.js:128:5:128:17 | [CallExpr] sink(element) | arrays.js:128:5:128:8 | [VarRef] sink | semmle.label | 0 |
+| arrays.js:128:5:128:17 | [CallExpr] sink(element) | arrays.js:128:5:128:8 | [VarRef] sink | semmle.order | 0 |
+| arrays.js:128:5:128:17 | [CallExpr] sink(element) | file://:0:0:0:0 | (Arguments) | semmle.label | 1 |
+| arrays.js:128:5:128:17 | [CallExpr] sink(element) | file://:0:0:0:0 | (Arguments) | semmle.order | 1 |
+| arrays.js:128:5:128:18 | [ExprStmt] sink(element); | arrays.js:128:5:128:17 | [CallExpr] sink(element) | semmle.label | 1 |
+| arrays.js:128:5:128:18 | [ExprStmt] sink(element); | arrays.js:128:5:128:17 | [CallExpr] sink(element) | semmle.order | 1 |
+| arrays.js:130:3:134:3 | [BlockStmt] { c ... OK } | arrays.js:131:5:131:25 | [DeclStmt] const arr = ... | semmle.label | 1 |
+| arrays.js:130:3:134:3 | [BlockStmt] { c ... OK } | arrays.js:131:5:131:25 | [DeclStmt] const arr = ... | semmle.order | 1 |
+| arrays.js:130:3:134:3 | [BlockStmt] { c ... OK } | arrays.js:132:5:132:52 | [DeclStmt] const element1 = ... | semmle.label | 2 |
+| arrays.js:130:3:134:3 | [BlockStmt] { c ... OK } | arrays.js:132:5:132:52 | [DeclStmt] const element1 = ... | semmle.order | 2 |
+| arrays.js:130:3:134:3 | [BlockStmt] { c ... OK } | arrays.js:133:5:133:19 | [ExprStmt] sink(element1); | semmle.label | 3 |
+| arrays.js:130:3:134:3 | [BlockStmt] { c ... OK } | arrays.js:133:5:133:19 | [ExprStmt] sink(element1); | semmle.order | 3 |
+| arrays.js:131:5:131:25 | [DeclStmt] const arr = ... | arrays.js:131:11:131:24 | [VariableDeclarator] arr = source() | semmle.label | 1 |
+| arrays.js:131:5:131:25 | [DeclStmt] const arr = ... | arrays.js:131:11:131:24 | [VariableDeclarator] arr = source() | semmle.order | 1 |
+| arrays.js:131:11:131:24 | [VariableDeclarator] arr = source() | arrays.js:131:11:131:13 | [VarDecl] arr | semmle.label | 1 |
+| arrays.js:131:11:131:24 | [VariableDeclarator] arr = source() | arrays.js:131:11:131:13 | [VarDecl] arr | semmle.order | 1 |
+| arrays.js:131:11:131:24 | [VariableDeclarator] arr = source() | arrays.js:131:17:131:24 | [CallExpr] source() | semmle.label | 2 |
+| arrays.js:131:11:131:24 | [VariableDeclarator] arr = source() | arrays.js:131:17:131:24 | [CallExpr] source() | semmle.order | 2 |
+| arrays.js:131:17:131:24 | [CallExpr] source() | arrays.js:131:17:131:22 | [VarRef] source | semmle.label | 0 |
+| arrays.js:131:17:131:24 | [CallExpr] source() | arrays.js:131:17:131:22 | [VarRef] source | semmle.order | 0 |
+| arrays.js:132:5:132:52 | [DeclStmt] const element1 = ... | arrays.js:132:11:132:51 | [VariableDeclarator] element ... (item)) | semmle.label | 1 |
+| arrays.js:132:5:132:52 | [DeclStmt] const element1 = ... | arrays.js:132:11:132:51 | [VariableDeclarator] element ... (item)) | semmle.order | 1 |
+| arrays.js:132:11:132:51 | [VariableDeclarator] element ... (item)) | arrays.js:132:11:132:18 | [VarDecl] element1 | semmle.label | 1 |
+| arrays.js:132:11:132:51 | [VariableDeclarator] element ... (item)) | arrays.js:132:11:132:18 | [VarDecl] element1 | semmle.order | 1 |
+| arrays.js:132:11:132:51 | [VariableDeclarator] element ... (item)) | arrays.js:132:22:132:51 | [MethodCallExpr] arr.fin ... (item)) | semmle.label | 2 |
+| arrays.js:132:11:132:51 | [VariableDeclarator] element ... (item)) | arrays.js:132:22:132:51 | [MethodCallExpr] arr.fin ... (item)) | semmle.order | 2 |
+| arrays.js:132:22:132:29 | [DotExpr] arr.find | arrays.js:132:22:132:24 | [VarRef] arr | semmle.label | 1 |
+| arrays.js:132:22:132:29 | [DotExpr] arr.find | arrays.js:132:22:132:24 | [VarRef] arr | semmle.order | 1 |
+| arrays.js:132:22:132:29 | [DotExpr] arr.find | arrays.js:132:26:132:29 | [Label] find | semmle.label | 2 |
+| arrays.js:132:22:132:29 | [DotExpr] arr.find | arrays.js:132:26:132:29 | [Label] find | semmle.order | 2 |
+| arrays.js:132:22:132:51 | [MethodCallExpr] arr.fin ... (item)) | arrays.js:132:22:132:29 | [DotExpr] arr.find | semmle.label | 0 |
+| arrays.js:132:22:132:51 | [MethodCallExpr] arr.fin ... (item)) | arrays.js:132:22:132:29 | [DotExpr] arr.find | semmle.order | 0 |
+| arrays.js:132:22:132:51 | [MethodCallExpr] arr.fin ... (item)) | file://:0:0:0:0 | (Arguments) | semmle.label | 1 |
+| arrays.js:132:22:132:51 | [MethodCallExpr] arr.fin ... (item)) | file://:0:0:0:0 | (Arguments) | semmle.order | 1 |
+| arrays.js:132:31:132:50 | [ArrowFunctionExpr] (item) => sink(item) | arrays.js:132:41:132:50 | [CallExpr] sink(item) | semmle.label | 5 |
+| arrays.js:132:31:132:50 | [ArrowFunctionExpr] (item) => sink(item) | arrays.js:132:41:132:50 | [CallExpr] sink(item) | semmle.order | 5 |
+| arrays.js:132:31:132:50 | [ArrowFunctionExpr] (item) => sink(item) | file://:0:0:0:0 | (Parameters) | semmle.label | 1 |
+| arrays.js:132:31:132:50 | [ArrowFunctionExpr] (item) => sink(item) | file://:0:0:0:0 | (Parameters) | semmle.order | 1 |
+| arrays.js:132:41:132:50 | [CallExpr] sink(item) | arrays.js:132:41:132:44 | [VarRef] sink | semmle.label | 0 |
+| arrays.js:132:41:132:50 | [CallExpr] sink(item) | arrays.js:132:41:132:44 | [VarRef] sink | semmle.order | 0 |
+| arrays.js:132:41:132:50 | [CallExpr] sink(item) | file://:0:0:0:0 | (Arguments) | semmle.label | 1 |
+| arrays.js:132:41:132:50 | [CallExpr] sink(item) | file://:0:0:0:0 | (Arguments) | semmle.order | 1 |
+| arrays.js:133:5:133:18 | [CallExpr] sink(element1) | arrays.js:133:5:133:8 | [VarRef] sink | semmle.label | 0 |
+| arrays.js:133:5:133:18 | [CallExpr] sink(element1) | arrays.js:133:5:133:8 | [VarRef] sink | semmle.order | 0 |
+| arrays.js:133:5:133:18 | [CallExpr] sink(element1) | file://:0:0:0:0 | (Arguments) | semmle.label | 1 |
+| arrays.js:133:5:133:18 | [CallExpr] sink(element1) | file://:0:0:0:0 | (Arguments) | semmle.order | 1 |
+| arrays.js:133:5:133:19 | [ExprStmt] sink(element1); | arrays.js:133:5:133:18 | [CallExpr] sink(element1) | semmle.label | 1 |
+| arrays.js:133:5:133:19 | [ExprStmt] sink(element1); | arrays.js:133:5:133:18 | [CallExpr] sink(element1) | semmle.order | 1 |
+| arrays.js:136:3:140:3 | [BlockStmt] { c ... OK } | arrays.js:137:5:137:25 | [DeclStmt] const arr = ... | semmle.label | 1 |
+| arrays.js:136:3:140:3 | [BlockStmt] { c ... OK } | arrays.js:137:5:137:25 | [DeclStmt] const arr = ... | semmle.order | 1 |
+| arrays.js:136:3:140:3 | [BlockStmt] { c ... OK } | arrays.js:138:5:138:56 | [DeclStmt] const element1 = ... | semmle.label | 2 |
+| arrays.js:136:3:140:3 | [BlockStmt] { c ... OK } | arrays.js:138:5:138:56 | [DeclStmt] const element1 = ... | semmle.order | 2 |
+| arrays.js:136:3:140:3 | [BlockStmt] { c ... OK } | arrays.js:139:5:139:19 | [ExprStmt] sink(element1); | semmle.label | 3 |
+| arrays.js:136:3:140:3 | [BlockStmt] { c ... OK } | arrays.js:139:5:139:19 | [ExprStmt] sink(element1); | semmle.order | 3 |
+| arrays.js:137:5:137:25 | [DeclStmt] const arr = ... | arrays.js:137:11:137:24 | [VariableDeclarator] arr = source() | semmle.label | 1 |
+| arrays.js:137:5:137:25 | [DeclStmt] const arr = ... | arrays.js:137:11:137:24 | [VariableDeclarator] arr = source() | semmle.order | 1 |
+| arrays.js:137:11:137:24 | [VariableDeclarator] arr = source() | arrays.js:137:11:137:13 | [VarDecl] arr | semmle.label | 1 |
+| arrays.js:137:11:137:24 | [VariableDeclarator] arr = source() | arrays.js:137:11:137:13 | [VarDecl] arr | semmle.order | 1 |
+| arrays.js:137:11:137:24 | [VariableDeclarator] arr = source() | arrays.js:137:17:137:24 | [CallExpr] source() | semmle.label | 2 |
+| arrays.js:137:11:137:24 | [VariableDeclarator] arr = source() | arrays.js:137:17:137:24 | [CallExpr] source() | semmle.order | 2 |
+| arrays.js:137:17:137:24 | [CallExpr] source() | arrays.js:137:17:137:22 | [VarRef] source | semmle.label | 0 |
+| arrays.js:137:17:137:24 | [CallExpr] source() | arrays.js:137:17:137:22 | [VarRef] source | semmle.order | 0 |
+| arrays.js:138:5:138:56 | [DeclStmt] const element1 = ... | arrays.js:138:11:138:55 | [VariableDeclarator] element ... (item)) | semmle.label | 1 |
+| arrays.js:138:5:138:56 | [DeclStmt] const element1 = ... | arrays.js:138:11:138:55 | [VariableDeclarator] element ... (item)) | semmle.order | 1 |
+| arrays.js:138:11:138:55 | [VariableDeclarator] element ... (item)) | arrays.js:138:11:138:18 | [VarDecl] element1 | semmle.label | 1 |
+| arrays.js:138:11:138:55 | [VariableDeclarator] element ... (item)) | arrays.js:138:11:138:18 | [VarDecl] element1 | semmle.order | 1 |
+| arrays.js:138:11:138:55 | [VariableDeclarator] element ... (item)) | arrays.js:138:22:138:55 | [MethodCallExpr] arr.fin ... (item)) | semmle.label | 2 |
+| arrays.js:138:11:138:55 | [VariableDeclarator] element ... (item)) | arrays.js:138:22:138:55 | [MethodCallExpr] arr.fin ... (item)) | semmle.order | 2 |
+| arrays.js:138:22:138:33 | [DotExpr] arr.findLast | arrays.js:138:22:138:24 | [VarRef] arr | semmle.label | 1 |
+| arrays.js:138:22:138:33 | [DotExpr] arr.findLast | arrays.js:138:22:138:24 | [VarRef] arr | semmle.order | 1 |
+| arrays.js:138:22:138:33 | [DotExpr] arr.findLast | arrays.js:138:26:138:33 | [Label] findLast | semmle.label | 2 |
+| arrays.js:138:22:138:33 | [DotExpr] arr.findLast | arrays.js:138:26:138:33 | [Label] findLast | semmle.order | 2 |
+| arrays.js:138:22:138:55 | [MethodCallExpr] arr.fin ... (item)) | arrays.js:138:22:138:33 | [DotExpr] arr.findLast | semmle.label | 0 |
+| arrays.js:138:22:138:55 | [MethodCallExpr] arr.fin ... (item)) | arrays.js:138:22:138:33 | [DotExpr] arr.findLast | semmle.order | 0 |
+| arrays.js:138:22:138:55 | [MethodCallExpr] arr.fin ... (item)) | file://:0:0:0:0 | (Arguments) | semmle.label | 1 |
+| arrays.js:138:22:138:55 | [MethodCallExpr] arr.fin ... (item)) | file://:0:0:0:0 | (Arguments) | semmle.order | 1 |
+| arrays.js:138:35:138:54 | [ArrowFunctionExpr] (item) => sink(item) | arrays.js:138:45:138:54 | [CallExpr] sink(item) | semmle.label | 5 |
+| arrays.js:138:35:138:54 | [ArrowFunctionExpr] (item) => sink(item) | arrays.js:138:45:138:54 | [CallExpr] sink(item) | semmle.order | 5 |
+| arrays.js:138:35:138:54 | [ArrowFunctionExpr] (item) => sink(item) | file://:0:0:0:0 | (Parameters) | semmle.label | 1 |
+| arrays.js:138:35:138:54 | [ArrowFunctionExpr] (item) => sink(item) | file://:0:0:0:0 | (Parameters) | semmle.order | 1 |
+| arrays.js:138:45:138:54 | [CallExpr] sink(item) | arrays.js:138:45:138:48 | [VarRef] sink | semmle.label | 0 |
+| arrays.js:138:45:138:54 | [CallExpr] sink(item) | arrays.js:138:45:138:48 | [VarRef] sink | semmle.order | 0 |
+| arrays.js:138:45:138:54 | [CallExpr] sink(item) | file://:0:0:0:0 | (Arguments) | semmle.label | 1 |
+| arrays.js:138:45:138:54 | [CallExpr] sink(item) | file://:0:0:0:0 | (Arguments) | semmle.order | 1 |
+| arrays.js:139:5:139:18 | [CallExpr] sink(element1) | arrays.js:139:5:139:8 | [VarRef] sink | semmle.label | 0 |
+| arrays.js:139:5:139:18 | [CallExpr] sink(element1) | arrays.js:139:5:139:8 | [VarRef] sink | semmle.order | 0 |
+| arrays.js:139:5:139:18 | [CallExpr] sink(element1) | file://:0:0:0:0 | (Arguments) | semmle.label | 1 |
+| arrays.js:139:5:139:18 | [CallExpr] sink(element1) | file://:0:0:0:0 | (Arguments) | semmle.order | 1 |
+| arrays.js:139:5:139:19 | [ExprStmt] sink(element1); | arrays.js:139:5:139:18 | [CallExpr] sink(element1) | semmle.label | 1 |
+| arrays.js:139:5:139:19 | [ExprStmt] sink(element1); | arrays.js:139:5:139:18 | [CallExpr] sink(element1) | semmle.order | 1 |
+| arrays.js:142:3:146:3 | [BlockStmt] { c ... OK } | arrays.js:143:5:143:25 | [DeclStmt] const arr = ... | semmle.label | 1 |
+| arrays.js:142:3:146:3 | [BlockStmt] { c ... OK } | arrays.js:143:5:143:25 | [DeclStmt] const arr = ... | semmle.order | 1 |
+| arrays.js:142:3:146:3 | [BlockStmt] { c ... OK } | arrays.js:144:5:144:61 | [DeclStmt] const element1 = ... | semmle.label | 2 |
+| arrays.js:142:3:146:3 | [BlockStmt] { c ... OK } | arrays.js:144:5:144:61 | [DeclStmt] const element1 = ... | semmle.order | 2 |
+| arrays.js:142:3:146:3 | [BlockStmt] { c ... OK } | arrays.js:145:5:145:19 | [ExprStmt] sink(element1); | semmle.label | 3 |
+| arrays.js:142:3:146:3 | [BlockStmt] { c ... OK } | arrays.js:145:5:145:19 | [ExprStmt] sink(element1); | semmle.order | 3 |
+| arrays.js:143:5:143:25 | [DeclStmt] const arr = ... | arrays.js:143:11:143:24 | [VariableDeclarator] arr = source() | semmle.label | 1 |
+| arrays.js:143:5:143:25 | [DeclStmt] const arr = ... | arrays.js:143:11:143:24 | [VariableDeclarator] arr = source() | semmle.order | 1 |
+| arrays.js:143:11:143:24 | [VariableDeclarator] arr = source() | arrays.js:143:11:143:13 | [VarDecl] arr | semmle.label | 1 |
+| arrays.js:143:11:143:24 | [VariableDeclarator] arr = source() | arrays.js:143:11:143:13 | [VarDecl] arr | semmle.order | 1 |
+| arrays.js:143:11:143:24 | [VariableDeclarator] arr = source() | arrays.js:143:17:143:24 | [CallExpr] source() | semmle.label | 2 |
+| arrays.js:143:11:143:24 | [VariableDeclarator] arr = source() | arrays.js:143:17:143:24 | [CallExpr] source() | semmle.order | 2 |
+| arrays.js:143:17:143:24 | [CallExpr] source() | arrays.js:143:17:143:22 | [VarRef] source | semmle.label | 0 |
+| arrays.js:143:17:143:24 | [CallExpr] source() | arrays.js:143:17:143:22 | [VarRef] source | semmle.order | 0 |
+| arrays.js:144:5:144:61 | [DeclStmt] const element1 = ... | arrays.js:144:11:144:60 | [VariableDeclarator] element ... (item)) | semmle.label | 1 |
+| arrays.js:144:5:144:61 | [DeclStmt] const element1 = ... | arrays.js:144:11:144:60 | [VariableDeclarator] element ... (item)) | semmle.order | 1 |
+| arrays.js:144:11:144:60 | [VariableDeclarator] element ... (item)) | arrays.js:144:11:144:18 | [VarDecl] element1 | semmle.label | 1 |
+| arrays.js:144:11:144:60 | [VariableDeclarator] element ... (item)) | arrays.js:144:11:144:18 | [VarDecl] element1 | semmle.order | 1 |
+| arrays.js:144:11:144:60 | [VariableDeclarator] element ... (item)) | arrays.js:144:22:144:60 | [MethodCallExpr] arr.fin ... (item)) | semmle.label | 2 |
+| arrays.js:144:11:144:60 | [VariableDeclarator] element ... (item)) | arrays.js:144:22:144:60 | [MethodCallExpr] arr.fin ... (item)) | semmle.order | 2 |
+| arrays.js:144:22:144:38 | [DotExpr] arr.findLastIndex | arrays.js:144:22:144:24 | [VarRef] arr | semmle.label | 1 |
+| arrays.js:144:22:144:38 | [DotExpr] arr.findLastIndex | arrays.js:144:22:144:24 | [VarRef] arr | semmle.order | 1 |
+| arrays.js:144:22:144:38 | [DotExpr] arr.findLastIndex | arrays.js:144:26:144:38 | [Label] findLastIndex | semmle.label | 2 |
+| arrays.js:144:22:144:38 | [DotExpr] arr.findLastIndex | arrays.js:144:26:144:38 | [Label] findLastIndex | semmle.order | 2 |
+| arrays.js:144:22:144:60 | [MethodCallExpr] arr.fin ... (item)) | arrays.js:144:22:144:38 | [DotExpr] arr.findLastIndex | semmle.label | 0 |
+| arrays.js:144:22:144:60 | [MethodCallExpr] arr.fin ... (item)) | arrays.js:144:22:144:38 | [DotExpr] arr.findLastIndex | semmle.order | 0 |
+| arrays.js:144:22:144:60 | [MethodCallExpr] arr.fin ... (item)) | file://:0:0:0:0 | (Arguments) | semmle.label | 1 |
+| arrays.js:144:22:144:60 | [MethodCallExpr] arr.fin ... (item)) | file://:0:0:0:0 | (Arguments) | semmle.order | 1 |
+| arrays.js:144:40:144:59 | [ArrowFunctionExpr] (item) => sink(item) | arrays.js:144:50:144:59 | [CallExpr] sink(item) | semmle.label | 5 |
+| arrays.js:144:40:144:59 | [ArrowFunctionExpr] (item) => sink(item) | arrays.js:144:50:144:59 | [CallExpr] sink(item) | semmle.order | 5 |
+| arrays.js:144:40:144:59 | [ArrowFunctionExpr] (item) => sink(item) | file://:0:0:0:0 | (Parameters) | semmle.label | 1 |
+| arrays.js:144:40:144:59 | [ArrowFunctionExpr] (item) => sink(item) | file://:0:0:0:0 | (Parameters) | semmle.order | 1 |
+| arrays.js:144:50:144:59 | [CallExpr] sink(item) | arrays.js:144:50:144:53 | [VarRef] sink | semmle.label | 0 |
+| arrays.js:144:50:144:59 | [CallExpr] sink(item) | arrays.js:144:50:144:53 | [VarRef] sink | semmle.order | 0 |
+| arrays.js:144:50:144:59 | [CallExpr] sink(item) | file://:0:0:0:0 | (Arguments) | semmle.label | 1 |
+| arrays.js:144:50:144:59 | [CallExpr] sink(item) | file://:0:0:0:0 | (Arguments) | semmle.order | 1 |
+| arrays.js:145:5:145:18 | [CallExpr] sink(element1) | arrays.js:145:5:145:8 | [VarRef] sink | semmle.label | 0 |
+| arrays.js:145:5:145:18 | [CallExpr] sink(element1) | arrays.js:145:5:145:8 | [VarRef] sink | semmle.order | 0 |
+| arrays.js:145:5:145:18 | [CallExpr] sink(element1) | file://:0:0:0:0 | (Arguments) | semmle.label | 1 |
+| arrays.js:145:5:145:18 | [CallExpr] sink(element1) | file://:0:0:0:0 | (Arguments) | semmle.order | 1 |
+| arrays.js:145:5:145:19 | [ExprStmt] sink(element1); | arrays.js:145:5:145:18 | [CallExpr] sink(element1) | semmle.label | 1 |
+| arrays.js:145:5:145:19 | [ExprStmt] sink(element1); | arrays.js:145:5:145:18 | [CallExpr] sink(element1) | semmle.order | 1 |
 | file://:0:0:0:0 | (Arguments) | arrays.js:5:8:5:14 | [DotExpr] obj.foo | semmle.label | 0 |
 | file://:0:0:0:0 | (Arguments) | arrays.js:5:8:5:14 | [DotExpr] obj.foo | semmle.order | 0 |
 | file://:0:0:0:0 | (Arguments) | arrays.js:8:12:8:17 | [VarRef] source | semmle.label | 0 |
@@ -1634,6 +2080,46 @@ edges
 | file://:0:0:0:0 | (Arguments) | arrays.js:108:45:108:50 | [SpreadElement] ...arr | semmle.order | 2 |
 | file://:0:0:0:0 | (Arguments) | arrays.js:109:8:109:24 | [MethodCallExpr] arr8_spread.pop() | semmle.label | 0 |
 | file://:0:0:0:0 | (Arguments) | arrays.js:109:8:109:24 | [MethodCallExpr] arr8_spread.pop() | semmle.order | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:111:8:111:33 | [MethodCallExpr] arr.fin ... llback) | semmle.label | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:111:8:111:33 | [MethodCallExpr] arr.fin ... llback) | semmle.order | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:111:21:111:32 | [VarRef] someCallback | semmle.label | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:111:21:111:32 | [VarRef] someCallback | semmle.order | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:115:35:115:54 | [ArrowFunctionExpr] (item) => sink(item) | semmle.label | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:115:35:115:54 | [ArrowFunctionExpr] (item) => sink(item) | semmle.order | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:115:50:115:53 | [VarRef] item | semmle.label | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:115:50:115:53 | [VarRef] item | semmle.order | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:116:10:116:16 | [VarRef] element | semmle.label | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:116:10:116:16 | [VarRef] element | semmle.order | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:121:31:121:50 | [ArrowFunctionExpr] (item) => sink(item) | semmle.label | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:121:31:121:50 | [ArrowFunctionExpr] (item) => sink(item) | semmle.order | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:121:46:121:49 | [VarRef] item | semmle.label | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:121:46:121:49 | [VarRef] item | semmle.order | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:122:10:122:16 | [VarRef] element | semmle.label | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:122:10:122:16 | [VarRef] element | semmle.order | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:127:40:127:59 | [ArrowFunctionExpr] (item) => sink(item) | semmle.label | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:127:40:127:59 | [ArrowFunctionExpr] (item) => sink(item) | semmle.order | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:127:55:127:58 | [VarRef] item | semmle.label | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:127:55:127:58 | [VarRef] item | semmle.order | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:128:10:128:16 | [VarRef] element | semmle.label | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:128:10:128:16 | [VarRef] element | semmle.order | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:132:31:132:50 | [ArrowFunctionExpr] (item) => sink(item) | semmle.label | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:132:31:132:50 | [ArrowFunctionExpr] (item) => sink(item) | semmle.order | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:132:46:132:49 | [VarRef] item | semmle.label | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:132:46:132:49 | [VarRef] item | semmle.order | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:133:10:133:17 | [VarRef] element1 | semmle.label | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:133:10:133:17 | [VarRef] element1 | semmle.order | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:138:35:138:54 | [ArrowFunctionExpr] (item) => sink(item) | semmle.label | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:138:35:138:54 | [ArrowFunctionExpr] (item) => sink(item) | semmle.order | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:138:50:138:53 | [VarRef] item | semmle.label | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:138:50:138:53 | [VarRef] item | semmle.order | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:139:10:139:17 | [VarRef] element1 | semmle.label | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:139:10:139:17 | [VarRef] element1 | semmle.order | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:144:40:144:59 | [ArrowFunctionExpr] (item) => sink(item) | semmle.label | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:144:40:144:59 | [ArrowFunctionExpr] (item) => sink(item) | semmle.order | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:144:55:144:58 | [VarRef] item | semmle.label | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:144:55:144:58 | [VarRef] item | semmle.order | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:145:10:145:17 | [VarRef] element1 | semmle.label | 0 |
+| file://:0:0:0:0 | (Arguments) | arrays.js:145:10:145:17 | [VarRef] element1 | semmle.order | 0 |
 | file://:0:0:0:0 | (Parameters) | arrays.js:15:16:15:16 | [SimpleParameter] e | semmle.label | 0 |
 | file://:0:0:0:0 | (Parameters) | arrays.js:15:16:15:16 | [SimpleParameter] e | semmle.order | 0 |
 | file://:0:0:0:0 | (Parameters) | arrays.js:16:12:16:12 | [SimpleParameter] e | semmle.label | 0 |
@@ -1652,5 +2138,17 @@ edges
 | file://:0:0:0:0 | (Parameters) | arrays.js:95:27:95:27 | [SimpleParameter] x | semmle.order | 0 |
 | file://:0:0:0:0 | (Parameters) | arrays.js:96:27:96:27 | [SimpleParameter] x | semmle.label | 0 |
 | file://:0:0:0:0 | (Parameters) | arrays.js:96:27:96:27 | [SimpleParameter] x | semmle.order | 0 |
+| file://:0:0:0:0 | (Parameters) | arrays.js:115:36:115:39 | [SimpleParameter] item | semmle.label | 0 |
+| file://:0:0:0:0 | (Parameters) | arrays.js:115:36:115:39 | [SimpleParameter] item | semmle.order | 0 |
+| file://:0:0:0:0 | (Parameters) | arrays.js:121:32:121:35 | [SimpleParameter] item | semmle.label | 0 |
+| file://:0:0:0:0 | (Parameters) | arrays.js:121:32:121:35 | [SimpleParameter] item | semmle.order | 0 |
+| file://:0:0:0:0 | (Parameters) | arrays.js:127:41:127:44 | [SimpleParameter] item | semmle.label | 0 |
+| file://:0:0:0:0 | (Parameters) | arrays.js:127:41:127:44 | [SimpleParameter] item | semmle.order | 0 |
+| file://:0:0:0:0 | (Parameters) | arrays.js:132:32:132:35 | [SimpleParameter] item | semmle.label | 0 |
+| file://:0:0:0:0 | (Parameters) | arrays.js:132:32:132:35 | [SimpleParameter] item | semmle.order | 0 |
+| file://:0:0:0:0 | (Parameters) | arrays.js:138:36:138:39 | [SimpleParameter] item | semmle.label | 0 |
+| file://:0:0:0:0 | (Parameters) | arrays.js:138:36:138:39 | [SimpleParameter] item | semmle.order | 0 |
+| file://:0:0:0:0 | (Parameters) | arrays.js:144:41:144:44 | [SimpleParameter] item | semmle.label | 0 |
+| file://:0:0:0:0 | (Parameters) | arrays.js:144:41:144:44 | [SimpleParameter] item | semmle.order | 0 |
 graphProperties
 | semmle.graphKind | tree |
diff --git a/javascript/ql/test/library-tests/EndpointNaming/EndpointNaming.expected b/javascript/ql/test/library-tests/EndpointNaming/EndpointNaming.expected
index af5e8d62bb3..d2c34c887cc 100644
--- a/javascript/ql/test/library-tests/EndpointNaming/EndpointNaming.expected
+++ b/javascript/ql/test/library-tests/EndpointNaming/EndpointNaming.expected
@@ -5,4 +5,3 @@ ambiguousPreferredPredecessor
 | pack2/main.js:1:1:3:1 | def moduleImport("pack2").getMember("exports").getMember("MainClass").getInstance() |
 ambiguousSinkName
 ambiguousFunctionName
-failures
diff --git a/javascript/ql/test/library-tests/TaintTracking/BasicTaintTracking.expected b/javascript/ql/test/library-tests/TaintTracking/BasicTaintTracking.expected
index f81405a32a2..b6d5ab1e435 100644
--- a/javascript/ql/test/library-tests/TaintTracking/BasicTaintTracking.expected
+++ b/javascript/ql/test/library-tests/TaintTracking/BasicTaintTracking.expected
@@ -209,6 +209,10 @@ typeInferenceMismatch
 | static-capture-groups.js:2:17:2:24 | source() | static-capture-groups.js:27:14:27:22 | RegExp.$1 |
 | static-capture-groups.js:32:17:32:24 | source() | static-capture-groups.js:38:10:38:18 | RegExp.$1 |
 | static-capture-groups.js:42:12:42:19 | source() | static-capture-groups.js:43:14:43:22 | RegExp.$1 |
+| string-immutable-operations.js:2:13:2:20 | source() | string-immutable-operations.js:3:10:3:25 | x.toWellFormed() |
+| string-immutable-operations.js:2:13:2:20 | source() | string-immutable-operations.js:6:10:6:20 | wellFormedX |
+| string-immutable-operations.js:2:13:2:20 | source() | string-immutable-operations.js:9:10:9:26 | concatWellFormedX |
+| string-immutable-operations.js:11:10:11:17 | source() | string-immutable-operations.js:11:10:11:32 | source( ... ormed() |
 | string-replace.js:3:13:3:20 | source() | string-replace.js:14:10:14:13 | data |
 | string-replace.js:3:13:3:20 | source() | string-replace.js:18:10:18:13 | data |
 | string-replace.js:3:13:3:20 | source() | string-replace.js:21:6:21:41 | safe(). ...  taint) |
@@ -244,8 +248,19 @@ typeInferenceMismatch
 | tst.js:2:13:2:20 | source() | tst.js:66:10:66:16 | xSorted |
 | tst.js:2:13:2:20 | source() | tst.js:68:10:68:23 | x.toReversed() |
 | tst.js:2:13:2:20 | source() | tst.js:70:10:70:18 | xReversed |
-| tst.js:2:13:2:20 | source() | tst.js:72:10:72:17 | x.with() |
-| tst.js:2:13:2:20 | source() | tst.js:74:10:74:14 | xWith |
+| tst.js:2:13:2:20 | source() | tst.js:72:10:72:31 | Map.gro ... z => z) |
+| tst.js:2:13:2:20 | source() | tst.js:74:10:74:34 | Object. ... z => z) |
+| tst.js:2:13:2:20 | source() | tst.js:78:55:78:58 | item |
+| tst.js:2:13:2:20 | source() | tst.js:79:14:79:20 | grouped |
+| tst.js:2:13:2:20 | source() | tst.js:100:10:100:17 | x.with() |
+| tst.js:2:13:2:20 | source() | tst.js:102:10:102:14 | xWith |
+| tst.js:75:22:75:29 | source() | tst.js:75:10:75:52 | Map.gro ... (item)) |
+| tst.js:75:22:75:29 | source() | tst.js:75:47:75:50 | item |
+| tst.js:82:23:82:30 | source() | tst.js:83:58:83:61 | item |
+| tst.js:82:23:82:30 | source() | tst.js:84:14:84:20 | grouped |
+| tst.js:87:22:87:29 | source() | tst.js:90:14:90:25 | taintedValue |
+| tst.js:93:22:93:29 | source() | tst.js:96:14:96:25 | taintedValue |
+| tst.js:93:22:93:29 | source() | tst.js:97:14:97:26 | map.get(true) |
 | xml.js:5:18:5:25 | source() | xml.js:8:14:8:17 | text |
 | xml.js:12:17:12:24 | source() | xml.js:13:14:13:19 | result |
 | xml.js:23:18:23:25 | source() | xml.js:20:14:20:17 | attr |
diff --git a/javascript/ql/test/library-tests/TaintTracking/DataFlowTracking.expected b/javascript/ql/test/library-tests/TaintTracking/DataFlowTracking.expected
index 33a27661ecd..3b89229b2d7 100644
--- a/javascript/ql/test/library-tests/TaintTracking/DataFlowTracking.expected
+++ b/javascript/ql/test/library-tests/TaintTracking/DataFlowTracking.expected
@@ -112,3 +112,5 @@
 | thisAssignments.js:7:19:7:26 | source() | thisAssignments.js:8:10:8:20 | this.field2 |
 | tst.js:2:13:2:20 | source() | tst.js:4:10:4:10 | x |
 | tst.js:2:13:2:20 | source() | tst.js:54:14:54:19 | unsafe |
+| tst.js:93:22:93:29 | source() | tst.js:96:14:96:25 | taintedValue |
+| tst.js:93:22:93:29 | source() | tst.js:97:14:97:26 | map.get(true) |
diff --git a/javascript/ql/test/library-tests/TaintTracking/string-immutable-operations.js b/javascript/ql/test/library-tests/TaintTracking/string-immutable-operations.js
new file mode 100644
index 00000000000..79e93fab002
--- /dev/null
+++ b/javascript/ql/test/library-tests/TaintTracking/string-immutable-operations.js
@@ -0,0 +1,12 @@
+function test() {
+    let x = source();
+    sink(x.toWellFormed()); // NOT OK
+
+    const wellFormedX = x.toWellFormed();
+    sink(wellFormedX); // NOT OK
+
+    const concatWellFormedX = "/" + wellFormedX + "!";
+    sink(concatWellFormedX); // NOT OK
+
+    sink(source().toWellFormed()); // NOT OK
+}
diff --git a/javascript/ql/test/library-tests/TaintTracking/tst.js b/javascript/ql/test/library-tests/TaintTracking/tst.js
index 13b4ea48d8d..8fbc5e525bd 100644
--- a/javascript/ql/test/library-tests/TaintTracking/tst.js
+++ b/javascript/ql/test/library-tests/TaintTracking/tst.js
@@ -69,6 +69,34 @@ function test() {
     const xReversed = x.toReversed();
     sink(xReversed) // NOT OK
 
+    sink(Map.groupBy(x, z => z)); // NOT OK
+    sink(Custom.groupBy(x, z => z)); // OK
+    sink(Object.groupBy(x, z => z)); // NOT OK
+    sink(Map.groupBy(source(), (item) => sink(item))); // NOT OK
+
+    { 
+        const grouped = Map.groupBy(x, (item) => sink(item)); // NOT OK
+        sink(grouped); // NOT OK
+    }
+    {
+        const list = [source()];
+        const grouped = Map.groupBy(list, (item) => sink(item)); // NOT OK
+        sink(grouped); // NOT OK
+    }
+    {
+        const data = source();
+        const result = Object.groupBy(data, item => item);
+        const taintedValue = result[notDefined()];
+        sink(taintedValue); // NOT OK
+    }
+    {
+        const data = source();
+        const map = Map.groupBy(data, item => item);
+        const taintedValue = map.get(true); 
+        sink(taintedValue); // NOT OK
+        sink(map.get(true)); // NOT OK
+    }
+
     sink(x.with()) // NOT OK
     const xWith = x.with();
     sink(xWith) // NOT OK
diff --git a/javascript/ql/test/library-tests/TypeScript/Types/printAst.expected b/javascript/ql/test/library-tests/TypeScript/Types/printAst.expected
index 3061a6ba1f0..df304b899bb 100644
--- a/javascript/ql/test/library-tests/TypeScript/Types/printAst.expected
+++ b/javascript/ql/test/library-tests/TypeScript/Types/printAst.expected
@@ -1877,8 +1877,35 @@ nodes
 | tst.ts:508:17:508:38 | [MethodCallExpr] obj[key ... rCase() | semmle.label | [MethodCallExpr] obj[key ... rCase() |
 | tst.ts:508:21:508:23 | [VarRef] key | semmle.label | [VarRef] key |
 | tst.ts:508:26:508:36 | [Label] toUpperCase | semmle.label | [Label] toUpperCase |
+| tst.ts:513:1:520:1 | [NamespaceDeclaration] namespa ... type. } | semmle.label | [NamespaceDeclaration] namespa ... type. } |
+| tst.ts:513:1:520:1 | [NamespaceDeclaration] namespa ... type. } | semmle.order | 92 |
+| tst.ts:513:11:513:14 | [VarDecl] TS57 | semmle.label | [VarDecl] TS57 |
+| tst.ts:514:3:514:26 | [DeclStmt] const a = ... | semmle.label | [DeclStmt] const a = ... |
+| tst.ts:514:17:514:17 | [VarDecl] a | semmle.label | [VarDecl] a |
+| tst.ts:514:17:514:25 | [VariableDeclarator] a: symbol | semmle.label | [VariableDeclarator] a: symbol |
+| tst.ts:514:20:514:25 | [KeywordTypeExpr] symbol | semmle.label | [KeywordTypeExpr] symbol |
+| tst.ts:515:3:517:3 | [ExportDeclaration] export ... }; } | semmle.label | [ExportDeclaration] export ... }; } |
+| tst.ts:515:10:517:3 | [ClassDefinition,TypeDefinition] class A ... }; } | semmle.label | [ClassDefinition,TypeDefinition] class A ... }; } |
+| tst.ts:515:16:515:16 | [VarDecl] A | semmle.label | [VarDecl] A |
+| tst.ts:515:18:515:17 | [BlockStmt] {} | semmle.label | [BlockStmt] {} |
+| tst.ts:515:18:515:17 | [ClassInitializedMember,ConstructorDefinition] constructor() {} | semmle.label | [ClassInitializedMember,ConstructorDefinition] constructor() {} |
+| tst.ts:515:18:515:17 | [FunctionExpr] () {} | semmle.label | [FunctionExpr] () {} |
+| tst.ts:515:18:515:17 | [Label] constructor | semmle.label | [Label] constructor |
+| tst.ts:516:7:516:24 | [ClassInitializedMember,MethodDefinition] [a]() { return 1 } | semmle.label | [ClassInitializedMember,MethodDefinition] [a]() { return 1 } |
+| tst.ts:516:7:516:24 | [FunctionExpr] [a]() { return 1 } | semmle.label | [FunctionExpr] [a]() { return 1 } |
+| tst.ts:516:8:516:8 | [VarRef] a | semmle.label | [VarRef] a |
+| tst.ts:516:13:516:24 | [BlockStmt] { return 1 } | semmle.label | [BlockStmt] { return 1 } |
+| tst.ts:516:15:516:22 | [ReturnStmt] return 1 | semmle.label | [ReturnStmt] return 1 |
+| tst.ts:516:22:516:22 | [Literal] 1 | semmle.label | [Literal] 1 |
+| tst.ts:519:3:519:32 | [DeclStmt] const e1 = ... | semmle.label | [DeclStmt] const e1 = ... |
+| tst.ts:519:17:519:18 | [VarDecl] e1 | semmle.label | [VarDecl] e1 |
+| tst.ts:519:17:519:31 | [VariableDeclarator] e1: A[typeof a] | semmle.label | [VariableDeclarator] e1: A[typeof a] |
+| tst.ts:519:21:519:21 | [LocalTypeAccess] A | semmle.label | [LocalTypeAccess] A |
+| tst.ts:519:21:519:31 | [IndexedAccessTypeExpr] A[typeof a] | semmle.label | [IndexedAccessTypeExpr] A[typeof a] |
+| tst.ts:519:23:519:30 | [TypeofTypeExpr] typeof a | semmle.label | [TypeofTypeExpr] typeof a |
+| tst.ts:519:30:519:30 | [LocalVarTypeAccess] a | semmle.label | [LocalVarTypeAccess] a |
 | tstModuleCJS.cts:1:1:3:1 | [ExportDeclaration] export ... 'b'; } | semmle.label | [ExportDeclaration] export ... 'b'; } |
-| tstModuleCJS.cts:1:1:3:1 | [ExportDeclaration] export ... 'b'; } | semmle.order | 92 |
+| tstModuleCJS.cts:1:1:3:1 | [ExportDeclaration] export ... 'b'; } | semmle.order | 93 |
 | tstModuleCJS.cts:1:8:3:1 | [FunctionDeclStmt] functio ... 'b'; } | semmle.label | [FunctionDeclStmt] functio ... 'b'; } |
 | tstModuleCJS.cts:1:17:1:28 | [VarDecl] tstModuleCJS | semmle.label | [VarDecl] tstModuleCJS |
 | tstModuleCJS.cts:1:33:1:35 | [LiteralTypeExpr] 'a' | semmle.label | [LiteralTypeExpr] 'a' |
@@ -1896,7 +1923,7 @@ nodes
 | tstModuleCJS.cts:2:34:2:36 | [Literal] 'a' | semmle.label | [Literal] 'a' |
 | tstModuleCJS.cts:2:40:2:42 | [Literal] 'b' | semmle.label | [Literal] 'b' |
 | tstModuleES.mts:1:1:3:1 | [ExportDeclaration] export ... 'b'; } | semmle.label | [ExportDeclaration] export ... 'b'; } |
-| tstModuleES.mts:1:1:3:1 | [ExportDeclaration] export ... 'b'; } | semmle.order | 93 |
+| tstModuleES.mts:1:1:3:1 | [ExportDeclaration] export ... 'b'; } | semmle.order | 94 |
 | tstModuleES.mts:1:16:3:1 | [FunctionDeclStmt] functio ... 'b'; } | semmle.label | [FunctionDeclStmt] functio ... 'b'; } |
 | tstModuleES.mts:1:25:1:35 | [VarDecl] tstModuleES | semmle.label | [VarDecl] tstModuleES |
 | tstModuleES.mts:1:40:1:42 | [LiteralTypeExpr] 'a' | semmle.label | [LiteralTypeExpr] 'a' |
@@ -1914,7 +1941,7 @@ nodes
 | tstModuleES.mts:2:34:2:36 | [Literal] 'a' | semmle.label | [Literal] 'a' |
 | tstModuleES.mts:2:40:2:42 | [Literal] 'b' | semmle.label | [Literal] 'b' |
 | tstSuffixA.ts:1:1:3:1 | [ExportDeclaration] export ... .ts'; } | semmle.label | [ExportDeclaration] export ... .ts'; } |
-| tstSuffixA.ts:1:1:3:1 | [ExportDeclaration] export ... .ts'; } | semmle.order | 94 |
+| tstSuffixA.ts:1:1:3:1 | [ExportDeclaration] export ... .ts'; } | semmle.order | 95 |
 | tstSuffixA.ts:1:8:3:1 | [FunctionDeclStmt] functio ... .ts'; } | semmle.label | [FunctionDeclStmt] functio ... .ts'; } |
 | tstSuffixA.ts:1:17:1:28 | [VarDecl] resolvedFile | semmle.label | [VarDecl] resolvedFile |
 | tstSuffixA.ts:1:33:1:47 | [LiteralTypeExpr] 'tstSuffixA.ts' | semmle.label | [LiteralTypeExpr] 'tstSuffixA.ts' |
@@ -1922,7 +1949,7 @@ nodes
 | tstSuffixA.ts:2:5:2:27 | [ReturnStmt] return ... xA.ts'; | semmle.label | [ReturnStmt] return ... xA.ts'; |
 | tstSuffixA.ts:2:12:2:26 | [Literal] 'tstSuffixA.ts' | semmle.label | [Literal] 'tstSuffixA.ts' |
 | tstSuffixB.ios.ts:1:1:3:1 | [ExportDeclaration] export ... .ts'; } | semmle.label | [ExportDeclaration] export ... .ts'; } |
-| tstSuffixB.ios.ts:1:1:3:1 | [ExportDeclaration] export ... .ts'; } | semmle.order | 95 |
+| tstSuffixB.ios.ts:1:1:3:1 | [ExportDeclaration] export ... .ts'; } | semmle.order | 96 |
 | tstSuffixB.ios.ts:1:8:3:1 | [FunctionDeclStmt] functio ... .ts'; } | semmle.label | [FunctionDeclStmt] functio ... .ts'; } |
 | tstSuffixB.ios.ts:1:17:1:28 | [VarDecl] resolvedFile | semmle.label | [VarDecl] resolvedFile |
 | tstSuffixB.ios.ts:1:33:1:51 | [LiteralTypeExpr] 'tstSuffixB.ios.ts' | semmle.label | [LiteralTypeExpr] 'tstSuffixB.ios.ts' |
@@ -1930,7 +1957,7 @@ nodes
 | tstSuffixB.ios.ts:2:5:2:31 | [ReturnStmt] return ... os.ts'; | semmle.label | [ReturnStmt] return ... os.ts'; |
 | tstSuffixB.ios.ts:2:12:2:30 | [Literal] 'tstSuffixB.ios.ts' | semmle.label | [Literal] 'tstSuffixB.ios.ts' |
 | tstSuffixB.ts:1:1:3:1 | [ExportDeclaration] export ... .ts'; } | semmle.label | [ExportDeclaration] export ... .ts'; } |
-| tstSuffixB.ts:1:1:3:1 | [ExportDeclaration] export ... .ts'; } | semmle.order | 96 |
+| tstSuffixB.ts:1:1:3:1 | [ExportDeclaration] export ... .ts'; } | semmle.order | 97 |
 | tstSuffixB.ts:1:8:3:1 | [FunctionDeclStmt] functio ... .ts'; } | semmle.label | [FunctionDeclStmt] functio ... .ts'; } |
 | tstSuffixB.ts:1:17:1:28 | [VarDecl] resolvedFile | semmle.label | [VarDecl] resolvedFile |
 | tstSuffixB.ts:1:33:1:47 | [LiteralTypeExpr] 'tstSuffixB.ts' | semmle.label | [LiteralTypeExpr] 'tstSuffixB.ts' |
@@ -1938,16 +1965,16 @@ nodes
 | tstSuffixB.ts:2:5:2:27 | [ReturnStmt] return ... xB.ts'; | semmle.label | [ReturnStmt] return ... xB.ts'; |
 | tstSuffixB.ts:2:12:2:26 | [Literal] 'tstSuffixB.ts' | semmle.label | [Literal] 'tstSuffixB.ts' |
 | type_alias.ts:1:1:1:17 | [TypeAliasDeclaration,TypeDefinition] type B = boolean; | semmle.label | [TypeAliasDeclaration,TypeDefinition] type B = boolean; |
-| type_alias.ts:1:1:1:17 | [TypeAliasDeclaration,TypeDefinition] type B = boolean; | semmle.order | 97 |
+| type_alias.ts:1:1:1:17 | [TypeAliasDeclaration,TypeDefinition] type B = boolean; | semmle.order | 98 |
 | type_alias.ts:1:6:1:6 | [Identifier] B | semmle.label | [Identifier] B |
 | type_alias.ts:1:10:1:16 | [KeywordTypeExpr] boolean | semmle.label | [KeywordTypeExpr] boolean |
 | type_alias.ts:3:1:3:9 | [DeclStmt] var b = ... | semmle.label | [DeclStmt] var b = ... |
-| type_alias.ts:3:1:3:9 | [DeclStmt] var b = ... | semmle.order | 98 |
+| type_alias.ts:3:1:3:9 | [DeclStmt] var b = ... | semmle.order | 99 |
 | type_alias.ts:3:5:3:5 | [VarDecl] b | semmle.label | [VarDecl] b |
 | type_alias.ts:3:5:3:8 | [VariableDeclarator] b: B | semmle.label | [VariableDeclarator] b: B |
 | type_alias.ts:3:8:3:8 | [LocalTypeAccess] B | semmle.label | [LocalTypeAccess] B |
 | type_alias.ts:5:1:5:50 | [TypeAliasDeclaration,TypeDefinition] type Va ... ay<T>>; | semmle.label | [TypeAliasDeclaration,TypeDefinition] type Va ... ay<T>>; |
-| type_alias.ts:5:1:5:50 | [TypeAliasDeclaration,TypeDefinition] type Va ... ay<T>>; | semmle.order | 99 |
+| type_alias.ts:5:1:5:50 | [TypeAliasDeclaration,TypeDefinition] type Va ... ay<T>>; | semmle.order | 100 |
 | type_alias.ts:5:6:5:17 | [Identifier] ValueOrArray | semmle.label | [Identifier] ValueOrArray |
 | type_alias.ts:5:19:5:19 | [Identifier] T | semmle.label | [Identifier] T |
 | type_alias.ts:5:19:5:19 | [TypeParameter] T | semmle.label | [TypeParameter] T |
@@ -1959,14 +1986,14 @@ nodes
 | type_alias.ts:5:34:5:48 | [GenericTypeExpr] ValueOrArray<T> | semmle.label | [GenericTypeExpr] ValueOrArray<T> |
 | type_alias.ts:5:47:5:47 | [LocalTypeAccess] T | semmle.label | [LocalTypeAccess] T |
 | type_alias.ts:7:1:7:28 | [DeclStmt] var c = ... | semmle.label | [DeclStmt] var c = ... |
-| type_alias.ts:7:1:7:28 | [DeclStmt] var c = ... | semmle.order | 100 |
+| type_alias.ts:7:1:7:28 | [DeclStmt] var c = ... | semmle.order | 101 |
 | type_alias.ts:7:5:7:5 | [VarDecl] c | semmle.label | [VarDecl] c |
 | type_alias.ts:7:5:7:27 | [VariableDeclarator] c: Valu ... number> | semmle.label | [VariableDeclarator] c: Valu ... number> |
 | type_alias.ts:7:8:7:19 | [LocalTypeAccess] ValueOrArray | semmle.label | [LocalTypeAccess] ValueOrArray |
 | type_alias.ts:7:8:7:27 | [GenericTypeExpr] ValueOrArray<number> | semmle.label | [GenericTypeExpr] ValueOrArray<number> |
 | type_alias.ts:7:21:7:26 | [KeywordTypeExpr] number | semmle.label | [KeywordTypeExpr] number |
 | type_alias.ts:9:1:15:13 | [TypeAliasDeclaration,TypeDefinition] type Js ... Json[]; | semmle.label | [TypeAliasDeclaration,TypeDefinition] type Js ... Json[]; |
-| type_alias.ts:9:1:15:13 | [TypeAliasDeclaration,TypeDefinition] type Js ... Json[]; | semmle.order | 101 |
+| type_alias.ts:9:1:15:13 | [TypeAliasDeclaration,TypeDefinition] type Js ... Json[]; | semmle.order | 102 |
 | type_alias.ts:9:6:9:9 | [Identifier] Json | semmle.label | [Identifier] Json |
 | type_alias.ts:10:5:15:12 | [UnionTypeExpr] \| strin ... Json[] | semmle.label | [UnionTypeExpr] \| strin ... Json[] |
 | type_alias.ts:10:7:10:12 | [KeywordTypeExpr] string | semmle.label | [KeywordTypeExpr] string |
@@ -1982,12 +2009,12 @@ nodes
 | type_alias.ts:15:7:15:10 | [LocalTypeAccess] Json | semmle.label | [LocalTypeAccess] Json |
 | type_alias.ts:15:7:15:12 | [ArrayTypeExpr] Json[] | semmle.label | [ArrayTypeExpr] Json[] |
 | type_alias.ts:17:1:17:15 | [DeclStmt] var json = ... | semmle.label | [DeclStmt] var json = ... |
-| type_alias.ts:17:1:17:15 | [DeclStmt] var json = ... | semmle.order | 102 |
+| type_alias.ts:17:1:17:15 | [DeclStmt] var json = ... | semmle.order | 103 |
 | type_alias.ts:17:5:17:8 | [VarDecl] json | semmle.label | [VarDecl] json |
 | type_alias.ts:17:5:17:14 | [VariableDeclarator] json: Json | semmle.label | [VariableDeclarator] json: Json |
 | type_alias.ts:17:11:17:14 | [LocalTypeAccess] Json | semmle.label | [LocalTypeAccess] Json |
 | type_alias.ts:19:1:21:57 | [TypeAliasDeclaration,TypeDefinition] type Vi ... ode[]]; | semmle.label | [TypeAliasDeclaration,TypeDefinition] type Vi ... ode[]]; |
-| type_alias.ts:19:1:21:57 | [TypeAliasDeclaration,TypeDefinition] type Vi ... ode[]]; | semmle.order | 103 |
+| type_alias.ts:19:1:21:57 | [TypeAliasDeclaration,TypeDefinition] type Vi ... ode[]]; | semmle.order | 104 |
 | type_alias.ts:19:6:19:16 | [Identifier] VirtualNode | semmle.label | [Identifier] VirtualNode |
 | type_alias.ts:20:5:21:56 | [UnionTypeExpr] \| strin ... Node[]] | semmle.label | [UnionTypeExpr] \| strin ... Node[]] |
 | type_alias.ts:20:7:20:12 | [KeywordTypeExpr] string | semmle.label | [KeywordTypeExpr] string |
@@ -2003,7 +2030,7 @@ nodes
 | type_alias.ts:21:43:21:53 | [LocalTypeAccess] VirtualNode | semmle.label | [LocalTypeAccess] VirtualNode |
 | type_alias.ts:21:43:21:55 | [ArrayTypeExpr] VirtualNode[] | semmle.label | [ArrayTypeExpr] VirtualNode[] |
 | type_alias.ts:23:1:27:6 | [DeclStmt] const myNode = ... | semmle.label | [DeclStmt] const myNode = ... |
-| type_alias.ts:23:1:27:6 | [DeclStmt] const myNode = ... | semmle.order | 104 |
+| type_alias.ts:23:1:27:6 | [DeclStmt] const myNode = ... | semmle.order | 105 |
 | type_alias.ts:23:7:23:12 | [VarDecl] myNode | semmle.label | [VarDecl] myNode |
 | type_alias.ts:23:7:27:5 | [VariableDeclarator] myNode: ... ] ] | semmle.label | [VariableDeclarator] myNode: ... ] ] |
 | type_alias.ts:23:15:23:25 | [LocalTypeAccess] VirtualNode | semmle.label | [LocalTypeAccess] VirtualNode |
@@ -2028,12 +2055,12 @@ nodes
 | type_alias.ts:26:23:26:36 | [Literal] "second-child" | semmle.label | [Literal] "second-child" |
 | type_alias.ts:26:41:26:62 | [Literal] "I'm the second child" | semmle.label | [Literal] "I'm the second child" |
 | type_definition_objects.ts:1:1:1:33 | [ImportDeclaration] import ... dummy"; | semmle.label | [ImportDeclaration] import ... dummy"; |
-| type_definition_objects.ts:1:1:1:33 | [ImportDeclaration] import ... dummy"; | semmle.order | 105 |
+| type_definition_objects.ts:1:1:1:33 | [ImportDeclaration] import ... dummy"; | semmle.order | 106 |
 | type_definition_objects.ts:1:8:1:17 | [ImportSpecifier] * as dummy | semmle.label | [ImportSpecifier] * as dummy |
 | type_definition_objects.ts:1:13:1:17 | [VarDecl] dummy | semmle.label | [VarDecl] dummy |
 | type_definition_objects.ts:1:24:1:32 | [Literal] "./dummy" | semmle.label | [Literal] "./dummy" |
 | type_definition_objects.ts:3:1:3:17 | [ExportDeclaration] export class C {} | semmle.label | [ExportDeclaration] export class C {} |
-| type_definition_objects.ts:3:1:3:17 | [ExportDeclaration] export class C {} | semmle.order | 106 |
+| type_definition_objects.ts:3:1:3:17 | [ExportDeclaration] export class C {} | semmle.order | 107 |
 | type_definition_objects.ts:3:8:3:17 | [ClassDefinition,TypeDefinition] class C {} | semmle.label | [ClassDefinition,TypeDefinition] class C {} |
 | type_definition_objects.ts:3:14:3:14 | [VarDecl] C | semmle.label | [VarDecl] C |
 | type_definition_objects.ts:3:16:3:15 | [BlockStmt] {} | semmle.label | [BlockStmt] {} |
@@ -2041,36 +2068,36 @@ nodes
 | type_definition_objects.ts:3:16:3:15 | [FunctionExpr] () {} | semmle.label | [FunctionExpr] () {} |
 | type_definition_objects.ts:3:16:3:15 | [Label] constructor | semmle.label | [Label] constructor |
 | type_definition_objects.ts:4:1:4:17 | [DeclStmt] let classObj = ... | semmle.label | [DeclStmt] let classObj = ... |
-| type_definition_objects.ts:4:1:4:17 | [DeclStmt] let classObj = ... | semmle.order | 107 |
+| type_definition_objects.ts:4:1:4:17 | [DeclStmt] let classObj = ... | semmle.order | 108 |
 | type_definition_objects.ts:4:5:4:12 | [VarDecl] classObj | semmle.label | [VarDecl] classObj |
 | type_definition_objects.ts:4:5:4:16 | [VariableDeclarator] classObj = C | semmle.label | [VariableDeclarator] classObj = C |
 | type_definition_objects.ts:4:16:4:16 | [VarRef] C | semmle.label | [VarRef] C |
 | type_definition_objects.ts:6:1:6:16 | [ExportDeclaration] export enum E {} | semmle.label | [ExportDeclaration] export enum E {} |
-| type_definition_objects.ts:6:1:6:16 | [ExportDeclaration] export enum E {} | semmle.order | 108 |
+| type_definition_objects.ts:6:1:6:16 | [ExportDeclaration] export enum E {} | semmle.order | 109 |
 | type_definition_objects.ts:6:8:6:16 | [EnumDeclaration,TypeDefinition] enum E {} | semmle.label | [EnumDeclaration,TypeDefinition] enum E {} |
 | type_definition_objects.ts:6:13:6:13 | [VarDecl] E | semmle.label | [VarDecl] E |
 | type_definition_objects.ts:7:1:7:16 | [DeclStmt] let enumObj = ... | semmle.label | [DeclStmt] let enumObj = ... |
-| type_definition_objects.ts:7:1:7:16 | [DeclStmt] let enumObj = ... | semmle.order | 109 |
+| type_definition_objects.ts:7:1:7:16 | [DeclStmt] let enumObj = ... | semmle.order | 110 |
 | type_definition_objects.ts:7:5:7:11 | [VarDecl] enumObj | semmle.label | [VarDecl] enumObj |
 | type_definition_objects.ts:7:5:7:15 | [VariableDeclarator] enumObj = E | semmle.label | [VariableDeclarator] enumObj = E |
 | type_definition_objects.ts:7:15:7:15 | [VarRef] E | semmle.label | [VarRef] E |
 | type_definition_objects.ts:9:1:9:22 | [ExportDeclaration] export ... e N {;} | semmle.label | [ExportDeclaration] export ... e N {;} |
-| type_definition_objects.ts:9:1:9:22 | [ExportDeclaration] export ... e N {;} | semmle.order | 110 |
+| type_definition_objects.ts:9:1:9:22 | [ExportDeclaration] export ... e N {;} | semmle.order | 111 |
 | type_definition_objects.ts:9:8:9:22 | [NamespaceDeclaration] namespace N {;} | semmle.label | [NamespaceDeclaration] namespace N {;} |
 | type_definition_objects.ts:9:18:9:18 | [VarDecl] N | semmle.label | [VarDecl] N |
 | type_definition_objects.ts:9:21:9:21 | [EmptyStmt] ; | semmle.label | [EmptyStmt] ; |
 | type_definition_objects.ts:10:1:10:21 | [DeclStmt] let namespaceObj = ... | semmle.label | [DeclStmt] let namespaceObj = ... |
-| type_definition_objects.ts:10:1:10:21 | [DeclStmt] let namespaceObj = ... | semmle.order | 111 |
+| type_definition_objects.ts:10:1:10:21 | [DeclStmt] let namespaceObj = ... | semmle.order | 112 |
 | type_definition_objects.ts:10:5:10:16 | [VarDecl] namespaceObj | semmle.label | [VarDecl] namespaceObj |
 | type_definition_objects.ts:10:5:10:20 | [VariableDeclarator] namespaceObj = N | semmle.label | [VariableDeclarator] namespaceObj = N |
 | type_definition_objects.ts:10:20:10:20 | [VarRef] N | semmle.label | [VarRef] N |
 | type_definitions.ts:1:1:1:33 | [ImportDeclaration] import ... dummy"; | semmle.label | [ImportDeclaration] import ... dummy"; |
-| type_definitions.ts:1:1:1:33 | [ImportDeclaration] import ... dummy"; | semmle.order | 112 |
+| type_definitions.ts:1:1:1:33 | [ImportDeclaration] import ... dummy"; | semmle.order | 113 |
 | type_definitions.ts:1:8:1:17 | [ImportSpecifier] * as dummy | semmle.label | [ImportSpecifier] * as dummy |
 | type_definitions.ts:1:13:1:17 | [VarDecl] dummy | semmle.label | [VarDecl] dummy |
 | type_definitions.ts:1:24:1:32 | [Literal] "./dummy" | semmle.label | [Literal] "./dummy" |
 | type_definitions.ts:3:1:5:1 | [InterfaceDeclaration,TypeDefinition] interfa ... x: S; } | semmle.label | [InterfaceDeclaration,TypeDefinition] interfa ... x: S; } |
-| type_definitions.ts:3:1:5:1 | [InterfaceDeclaration,TypeDefinition] interfa ... x: S; } | semmle.order | 113 |
+| type_definitions.ts:3:1:5:1 | [InterfaceDeclaration,TypeDefinition] interfa ... x: S; } | semmle.order | 114 |
 | type_definitions.ts:3:11:3:11 | [Identifier] I | semmle.label | [Identifier] I |
 | type_definitions.ts:3:13:3:13 | [Identifier] S | semmle.label | [Identifier] S |
 | type_definitions.ts:3:13:3:13 | [TypeParameter] S | semmle.label | [TypeParameter] S |
@@ -2078,14 +2105,14 @@ nodes
 | type_definitions.ts:4:3:4:7 | [FieldDeclaration] x: S; | semmle.label | [FieldDeclaration] x: S; |
 | type_definitions.ts:4:6:4:6 | [LocalTypeAccess] S | semmle.label | [LocalTypeAccess] S |
 | type_definitions.ts:6:1:6:16 | [DeclStmt] let i = ... | semmle.label | [DeclStmt] let i = ... |
-| type_definitions.ts:6:1:6:16 | [DeclStmt] let i = ... | semmle.order | 114 |
+| type_definitions.ts:6:1:6:16 | [DeclStmt] let i = ... | semmle.order | 115 |
 | type_definitions.ts:6:5:6:5 | [VarDecl] i | semmle.label | [VarDecl] i |
 | type_definitions.ts:6:5:6:16 | [VariableDeclarator] i: I<number> | semmle.label | [VariableDeclarator] i: I<number> |
 | type_definitions.ts:6:8:6:8 | [LocalTypeAccess] I | semmle.label | [LocalTypeAccess] I |
 | type_definitions.ts:6:8:6:16 | [GenericTypeExpr] I<number> | semmle.label | [GenericTypeExpr] I<number> |
 | type_definitions.ts:6:10:6:15 | [KeywordTypeExpr] number | semmle.label | [KeywordTypeExpr] number |
 | type_definitions.ts:8:1:10:1 | [ClassDefinition,TypeDefinition] class C ... x: T } | semmle.label | [ClassDefinition,TypeDefinition] class C ... x: T } |
-| type_definitions.ts:8:1:10:1 | [ClassDefinition,TypeDefinition] class C ... x: T } | semmle.order | 115 |
+| type_definitions.ts:8:1:10:1 | [ClassDefinition,TypeDefinition] class C ... x: T } | semmle.order | 116 |
 | type_definitions.ts:8:7:8:7 | [VarDecl] C | semmle.label | [VarDecl] C |
 | type_definitions.ts:8:8:8:7 | [BlockStmt] {} | semmle.label | [BlockStmt] {} |
 | type_definitions.ts:8:8:8:7 | [ClassInitializedMember,ConstructorDefinition] constructor() {} | semmle.label | [ClassInitializedMember,ConstructorDefinition] constructor() {} |
@@ -2097,14 +2124,14 @@ nodes
 | type_definitions.ts:9:3:9:6 | [FieldDeclaration] x: T | semmle.label | [FieldDeclaration] x: T |
 | type_definitions.ts:9:6:9:6 | [LocalTypeAccess] T | semmle.label | [LocalTypeAccess] T |
 | type_definitions.ts:11:1:11:17 | [DeclStmt] let c = ... | semmle.label | [DeclStmt] let c = ... |
-| type_definitions.ts:11:1:11:17 | [DeclStmt] let c = ... | semmle.order | 116 |
+| type_definitions.ts:11:1:11:17 | [DeclStmt] let c = ... | semmle.order | 117 |
 | type_definitions.ts:11:5:11:5 | [VarDecl] c | semmle.label | [VarDecl] c |
 | type_definitions.ts:11:5:11:16 | [VariableDeclarator] c: C<number> | semmle.label | [VariableDeclarator] c: C<number> |
 | type_definitions.ts:11:8:11:8 | [LocalTypeAccess] C | semmle.label | [LocalTypeAccess] C |
 | type_definitions.ts:11:8:11:16 | [GenericTypeExpr] C<number> | semmle.label | [GenericTypeExpr] C<number> |
 | type_definitions.ts:11:10:11:15 | [KeywordTypeExpr] number | semmle.label | [KeywordTypeExpr] number |
 | type_definitions.ts:13:1:15:1 | [EnumDeclaration,TypeDefinition] enum Co ... blue } | semmle.label | [EnumDeclaration,TypeDefinition] enum Co ... blue } |
-| type_definitions.ts:13:1:15:1 | [EnumDeclaration,TypeDefinition] enum Co ... blue } | semmle.order | 117 |
+| type_definitions.ts:13:1:15:1 | [EnumDeclaration,TypeDefinition] enum Co ... blue } | semmle.order | 118 |
 | type_definitions.ts:13:6:13:10 | [VarDecl] Color | semmle.label | [VarDecl] Color |
 | type_definitions.ts:14:3:14:5 | [EnumMember,TypeDefinition] red | semmle.label | [EnumMember,TypeDefinition] red |
 | type_definitions.ts:14:3:14:5 | [VarDecl] red | semmle.label | [VarDecl] red |
@@ -2113,29 +2140,29 @@ nodes
 | type_definitions.ts:14:15:14:18 | [EnumMember,TypeDefinition] blue | semmle.label | [EnumMember,TypeDefinition] blue |
 | type_definitions.ts:14:15:14:18 | [VarDecl] blue | semmle.label | [VarDecl] blue |
 | type_definitions.ts:16:1:16:17 | [DeclStmt] let color = ... | semmle.label | [DeclStmt] let color = ... |
-| type_definitions.ts:16:1:16:17 | [DeclStmt] let color = ... | semmle.order | 118 |
+| type_definitions.ts:16:1:16:17 | [DeclStmt] let color = ... | semmle.order | 119 |
 | type_definitions.ts:16:5:16:9 | [VarDecl] color | semmle.label | [VarDecl] color |
 | type_definitions.ts:16:5:16:16 | [VariableDeclarator] color: Color | semmle.label | [VariableDeclarator] color: Color |
 | type_definitions.ts:16:12:16:16 | [LocalTypeAccess] Color | semmle.label | [LocalTypeAccess] Color |
 | type_definitions.ts:18:1:18:33 | [EnumDeclaration,TypeDefinition] enum En ... ember } | semmle.label | [EnumDeclaration,TypeDefinition] enum En ... ember } |
-| type_definitions.ts:18:1:18:33 | [EnumDeclaration,TypeDefinition] enum En ... ember } | semmle.order | 119 |
+| type_definitions.ts:18:1:18:33 | [EnumDeclaration,TypeDefinition] enum En ... ember } | semmle.order | 120 |
 | type_definitions.ts:18:6:18:22 | [VarDecl] EnumWithOneMember | semmle.label | [VarDecl] EnumWithOneMember |
 | type_definitions.ts:18:26:18:31 | [EnumMember,TypeDefinition] member | semmle.label | [EnumMember,TypeDefinition] member |
 | type_definitions.ts:18:26:18:31 | [VarDecl] member | semmle.label | [VarDecl] member |
 | type_definitions.ts:19:1:19:25 | [DeclStmt] let e = ... | semmle.label | [DeclStmt] let e = ... |
-| type_definitions.ts:19:1:19:25 | [DeclStmt] let e = ... | semmle.order | 120 |
+| type_definitions.ts:19:1:19:25 | [DeclStmt] let e = ... | semmle.order | 121 |
 | type_definitions.ts:19:5:19:5 | [VarDecl] e | semmle.label | [VarDecl] e |
 | type_definitions.ts:19:5:19:24 | [VariableDeclarator] e: EnumWithOneMember | semmle.label | [VariableDeclarator] e: EnumWithOneMember |
 | type_definitions.ts:19:8:19:24 | [LocalTypeAccess] EnumWithOneMember | semmle.label | [LocalTypeAccess] EnumWithOneMember |
 | type_definitions.ts:21:1:21:20 | [TypeAliasDeclaration,TypeDefinition] type Alias<T> = T[]; | semmle.label | [TypeAliasDeclaration,TypeDefinition] type Alias<T> = T[]; |
-| type_definitions.ts:21:1:21:20 | [TypeAliasDeclaration,TypeDefinition] type Alias<T> = T[]; | semmle.order | 121 |
+| type_definitions.ts:21:1:21:20 | [TypeAliasDeclaration,TypeDefinition] type Alias<T> = T[]; | semmle.order | 122 |
 | type_definitions.ts:21:6:21:10 | [Identifier] Alias | semmle.label | [Identifier] Alias |
 | type_definitions.ts:21:12:21:12 | [Identifier] T | semmle.label | [Identifier] T |
 | type_definitions.ts:21:12:21:12 | [TypeParameter] T | semmle.label | [TypeParameter] T |
 | type_definitions.ts:21:17:21:17 | [LocalTypeAccess] T | semmle.label | [LocalTypeAccess] T |
 | type_definitions.ts:21:17:21:19 | [ArrayTypeExpr] T[] | semmle.label | [ArrayTypeExpr] T[] |
 | type_definitions.ts:22:1:22:39 | [DeclStmt] let aliasForNumberArray = ... | semmle.label | [DeclStmt] let aliasForNumberArray = ... |
-| type_definitions.ts:22:1:22:39 | [DeclStmt] let aliasForNumberArray = ... | semmle.order | 122 |
+| type_definitions.ts:22:1:22:39 | [DeclStmt] let aliasForNumberArray = ... | semmle.order | 123 |
 | type_definitions.ts:22:5:22:23 | [VarDecl] aliasForNumberArray | semmle.label | [VarDecl] aliasForNumberArray |
 | type_definitions.ts:22:5:22:38 | [VariableDeclarator] aliasFo ... number> | semmle.label | [VariableDeclarator] aliasFo ... number> |
 | type_definitions.ts:22:26:22:30 | [LocalTypeAccess] Alias | semmle.label | [LocalTypeAccess] Alias |
@@ -5534,6 +5561,56 @@ edges
 | tst.ts:508:17:508:36 | [DotExpr] obj[key].toUpperCase | tst.ts:508:26:508:36 | [Label] toUpperCase | semmle.order | 2 |
 | tst.ts:508:17:508:38 | [MethodCallExpr] obj[key ... rCase() | tst.ts:508:17:508:36 | [DotExpr] obj[key].toUpperCase | semmle.label | 0 |
 | tst.ts:508:17:508:38 | [MethodCallExpr] obj[key ... rCase() | tst.ts:508:17:508:36 | [DotExpr] obj[key].toUpperCase | semmle.order | 0 |
+| tst.ts:513:1:520:1 | [NamespaceDeclaration] namespa ... type. } | tst.ts:513:11:513:14 | [VarDecl] TS57 | semmle.label | 1 |
+| tst.ts:513:1:520:1 | [NamespaceDeclaration] namespa ... type. } | tst.ts:513:11:513:14 | [VarDecl] TS57 | semmle.order | 1 |
+| tst.ts:513:1:520:1 | [NamespaceDeclaration] namespa ... type. } | tst.ts:514:3:514:26 | [DeclStmt] const a = ... | semmle.label | 2 |
+| tst.ts:513:1:520:1 | [NamespaceDeclaration] namespa ... type. } | tst.ts:514:3:514:26 | [DeclStmt] const a = ... | semmle.order | 2 |
+| tst.ts:513:1:520:1 | [NamespaceDeclaration] namespa ... type. } | tst.ts:515:3:517:3 | [ExportDeclaration] export ... }; } | semmle.label | 3 |
+| tst.ts:513:1:520:1 | [NamespaceDeclaration] namespa ... type. } | tst.ts:515:3:517:3 | [ExportDeclaration] export ... }; } | semmle.order | 3 |
+| tst.ts:513:1:520:1 | [NamespaceDeclaration] namespa ... type. } | tst.ts:519:3:519:32 | [DeclStmt] const e1 = ... | semmle.label | 4 |
+| tst.ts:513:1:520:1 | [NamespaceDeclaration] namespa ... type. } | tst.ts:519:3:519:32 | [DeclStmt] const e1 = ... | semmle.order | 4 |
+| tst.ts:514:3:514:26 | [DeclStmt] const a = ... | tst.ts:514:17:514:25 | [VariableDeclarator] a: symbol | semmle.label | 1 |
+| tst.ts:514:3:514:26 | [DeclStmt] const a = ... | tst.ts:514:17:514:25 | [VariableDeclarator] a: symbol | semmle.order | 1 |
+| tst.ts:514:17:514:25 | [VariableDeclarator] a: symbol | tst.ts:514:17:514:17 | [VarDecl] a | semmle.label | 1 |
+| tst.ts:514:17:514:25 | [VariableDeclarator] a: symbol | tst.ts:514:17:514:17 | [VarDecl] a | semmle.order | 1 |
+| tst.ts:514:17:514:25 | [VariableDeclarator] a: symbol | tst.ts:514:20:514:25 | [KeywordTypeExpr] symbol | semmle.label | 2 |
+| tst.ts:514:17:514:25 | [VariableDeclarator] a: symbol | tst.ts:514:20:514:25 | [KeywordTypeExpr] symbol | semmle.order | 2 |
+| tst.ts:515:3:517:3 | [ExportDeclaration] export ... }; } | tst.ts:515:10:517:3 | [ClassDefinition,TypeDefinition] class A ... }; } | semmle.label | 1 |
+| tst.ts:515:3:517:3 | [ExportDeclaration] export ... }; } | tst.ts:515:10:517:3 | [ClassDefinition,TypeDefinition] class A ... }; } | semmle.order | 1 |
+| tst.ts:515:10:517:3 | [ClassDefinition,TypeDefinition] class A ... }; } | tst.ts:515:16:515:16 | [VarDecl] A | semmle.label | 1 |
+| tst.ts:515:10:517:3 | [ClassDefinition,TypeDefinition] class A ... }; } | tst.ts:515:16:515:16 | [VarDecl] A | semmle.order | 1 |
+| tst.ts:515:10:517:3 | [ClassDefinition,TypeDefinition] class A ... }; } | tst.ts:515:18:515:17 | [ClassInitializedMember,ConstructorDefinition] constructor() {} | semmle.label | 2 |
+| tst.ts:515:10:517:3 | [ClassDefinition,TypeDefinition] class A ... }; } | tst.ts:515:18:515:17 | [ClassInitializedMember,ConstructorDefinition] constructor() {} | semmle.order | 2 |
+| tst.ts:515:10:517:3 | [ClassDefinition,TypeDefinition] class A ... }; } | tst.ts:516:7:516:24 | [ClassInitializedMember,MethodDefinition] [a]() { return 1 } | semmle.label | 3 |
+| tst.ts:515:10:517:3 | [ClassDefinition,TypeDefinition] class A ... }; } | tst.ts:516:7:516:24 | [ClassInitializedMember,MethodDefinition] [a]() { return 1 } | semmle.order | 3 |
+| tst.ts:515:18:515:17 | [ClassInitializedMember,ConstructorDefinition] constructor() {} | tst.ts:515:18:515:17 | [FunctionExpr] () {} | semmle.label | 2 |
+| tst.ts:515:18:515:17 | [ClassInitializedMember,ConstructorDefinition] constructor() {} | tst.ts:515:18:515:17 | [FunctionExpr] () {} | semmle.order | 2 |
+| tst.ts:515:18:515:17 | [ClassInitializedMember,ConstructorDefinition] constructor() {} | tst.ts:515:18:515:17 | [Label] constructor | semmle.label | 1 |
+| tst.ts:515:18:515:17 | [ClassInitializedMember,ConstructorDefinition] constructor() {} | tst.ts:515:18:515:17 | [Label] constructor | semmle.order | 1 |
+| tst.ts:515:18:515:17 | [FunctionExpr] () {} | tst.ts:515:18:515:17 | [BlockStmt] {} | semmle.label | 5 |
+| tst.ts:515:18:515:17 | [FunctionExpr] () {} | tst.ts:515:18:515:17 | [BlockStmt] {} | semmle.order | 5 |
+| tst.ts:516:7:516:24 | [ClassInitializedMember,MethodDefinition] [a]() { return 1 } | tst.ts:516:7:516:24 | [FunctionExpr] [a]() { return 1 } | semmle.label | 1 |
+| tst.ts:516:7:516:24 | [ClassInitializedMember,MethodDefinition] [a]() { return 1 } | tst.ts:516:7:516:24 | [FunctionExpr] [a]() { return 1 } | semmle.order | 1 |
+| tst.ts:516:7:516:24 | [ClassInitializedMember,MethodDefinition] [a]() { return 1 } | tst.ts:516:8:516:8 | [VarRef] a | semmle.label | 2 |
+| tst.ts:516:7:516:24 | [ClassInitializedMember,MethodDefinition] [a]() { return 1 } | tst.ts:516:8:516:8 | [VarRef] a | semmle.order | 2 |
+| tst.ts:516:7:516:24 | [FunctionExpr] [a]() { return 1 } | tst.ts:516:13:516:24 | [BlockStmt] { return 1 } | semmle.label | 5 |
+| tst.ts:516:7:516:24 | [FunctionExpr] [a]() { return 1 } | tst.ts:516:13:516:24 | [BlockStmt] { return 1 } | semmle.order | 5 |
+| tst.ts:516:13:516:24 | [BlockStmt] { return 1 } | tst.ts:516:15:516:22 | [ReturnStmt] return 1 | semmle.label | 1 |
+| tst.ts:516:13:516:24 | [BlockStmt] { return 1 } | tst.ts:516:15:516:22 | [ReturnStmt] return 1 | semmle.order | 1 |
+| tst.ts:516:15:516:22 | [ReturnStmt] return 1 | tst.ts:516:22:516:22 | [Literal] 1 | semmle.label | 1 |
+| tst.ts:516:15:516:22 | [ReturnStmt] return 1 | tst.ts:516:22:516:22 | [Literal] 1 | semmle.order | 1 |
+| tst.ts:519:3:519:32 | [DeclStmt] const e1 = ... | tst.ts:519:17:519:31 | [VariableDeclarator] e1: A[typeof a] | semmle.label | 1 |
+| tst.ts:519:3:519:32 | [DeclStmt] const e1 = ... | tst.ts:519:17:519:31 | [VariableDeclarator] e1: A[typeof a] | semmle.order | 1 |
+| tst.ts:519:17:519:31 | [VariableDeclarator] e1: A[typeof a] | tst.ts:519:17:519:18 | [VarDecl] e1 | semmle.label | 1 |
+| tst.ts:519:17:519:31 | [VariableDeclarator] e1: A[typeof a] | tst.ts:519:17:519:18 | [VarDecl] e1 | semmle.order | 1 |
+| tst.ts:519:17:519:31 | [VariableDeclarator] e1: A[typeof a] | tst.ts:519:21:519:31 | [IndexedAccessTypeExpr] A[typeof a] | semmle.label | 2 |
+| tst.ts:519:17:519:31 | [VariableDeclarator] e1: A[typeof a] | tst.ts:519:21:519:31 | [IndexedAccessTypeExpr] A[typeof a] | semmle.order | 2 |
+| tst.ts:519:21:519:31 | [IndexedAccessTypeExpr] A[typeof a] | tst.ts:519:21:519:21 | [LocalTypeAccess] A | semmle.label | 1 |
+| tst.ts:519:21:519:31 | [IndexedAccessTypeExpr] A[typeof a] | tst.ts:519:21:519:21 | [LocalTypeAccess] A | semmle.order | 1 |
+| tst.ts:519:21:519:31 | [IndexedAccessTypeExpr] A[typeof a] | tst.ts:519:23:519:30 | [TypeofTypeExpr] typeof a | semmle.label | 2 |
+| tst.ts:519:21:519:31 | [IndexedAccessTypeExpr] A[typeof a] | tst.ts:519:23:519:30 | [TypeofTypeExpr] typeof a | semmle.order | 2 |
+| tst.ts:519:23:519:30 | [TypeofTypeExpr] typeof a | tst.ts:519:30:519:30 | [LocalVarTypeAccess] a | semmle.label | 1 |
+| tst.ts:519:23:519:30 | [TypeofTypeExpr] typeof a | tst.ts:519:30:519:30 | [LocalVarTypeAccess] a | semmle.order | 1 |
 | tstModuleCJS.cts:1:1:3:1 | [ExportDeclaration] export ... 'b'; } | tstModuleCJS.cts:1:8:3:1 | [FunctionDeclStmt] functio ... 'b'; } | semmle.label | 1 |
 | tstModuleCJS.cts:1:1:3:1 | [ExportDeclaration] export ... 'b'; } | tstModuleCJS.cts:1:8:3:1 | [FunctionDeclStmt] functio ... 'b'; } | semmle.order | 1 |
 | tstModuleCJS.cts:1:8:3:1 | [FunctionDeclStmt] functio ... 'b'; } | tstModuleCJS.cts:1:17:1:28 | [VarDecl] tstModuleCJS | semmle.label | 0 |
diff --git a/javascript/ql/test/library-tests/TypeScript/Types/tests.expected b/javascript/ql/test/library-tests/TypeScript/Types/tests.expected
index b786fae3713..150ce186724 100644
--- a/javascript/ql/test/library-tests/TypeScript/Types/tests.expected
+++ b/javascript/ql/test/library-tests/TypeScript/Types/tests.expected
@@ -728,6 +728,13 @@ getExprType
 | tst.ts:508:17:508:38 | obj[key ... rCase() | string |
 | tst.ts:508:21:508:23 | key | string |
 | tst.ts:508:26:508:36 | toUpperCase | () => string |
+| tst.ts:513:11:513:14 | TS57 | typeof TS57 in tst.ts |
+| tst.ts:514:17:514:17 | a | symbol |
+| tst.ts:515:16:515:16 | A | A |
+| tst.ts:516:7:516:24 | [a]() { return 1 } | () => number |
+| tst.ts:516:8:516:8 | a | symbol |
+| tst.ts:516:22:516:22 | 1 | 1 |
+| tst.ts:519:17:519:18 | e1 | () => number |
 | tstModuleCJS.cts:1:17:1:28 | tstModuleCJS | () => "a" \| "b" |
 | tstModuleCJS.cts:2:12:2:15 | Math | Math |
 | tstModuleCJS.cts:2:12:2:22 | Math.random | () => number |
@@ -843,6 +850,7 @@ getTypeDefinitionType
 | tst.ts:447:5:458:5 | class P ... }\\n    } | Person |
 | tst.ts:473:5:476:5 | class S ... ;\\n    } | SomeClass |
 | tst.ts:481:5:481:34 | type Pa ...  T, T]; | Pair3<T> |
+| tst.ts:515:10:517:3 | class A ...  };\\n  } | A |
 | type_alias.ts:1:1:1:17 | type B = boolean; | boolean |
 | type_alias.ts:5:1:5:50 | type Va ... ay<T>>; | ValueOrArray<T> |
 | type_alias.ts:9:1:15:13 | type Js ... Json[]; | Json |
@@ -1219,6 +1227,11 @@ getTypeExprType
 | tst.ts:506:27:506:32 | string | string |
 | tst.ts:506:35:506:41 | unknown | unknown |
 | tst.ts:506:50:506:55 | string | string |
+| tst.ts:514:20:514:25 | symbol | symbol |
+| tst.ts:519:21:519:21 | A | A |
+| tst.ts:519:21:519:31 | A[typeof a] | () => number |
+| tst.ts:519:23:519:30 | typeof a | symbol |
+| tst.ts:519:30:519:30 | a | symbol |
 | tstModuleCJS.cts:1:33:1:35 | 'a' | "a" |
 | tstModuleCJS.cts:1:33:1:41 | 'a' \| 'b' | "a" \| "b" |
 | tstModuleCJS.cts:1:39:1:41 | 'b' | "b" |
@@ -1290,6 +1303,7 @@ getTypeExprType
 missingToString
 referenceDefinition
 | A | badTypes.ts:5:1:5:29 | interfa ... is.B {} |
+| A | tst.ts:515:10:517:3 | class A ...  };\\n  } |
 | Action | tst.ts:252:3:254:50 | type Ac ... ring }; |
 | Alias<T> | type_definitions.ts:21:1:21:20 | type Alias<T> = T[]; |
 | Alias<number> | type_definitions.ts:21:1:21:20 | type Alias<T> = T[]; |
diff --git a/javascript/ql/test/library-tests/TypeScript/Types/tst.ts b/javascript/ql/test/library-tests/TypeScript/Types/tst.ts
index 4c29465b564..87f876be9d0 100644
--- a/javascript/ql/test/library-tests/TypeScript/Types/tst.ts
+++ b/javascript/ql/test/library-tests/TypeScript/Types/tst.ts
@@ -508,4 +508,13 @@ module TS55 {
       var str = obj[key].toUpperCase(); // Now okay, previously was error
     }
   }
-}
\ No newline at end of file
+}
+
+namespace TS57{
+  declare const a: symbol;
+  export class A {
+      [a]() { return 1 };
+  }
+
+  declare const e1: A[typeof a]; // Now okay, previously was compilation error TS2538: Type 'symbol' cannot be used as an index type.
+}
diff --git a/javascript/ql/test/library-tests/threat-models/sources/TestSources.expected b/javascript/ql/test/library-tests/threat-models/sources/TestSources.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/javascript/ql/test/library-tests/threat-models/sources/TestSources.expected
+++ b/javascript/ql/test/library-tests/threat-models/sources/TestSources.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/TaintedPath.expected b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/TaintedPath.expected
index 0022ca69c6b..6a45147a4e2 100644
--- a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/TaintedPath.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/TaintedPath.expected
@@ -1517,6 +1517,207 @@ nodes
 | TaintedPath.js:198:35:198:38 | path |
 | TaintedPath.js:198:35:198:38 | path |
 | TaintedPath.js:198:35:198:38 | path |
+| TaintedPath.js:202:7:202:48 | path |
+| TaintedPath.js:202:7:202:48 | path |
+| TaintedPath.js:202:7:202:48 | path |
+| TaintedPath.js:202:7:202:48 | path |
+| TaintedPath.js:202:7:202:48 | path |
+| TaintedPath.js:202:7:202:48 | path |
+| TaintedPath.js:202:7:202:48 | path |
+| TaintedPath.js:202:7:202:48 | path |
+| TaintedPath.js:202:7:202:48 | path |
+| TaintedPath.js:202:7:202:48 | path |
+| TaintedPath.js:202:7:202:48 | path |
+| TaintedPath.js:202:7:202:48 | path |
+| TaintedPath.js:202:7:202:48 | path |
+| TaintedPath.js:202:7:202:48 | path |
+| TaintedPath.js:202:7:202:48 | path |
+| TaintedPath.js:202:7:202:48 | path |
+| TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:14:202:43 | url.par ... ).query |
+| TaintedPath.js:202:14:202:43 | url.par ... ).query |
+| TaintedPath.js:202:14:202:43 | url.par ... ).query |
+| TaintedPath.js:202:14:202:43 | url.par ... ).query |
+| TaintedPath.js:202:14:202:43 | url.par ... ).query |
+| TaintedPath.js:202:14:202:43 | url.par ... ).query |
+| TaintedPath.js:202:14:202:43 | url.par ... ).query |
+| TaintedPath.js:202:14:202:43 | url.par ... ).query |
+| TaintedPath.js:202:14:202:43 | url.par ... ).query |
+| TaintedPath.js:202:14:202:43 | url.par ... ).query |
+| TaintedPath.js:202:14:202:43 | url.par ... ).query |
+| TaintedPath.js:202:14:202:43 | url.par ... ).query |
+| TaintedPath.js:202:14:202:43 | url.par ... ).query |
+| TaintedPath.js:202:14:202:43 | url.par ... ).query |
+| TaintedPath.js:202:14:202:43 | url.par ... ).query |
+| TaintedPath.js:202:14:202:43 | url.par ... ).query |
+| TaintedPath.js:202:14:202:48 | url.par ... ry.path |
+| TaintedPath.js:202:14:202:48 | url.par ... ry.path |
+| TaintedPath.js:202:14:202:48 | url.par ... ry.path |
+| TaintedPath.js:202:14:202:48 | url.par ... ry.path |
+| TaintedPath.js:202:14:202:48 | url.par ... ry.path |
+| TaintedPath.js:202:14:202:48 | url.par ... ry.path |
+| TaintedPath.js:202:14:202:48 | url.par ... ry.path |
+| TaintedPath.js:202:14:202:48 | url.par ... ry.path |
+| TaintedPath.js:202:14:202:48 | url.par ... ry.path |
+| TaintedPath.js:202:14:202:48 | url.par ... ry.path |
+| TaintedPath.js:202:14:202:48 | url.par ... ry.path |
+| TaintedPath.js:202:14:202:48 | url.par ... ry.path |
+| TaintedPath.js:202:14:202:48 | url.par ... ry.path |
+| TaintedPath.js:202:14:202:48 | url.par ... ry.path |
+| TaintedPath.js:202:14:202:48 | url.par ... ry.path |
+| TaintedPath.js:202:14:202:48 | url.par ... ry.path |
+| TaintedPath.js:202:24:202:30 | req.url |
+| TaintedPath.js:202:24:202:30 | req.url |
+| TaintedPath.js:202:24:202:30 | req.url |
+| TaintedPath.js:202:24:202:30 | req.url |
+| TaintedPath.js:202:24:202:30 | req.url |
+| TaintedPath.js:206:29:206:32 | path |
+| TaintedPath.js:206:29:206:32 | path |
+| TaintedPath.js:206:29:206:32 | path |
+| TaintedPath.js:206:29:206:32 | path |
+| TaintedPath.js:206:29:206:32 | path |
+| TaintedPath.js:206:29:206:32 | path |
+| TaintedPath.js:206:29:206:32 | path |
+| TaintedPath.js:206:29:206:32 | path |
+| TaintedPath.js:206:29:206:32 | path |
+| TaintedPath.js:206:29:206:32 | path |
+| TaintedPath.js:206:29:206:32 | path |
+| TaintedPath.js:206:29:206:32 | path |
+| TaintedPath.js:206:29:206:32 | path |
+| TaintedPath.js:206:29:206:32 | path |
+| TaintedPath.js:206:29:206:32 | path |
+| TaintedPath.js:206:29:206:32 | path |
+| TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:211:7:211:48 | path |
+| TaintedPath.js:211:7:211:48 | path |
+| TaintedPath.js:211:7:211:48 | path |
+| TaintedPath.js:211:7:211:48 | path |
+| TaintedPath.js:211:7:211:48 | path |
+| TaintedPath.js:211:7:211:48 | path |
+| TaintedPath.js:211:7:211:48 | path |
+| TaintedPath.js:211:7:211:48 | path |
+| TaintedPath.js:211:7:211:48 | path |
+| TaintedPath.js:211:7:211:48 | path |
+| TaintedPath.js:211:7:211:48 | path |
+| TaintedPath.js:211:7:211:48 | path |
+| TaintedPath.js:211:7:211:48 | path |
+| TaintedPath.js:211:7:211:48 | path |
+| TaintedPath.js:211:7:211:48 | path |
+| TaintedPath.js:211:7:211:48 | path |
+| TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:14:211:43 | url.par ... ).query |
+| TaintedPath.js:211:14:211:43 | url.par ... ).query |
+| TaintedPath.js:211:14:211:43 | url.par ... ).query |
+| TaintedPath.js:211:14:211:43 | url.par ... ).query |
+| TaintedPath.js:211:14:211:43 | url.par ... ).query |
+| TaintedPath.js:211:14:211:43 | url.par ... ).query |
+| TaintedPath.js:211:14:211:43 | url.par ... ).query |
+| TaintedPath.js:211:14:211:43 | url.par ... ).query |
+| TaintedPath.js:211:14:211:43 | url.par ... ).query |
+| TaintedPath.js:211:14:211:43 | url.par ... ).query |
+| TaintedPath.js:211:14:211:43 | url.par ... ).query |
+| TaintedPath.js:211:14:211:43 | url.par ... ).query |
+| TaintedPath.js:211:14:211:43 | url.par ... ).query |
+| TaintedPath.js:211:14:211:43 | url.par ... ).query |
+| TaintedPath.js:211:14:211:43 | url.par ... ).query |
+| TaintedPath.js:211:14:211:43 | url.par ... ).query |
+| TaintedPath.js:211:14:211:48 | url.par ... ry.path |
+| TaintedPath.js:211:14:211:48 | url.par ... ry.path |
+| TaintedPath.js:211:14:211:48 | url.par ... ry.path |
+| TaintedPath.js:211:14:211:48 | url.par ... ry.path |
+| TaintedPath.js:211:14:211:48 | url.par ... ry.path |
+| TaintedPath.js:211:14:211:48 | url.par ... ry.path |
+| TaintedPath.js:211:14:211:48 | url.par ... ry.path |
+| TaintedPath.js:211:14:211:48 | url.par ... ry.path |
+| TaintedPath.js:211:14:211:48 | url.par ... ry.path |
+| TaintedPath.js:211:14:211:48 | url.par ... ry.path |
+| TaintedPath.js:211:14:211:48 | url.par ... ry.path |
+| TaintedPath.js:211:14:211:48 | url.par ... ry.path |
+| TaintedPath.js:211:14:211:48 | url.par ... ry.path |
+| TaintedPath.js:211:14:211:48 | url.par ... ry.path |
+| TaintedPath.js:211:14:211:48 | url.par ... ry.path |
+| TaintedPath.js:211:14:211:48 | url.par ... ry.path |
+| TaintedPath.js:211:24:211:30 | req.url |
+| TaintedPath.js:211:24:211:30 | req.url |
+| TaintedPath.js:211:24:211:30 | req.url |
+| TaintedPath.js:211:24:211:30 | req.url |
+| TaintedPath.js:211:24:211:30 | req.url |
+| TaintedPath.js:213:29:213:32 | path |
+| TaintedPath.js:213:29:213:32 | path |
+| TaintedPath.js:213:29:213:32 | path |
+| TaintedPath.js:213:29:213:32 | path |
+| TaintedPath.js:213:29:213:32 | path |
+| TaintedPath.js:213:29:213:32 | path |
+| TaintedPath.js:213:29:213:32 | path |
+| TaintedPath.js:213:29:213:32 | path |
+| TaintedPath.js:213:29:213:68 | path.re ... '), '') |
+| TaintedPath.js:213:29:213:68 | path.re ... '), '') |
+| TaintedPath.js:213:29:213:68 | path.re ... '), '') |
+| TaintedPath.js:213:29:213:68 | path.re ... '), '') |
+| TaintedPath.js:213:29:213:68 | path.re ... '), '') |
+| TaintedPath.js:216:31:216:34 | path |
+| TaintedPath.js:216:31:216:34 | path |
+| TaintedPath.js:216:31:216:34 | path |
+| TaintedPath.js:216:31:216:34 | path |
+| TaintedPath.js:216:31:216:34 | path |
+| TaintedPath.js:216:31:216:34 | path |
+| TaintedPath.js:216:31:216:34 | path |
+| TaintedPath.js:216:31:216:34 | path |
+| TaintedPath.js:216:31:216:69 | path.re ... '), '') |
+| TaintedPath.js:216:31:216:69 | path.re ... '), '') |
+| TaintedPath.js:216:31:216:69 | path.re ... '), '') |
+| TaintedPath.js:216:31:216:69 | path.re ... '), '') |
+| TaintedPath.js:216:31:216:69 | path.re ... '), '') |
+| TaintedPath.js:216:31:216:69 | path.re ... '), '') |
+| TaintedPath.js:216:31:216:69 | path.re ... '), '') |
+| TaintedPath.js:216:31:216:69 | path.re ... '), '') |
+| TaintedPath.js:216:31:216:69 | path.re ... '), '') |
 | examples/TaintedPath.js:8:7:8:52 | filePath |
 | examples/TaintedPath.js:8:7:8:52 | filePath |
 | examples/TaintedPath.js:8:7:8:52 | filePath |
@@ -6680,6 +6881,262 @@ edges
 | TaintedPath.js:195:24:195:30 | req.url | TaintedPath.js:195:14:195:37 | url.par ... , true) |
 | TaintedPath.js:195:24:195:30 | req.url | TaintedPath.js:195:14:195:37 | url.par ... , true) |
 | TaintedPath.js:195:24:195:30 | req.url | TaintedPath.js:195:14:195:37 | url.par ... , true) |
+| TaintedPath.js:202:7:202:48 | path | TaintedPath.js:206:29:206:32 | path |
+| TaintedPath.js:202:7:202:48 | path | TaintedPath.js:206:29:206:32 | path |
+| TaintedPath.js:202:7:202:48 | path | TaintedPath.js:206:29:206:32 | path |
+| TaintedPath.js:202:7:202:48 | path | TaintedPath.js:206:29:206:32 | path |
+| TaintedPath.js:202:7:202:48 | path | TaintedPath.js:206:29:206:32 | path |
+| TaintedPath.js:202:7:202:48 | path | TaintedPath.js:206:29:206:32 | path |
+| TaintedPath.js:202:7:202:48 | path | TaintedPath.js:206:29:206:32 | path |
+| TaintedPath.js:202:7:202:48 | path | TaintedPath.js:206:29:206:32 | path |
+| TaintedPath.js:202:7:202:48 | path | TaintedPath.js:206:29:206:32 | path |
+| TaintedPath.js:202:7:202:48 | path | TaintedPath.js:206:29:206:32 | path |
+| TaintedPath.js:202:7:202:48 | path | TaintedPath.js:206:29:206:32 | path |
+| TaintedPath.js:202:7:202:48 | path | TaintedPath.js:206:29:206:32 | path |
+| TaintedPath.js:202:7:202:48 | path | TaintedPath.js:206:29:206:32 | path |
+| TaintedPath.js:202:7:202:48 | path | TaintedPath.js:206:29:206:32 | path |
+| TaintedPath.js:202:7:202:48 | path | TaintedPath.js:206:29:206:32 | path |
+| TaintedPath.js:202:7:202:48 | path | TaintedPath.js:206:29:206:32 | path |
+| TaintedPath.js:202:14:202:37 | url.par ... , true) | TaintedPath.js:202:14:202:43 | url.par ... ).query |
+| TaintedPath.js:202:14:202:37 | url.par ... , true) | TaintedPath.js:202:14:202:43 | url.par ... ).query |
+| TaintedPath.js:202:14:202:37 | url.par ... , true) | TaintedPath.js:202:14:202:43 | url.par ... ).query |
+| TaintedPath.js:202:14:202:37 | url.par ... , true) | TaintedPath.js:202:14:202:43 | url.par ... ).query |
+| TaintedPath.js:202:14:202:37 | url.par ... , true) | TaintedPath.js:202:14:202:43 | url.par ... ).query |
+| TaintedPath.js:202:14:202:37 | url.par ... , true) | TaintedPath.js:202:14:202:43 | url.par ... ).query |
+| TaintedPath.js:202:14:202:37 | url.par ... , true) | TaintedPath.js:202:14:202:43 | url.par ... ).query |
+| TaintedPath.js:202:14:202:37 | url.par ... , true) | TaintedPath.js:202:14:202:43 | url.par ... ).query |
+| TaintedPath.js:202:14:202:37 | url.par ... , true) | TaintedPath.js:202:14:202:43 | url.par ... ).query |
+| TaintedPath.js:202:14:202:37 | url.par ... , true) | TaintedPath.js:202:14:202:43 | url.par ... ).query |
+| TaintedPath.js:202:14:202:37 | url.par ... , true) | TaintedPath.js:202:14:202:43 | url.par ... ).query |
+| TaintedPath.js:202:14:202:37 | url.par ... , true) | TaintedPath.js:202:14:202:43 | url.par ... ).query |
+| TaintedPath.js:202:14:202:37 | url.par ... , true) | TaintedPath.js:202:14:202:43 | url.par ... ).query |
+| TaintedPath.js:202:14:202:37 | url.par ... , true) | TaintedPath.js:202:14:202:43 | url.par ... ).query |
+| TaintedPath.js:202:14:202:37 | url.par ... , true) | TaintedPath.js:202:14:202:43 | url.par ... ).query |
+| TaintedPath.js:202:14:202:37 | url.par ... , true) | TaintedPath.js:202:14:202:43 | url.par ... ).query |
+| TaintedPath.js:202:14:202:43 | url.par ... ).query | TaintedPath.js:202:14:202:48 | url.par ... ry.path |
+| TaintedPath.js:202:14:202:43 | url.par ... ).query | TaintedPath.js:202:14:202:48 | url.par ... ry.path |
+| TaintedPath.js:202:14:202:43 | url.par ... ).query | TaintedPath.js:202:14:202:48 | url.par ... ry.path |
+| TaintedPath.js:202:14:202:43 | url.par ... ).query | TaintedPath.js:202:14:202:48 | url.par ... ry.path |
+| TaintedPath.js:202:14:202:43 | url.par ... ).query | TaintedPath.js:202:14:202:48 | url.par ... ry.path |
+| TaintedPath.js:202:14:202:43 | url.par ... ).query | TaintedPath.js:202:14:202:48 | url.par ... ry.path |
+| TaintedPath.js:202:14:202:43 | url.par ... ).query | TaintedPath.js:202:14:202:48 | url.par ... ry.path |
+| TaintedPath.js:202:14:202:43 | url.par ... ).query | TaintedPath.js:202:14:202:48 | url.par ... ry.path |
+| TaintedPath.js:202:14:202:43 | url.par ... ).query | TaintedPath.js:202:14:202:48 | url.par ... ry.path |
+| TaintedPath.js:202:14:202:43 | url.par ... ).query | TaintedPath.js:202:14:202:48 | url.par ... ry.path |
+| TaintedPath.js:202:14:202:43 | url.par ... ).query | TaintedPath.js:202:14:202:48 | url.par ... ry.path |
+| TaintedPath.js:202:14:202:43 | url.par ... ).query | TaintedPath.js:202:14:202:48 | url.par ... ry.path |
+| TaintedPath.js:202:14:202:43 | url.par ... ).query | TaintedPath.js:202:14:202:48 | url.par ... ry.path |
+| TaintedPath.js:202:14:202:43 | url.par ... ).query | TaintedPath.js:202:14:202:48 | url.par ... ry.path |
+| TaintedPath.js:202:14:202:43 | url.par ... ).query | TaintedPath.js:202:14:202:48 | url.par ... ry.path |
+| TaintedPath.js:202:14:202:43 | url.par ... ).query | TaintedPath.js:202:14:202:48 | url.par ... ry.path |
+| TaintedPath.js:202:14:202:48 | url.par ... ry.path | TaintedPath.js:202:7:202:48 | path |
+| TaintedPath.js:202:14:202:48 | url.par ... ry.path | TaintedPath.js:202:7:202:48 | path |
+| TaintedPath.js:202:14:202:48 | url.par ... ry.path | TaintedPath.js:202:7:202:48 | path |
+| TaintedPath.js:202:14:202:48 | url.par ... ry.path | TaintedPath.js:202:7:202:48 | path |
+| TaintedPath.js:202:14:202:48 | url.par ... ry.path | TaintedPath.js:202:7:202:48 | path |
+| TaintedPath.js:202:14:202:48 | url.par ... ry.path | TaintedPath.js:202:7:202:48 | path |
+| TaintedPath.js:202:14:202:48 | url.par ... ry.path | TaintedPath.js:202:7:202:48 | path |
+| TaintedPath.js:202:14:202:48 | url.par ... ry.path | TaintedPath.js:202:7:202:48 | path |
+| TaintedPath.js:202:14:202:48 | url.par ... ry.path | TaintedPath.js:202:7:202:48 | path |
+| TaintedPath.js:202:14:202:48 | url.par ... ry.path | TaintedPath.js:202:7:202:48 | path |
+| TaintedPath.js:202:14:202:48 | url.par ... ry.path | TaintedPath.js:202:7:202:48 | path |
+| TaintedPath.js:202:14:202:48 | url.par ... ry.path | TaintedPath.js:202:7:202:48 | path |
+| TaintedPath.js:202:14:202:48 | url.par ... ry.path | TaintedPath.js:202:7:202:48 | path |
+| TaintedPath.js:202:14:202:48 | url.par ... ry.path | TaintedPath.js:202:7:202:48 | path |
+| TaintedPath.js:202:14:202:48 | url.par ... ry.path | TaintedPath.js:202:7:202:48 | path |
+| TaintedPath.js:202:14:202:48 | url.par ... ry.path | TaintedPath.js:202:7:202:48 | path |
+| TaintedPath.js:202:24:202:30 | req.url | TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:24:202:30 | req.url | TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:24:202:30 | req.url | TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:24:202:30 | req.url | TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:24:202:30 | req.url | TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:24:202:30 | req.url | TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:24:202:30 | req.url | TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:24:202:30 | req.url | TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:24:202:30 | req.url | TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:24:202:30 | req.url | TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:24:202:30 | req.url | TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:24:202:30 | req.url | TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:24:202:30 | req.url | TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:24:202:30 | req.url | TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:24:202:30 | req.url | TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:24:202:30 | req.url | TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:24:202:30 | req.url | TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:24:202:30 | req.url | TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:24:202:30 | req.url | TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:24:202:30 | req.url | TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:24:202:30 | req.url | TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:24:202:30 | req.url | TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:24:202:30 | req.url | TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:24:202:30 | req.url | TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:24:202:30 | req.url | TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:24:202:30 | req.url | TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:24:202:30 | req.url | TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:24:202:30 | req.url | TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:24:202:30 | req.url | TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:24:202:30 | req.url | TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:24:202:30 | req.url | TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:202:24:202:30 | req.url | TaintedPath.js:202:14:202:37 | url.par ... , true) |
+| TaintedPath.js:206:29:206:32 | path | TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:32 | path | TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:32 | path | TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:32 | path | TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:32 | path | TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:32 | path | TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:32 | path | TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:32 | path | TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:32 | path | TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:32 | path | TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:32 | path | TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:32 | path | TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:32 | path | TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:32 | path | TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:32 | path | TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:32 | path | TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:32 | path | TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:32 | path | TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:32 | path | TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:32 | path | TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:32 | path | TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:32 | path | TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:32 | path | TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:32 | path | TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:32 | path | TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:32 | path | TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:32 | path | TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:32 | path | TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:32 | path | TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:32 | path | TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:32 | path | TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:206:29:206:32 | path | TaintedPath.js:206:29:206:85 | path.re ... '), '') |
+| TaintedPath.js:211:7:211:48 | path | TaintedPath.js:213:29:213:32 | path |
+| TaintedPath.js:211:7:211:48 | path | TaintedPath.js:213:29:213:32 | path |
+| TaintedPath.js:211:7:211:48 | path | TaintedPath.js:213:29:213:32 | path |
+| TaintedPath.js:211:7:211:48 | path | TaintedPath.js:213:29:213:32 | path |
+| TaintedPath.js:211:7:211:48 | path | TaintedPath.js:213:29:213:32 | path |
+| TaintedPath.js:211:7:211:48 | path | TaintedPath.js:213:29:213:32 | path |
+| TaintedPath.js:211:7:211:48 | path | TaintedPath.js:213:29:213:32 | path |
+| TaintedPath.js:211:7:211:48 | path | TaintedPath.js:213:29:213:32 | path |
+| TaintedPath.js:211:7:211:48 | path | TaintedPath.js:216:31:216:34 | path |
+| TaintedPath.js:211:7:211:48 | path | TaintedPath.js:216:31:216:34 | path |
+| TaintedPath.js:211:7:211:48 | path | TaintedPath.js:216:31:216:34 | path |
+| TaintedPath.js:211:7:211:48 | path | TaintedPath.js:216:31:216:34 | path |
+| TaintedPath.js:211:7:211:48 | path | TaintedPath.js:216:31:216:34 | path |
+| TaintedPath.js:211:7:211:48 | path | TaintedPath.js:216:31:216:34 | path |
+| TaintedPath.js:211:7:211:48 | path | TaintedPath.js:216:31:216:34 | path |
+| TaintedPath.js:211:7:211:48 | path | TaintedPath.js:216:31:216:34 | path |
+| TaintedPath.js:211:14:211:37 | url.par ... , true) | TaintedPath.js:211:14:211:43 | url.par ... ).query |
+| TaintedPath.js:211:14:211:37 | url.par ... , true) | TaintedPath.js:211:14:211:43 | url.par ... ).query |
+| TaintedPath.js:211:14:211:37 | url.par ... , true) | TaintedPath.js:211:14:211:43 | url.par ... ).query |
+| TaintedPath.js:211:14:211:37 | url.par ... , true) | TaintedPath.js:211:14:211:43 | url.par ... ).query |
+| TaintedPath.js:211:14:211:37 | url.par ... , true) | TaintedPath.js:211:14:211:43 | url.par ... ).query |
+| TaintedPath.js:211:14:211:37 | url.par ... , true) | TaintedPath.js:211:14:211:43 | url.par ... ).query |
+| TaintedPath.js:211:14:211:37 | url.par ... , true) | TaintedPath.js:211:14:211:43 | url.par ... ).query |
+| TaintedPath.js:211:14:211:37 | url.par ... , true) | TaintedPath.js:211:14:211:43 | url.par ... ).query |
+| TaintedPath.js:211:14:211:37 | url.par ... , true) | TaintedPath.js:211:14:211:43 | url.par ... ).query |
+| TaintedPath.js:211:14:211:37 | url.par ... , true) | TaintedPath.js:211:14:211:43 | url.par ... ).query |
+| TaintedPath.js:211:14:211:37 | url.par ... , true) | TaintedPath.js:211:14:211:43 | url.par ... ).query |
+| TaintedPath.js:211:14:211:37 | url.par ... , true) | TaintedPath.js:211:14:211:43 | url.par ... ).query |
+| TaintedPath.js:211:14:211:37 | url.par ... , true) | TaintedPath.js:211:14:211:43 | url.par ... ).query |
+| TaintedPath.js:211:14:211:37 | url.par ... , true) | TaintedPath.js:211:14:211:43 | url.par ... ).query |
+| TaintedPath.js:211:14:211:37 | url.par ... , true) | TaintedPath.js:211:14:211:43 | url.par ... ).query |
+| TaintedPath.js:211:14:211:37 | url.par ... , true) | TaintedPath.js:211:14:211:43 | url.par ... ).query |
+| TaintedPath.js:211:14:211:43 | url.par ... ).query | TaintedPath.js:211:14:211:48 | url.par ... ry.path |
+| TaintedPath.js:211:14:211:43 | url.par ... ).query | TaintedPath.js:211:14:211:48 | url.par ... ry.path |
+| TaintedPath.js:211:14:211:43 | url.par ... ).query | TaintedPath.js:211:14:211:48 | url.par ... ry.path |
+| TaintedPath.js:211:14:211:43 | url.par ... ).query | TaintedPath.js:211:14:211:48 | url.par ... ry.path |
+| TaintedPath.js:211:14:211:43 | url.par ... ).query | TaintedPath.js:211:14:211:48 | url.par ... ry.path |
+| TaintedPath.js:211:14:211:43 | url.par ... ).query | TaintedPath.js:211:14:211:48 | url.par ... ry.path |
+| TaintedPath.js:211:14:211:43 | url.par ... ).query | TaintedPath.js:211:14:211:48 | url.par ... ry.path |
+| TaintedPath.js:211:14:211:43 | url.par ... ).query | TaintedPath.js:211:14:211:48 | url.par ... ry.path |
+| TaintedPath.js:211:14:211:43 | url.par ... ).query | TaintedPath.js:211:14:211:48 | url.par ... ry.path |
+| TaintedPath.js:211:14:211:43 | url.par ... ).query | TaintedPath.js:211:14:211:48 | url.par ... ry.path |
+| TaintedPath.js:211:14:211:43 | url.par ... ).query | TaintedPath.js:211:14:211:48 | url.par ... ry.path |
+| TaintedPath.js:211:14:211:43 | url.par ... ).query | TaintedPath.js:211:14:211:48 | url.par ... ry.path |
+| TaintedPath.js:211:14:211:43 | url.par ... ).query | TaintedPath.js:211:14:211:48 | url.par ... ry.path |
+| TaintedPath.js:211:14:211:43 | url.par ... ).query | TaintedPath.js:211:14:211:48 | url.par ... ry.path |
+| TaintedPath.js:211:14:211:43 | url.par ... ).query | TaintedPath.js:211:14:211:48 | url.par ... ry.path |
+| TaintedPath.js:211:14:211:43 | url.par ... ).query | TaintedPath.js:211:14:211:48 | url.par ... ry.path |
+| TaintedPath.js:211:14:211:48 | url.par ... ry.path | TaintedPath.js:211:7:211:48 | path |
+| TaintedPath.js:211:14:211:48 | url.par ... ry.path | TaintedPath.js:211:7:211:48 | path |
+| TaintedPath.js:211:14:211:48 | url.par ... ry.path | TaintedPath.js:211:7:211:48 | path |
+| TaintedPath.js:211:14:211:48 | url.par ... ry.path | TaintedPath.js:211:7:211:48 | path |
+| TaintedPath.js:211:14:211:48 | url.par ... ry.path | TaintedPath.js:211:7:211:48 | path |
+| TaintedPath.js:211:14:211:48 | url.par ... ry.path | TaintedPath.js:211:7:211:48 | path |
+| TaintedPath.js:211:14:211:48 | url.par ... ry.path | TaintedPath.js:211:7:211:48 | path |
+| TaintedPath.js:211:14:211:48 | url.par ... ry.path | TaintedPath.js:211:7:211:48 | path |
+| TaintedPath.js:211:14:211:48 | url.par ... ry.path | TaintedPath.js:211:7:211:48 | path |
+| TaintedPath.js:211:14:211:48 | url.par ... ry.path | TaintedPath.js:211:7:211:48 | path |
+| TaintedPath.js:211:14:211:48 | url.par ... ry.path | TaintedPath.js:211:7:211:48 | path |
+| TaintedPath.js:211:14:211:48 | url.par ... ry.path | TaintedPath.js:211:7:211:48 | path |
+| TaintedPath.js:211:14:211:48 | url.par ... ry.path | TaintedPath.js:211:7:211:48 | path |
+| TaintedPath.js:211:14:211:48 | url.par ... ry.path | TaintedPath.js:211:7:211:48 | path |
+| TaintedPath.js:211:14:211:48 | url.par ... ry.path | TaintedPath.js:211:7:211:48 | path |
+| TaintedPath.js:211:14:211:48 | url.par ... ry.path | TaintedPath.js:211:7:211:48 | path |
+| TaintedPath.js:211:24:211:30 | req.url | TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:24:211:30 | req.url | TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:24:211:30 | req.url | TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:24:211:30 | req.url | TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:24:211:30 | req.url | TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:24:211:30 | req.url | TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:24:211:30 | req.url | TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:24:211:30 | req.url | TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:24:211:30 | req.url | TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:24:211:30 | req.url | TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:24:211:30 | req.url | TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:24:211:30 | req.url | TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:24:211:30 | req.url | TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:24:211:30 | req.url | TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:24:211:30 | req.url | TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:24:211:30 | req.url | TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:24:211:30 | req.url | TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:24:211:30 | req.url | TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:24:211:30 | req.url | TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:24:211:30 | req.url | TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:24:211:30 | req.url | TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:24:211:30 | req.url | TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:24:211:30 | req.url | TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:24:211:30 | req.url | TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:24:211:30 | req.url | TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:24:211:30 | req.url | TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:24:211:30 | req.url | TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:24:211:30 | req.url | TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:24:211:30 | req.url | TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:24:211:30 | req.url | TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:24:211:30 | req.url | TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:211:24:211:30 | req.url | TaintedPath.js:211:14:211:37 | url.par ... , true) |
+| TaintedPath.js:213:29:213:32 | path | TaintedPath.js:213:29:213:68 | path.re ... '), '') |
+| TaintedPath.js:213:29:213:32 | path | TaintedPath.js:213:29:213:68 | path.re ... '), '') |
+| TaintedPath.js:213:29:213:32 | path | TaintedPath.js:213:29:213:68 | path.re ... '), '') |
+| TaintedPath.js:213:29:213:32 | path | TaintedPath.js:213:29:213:68 | path.re ... '), '') |
+| TaintedPath.js:213:29:213:32 | path | TaintedPath.js:213:29:213:68 | path.re ... '), '') |
+| TaintedPath.js:213:29:213:32 | path | TaintedPath.js:213:29:213:68 | path.re ... '), '') |
+| TaintedPath.js:213:29:213:32 | path | TaintedPath.js:213:29:213:68 | path.re ... '), '') |
+| TaintedPath.js:213:29:213:32 | path | TaintedPath.js:213:29:213:68 | path.re ... '), '') |
+| TaintedPath.js:213:29:213:32 | path | TaintedPath.js:213:29:213:68 | path.re ... '), '') |
+| TaintedPath.js:213:29:213:32 | path | TaintedPath.js:213:29:213:68 | path.re ... '), '') |
+| TaintedPath.js:213:29:213:32 | path | TaintedPath.js:213:29:213:68 | path.re ... '), '') |
+| TaintedPath.js:213:29:213:32 | path | TaintedPath.js:213:29:213:68 | path.re ... '), '') |
+| TaintedPath.js:213:29:213:32 | path | TaintedPath.js:213:29:213:68 | path.re ... '), '') |
+| TaintedPath.js:213:29:213:32 | path | TaintedPath.js:213:29:213:68 | path.re ... '), '') |
+| TaintedPath.js:213:29:213:32 | path | TaintedPath.js:213:29:213:68 | path.re ... '), '') |
+| TaintedPath.js:213:29:213:32 | path | TaintedPath.js:213:29:213:68 | path.re ... '), '') |
+| TaintedPath.js:216:31:216:34 | path | TaintedPath.js:216:31:216:69 | path.re ... '), '') |
+| TaintedPath.js:216:31:216:34 | path | TaintedPath.js:216:31:216:69 | path.re ... '), '') |
+| TaintedPath.js:216:31:216:34 | path | TaintedPath.js:216:31:216:69 | path.re ... '), '') |
+| TaintedPath.js:216:31:216:34 | path | TaintedPath.js:216:31:216:69 | path.re ... '), '') |
+| TaintedPath.js:216:31:216:34 | path | TaintedPath.js:216:31:216:69 | path.re ... '), '') |
+| TaintedPath.js:216:31:216:34 | path | TaintedPath.js:216:31:216:69 | path.re ... '), '') |
+| TaintedPath.js:216:31:216:34 | path | TaintedPath.js:216:31:216:69 | path.re ... '), '') |
+| TaintedPath.js:216:31:216:34 | path | TaintedPath.js:216:31:216:69 | path.re ... '), '') |
+| TaintedPath.js:216:31:216:34 | path | TaintedPath.js:216:31:216:69 | path.re ... '), '') |
+| TaintedPath.js:216:31:216:34 | path | TaintedPath.js:216:31:216:69 | path.re ... '), '') |
+| TaintedPath.js:216:31:216:34 | path | TaintedPath.js:216:31:216:69 | path.re ... '), '') |
+| TaintedPath.js:216:31:216:34 | path | TaintedPath.js:216:31:216:69 | path.re ... '), '') |
+| TaintedPath.js:216:31:216:34 | path | TaintedPath.js:216:31:216:69 | path.re ... '), '') |
+| TaintedPath.js:216:31:216:34 | path | TaintedPath.js:216:31:216:69 | path.re ... '), '') |
+| TaintedPath.js:216:31:216:34 | path | TaintedPath.js:216:31:216:69 | path.re ... '), '') |
+| TaintedPath.js:216:31:216:34 | path | TaintedPath.js:216:31:216:69 | path.re ... '), '') |
 | examples/TaintedPath.js:8:7:8:52 | filePath | examples/TaintedPath.js:11:36:11:43 | filePath |
 | examples/TaintedPath.js:8:7:8:52 | filePath | examples/TaintedPath.js:11:36:11:43 | filePath |
 | examples/TaintedPath.js:8:7:8:52 | filePath | examples/TaintedPath.js:11:36:11:43 | filePath |
@@ -10499,6 +10956,9 @@ edges
 | TaintedPath.js:196:31:196:34 | path | TaintedPath.js:195:24:195:30 | req.url | TaintedPath.js:196:31:196:34 | path | This path depends on a $@. | TaintedPath.js:195:24:195:30 | req.url | user-provided value |
 | TaintedPath.js:197:45:197:48 | path | TaintedPath.js:195:24:195:30 | req.url | TaintedPath.js:197:45:197:48 | path | This path depends on a $@. | TaintedPath.js:195:24:195:30 | req.url | user-provided value |
 | TaintedPath.js:198:35:198:38 | path | TaintedPath.js:195:24:195:30 | req.url | TaintedPath.js:198:35:198:38 | path | This path depends on a $@. | TaintedPath.js:195:24:195:30 | req.url | user-provided value |
+| TaintedPath.js:206:29:206:85 | path.re ... '), '') | TaintedPath.js:202:24:202:30 | req.url | TaintedPath.js:206:29:206:85 | path.re ... '), '') | This path depends on a $@. | TaintedPath.js:202:24:202:30 | req.url | user-provided value |
+| TaintedPath.js:213:29:213:68 | path.re ... '), '') | TaintedPath.js:211:24:211:30 | req.url | TaintedPath.js:213:29:213:68 | path.re ... '), '') | This path depends on a $@. | TaintedPath.js:211:24:211:30 | req.url | user-provided value |
+| TaintedPath.js:216:31:216:69 | path.re ... '), '') | TaintedPath.js:211:24:211:30 | req.url | TaintedPath.js:216:31:216:69 | path.re ... '), '') | This path depends on a $@. | TaintedPath.js:211:24:211:30 | req.url | user-provided value |
 | examples/TaintedPath.js:11:29:11:43 | ROOT + filePath | examples/TaintedPath.js:8:28:8:34 | req.url | examples/TaintedPath.js:11:29:11:43 | ROOT + filePath | This path depends on a $@. | examples/TaintedPath.js:8:28:8:34 | req.url | user-provided value |
 | express.js:8:20:8:32 | req.query.bar | express.js:8:20:8:32 | req.query.bar | express.js:8:20:8:32 | req.query.bar | This path depends on a $@. | express.js:8:20:8:32 | req.query.bar | user-provided value |
 | handlebars.js:11:32:11:39 | filePath | handlebars.js:29:46:29:60 | req.params.path | handlebars.js:11:32:11:39 | filePath | This path depends on a $@. | handlebars.js:29:46:29:60 | req.params.path | user-provided value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/TaintedPath.js b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/TaintedPath.js
index d28549da0ec..fd768fecfff 100644
--- a/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/TaintedPath.js
+++ b/javascript/ql/test/query-tests/Security/CWE-022/TaintedPath/TaintedPath.js
@@ -197,3 +197,25 @@ var server = http.createServer(function(req, res) {
   cp.execFileSync("foobar", ["args"], {cwd: path}); // NOT OK
   cp.execFileSync("foobar", {cwd: path}); // NOT OK
 });
+
+var server = http.createServer(function(req, res) {
+  let path = url.parse(req.url, true).query.path;
+
+  // Removal of forward-slash or dots.
+  res.write(fs.readFileSync(path.replace(new RegExp("[\\]\\[*,;'\"`<>\\?/]", 'g'), ''))); // OK
+  res.write(fs.readFileSync(path.replace(new RegExp("[\\]\\[*,;'\"`<>\\?/]", ''), ''))); // NOT OK.
+  res.write(fs.readFileSync(path.replace(new RegExp("[\\]\\[*,;'\"`<>\\?/]", unknownFlags()), ''))); // OK -- Might be okay depending on what unknownFlags evaluates to.
+});
+
+var server = http.createServer(function(req, res) {
+  let path = url.parse(req.url, true).query.path;
+
+  res.write(fs.readFileSync(path.replace(new RegExp("[.]", 'g'), ''))); // NOT OK (can be absolute)
+
+  if (!pathModule.isAbsolute(path)) {
+    res.write(fs.readFileSync(path.replace(new RegExp("[.]", ''), ''))); // NOT OK
+    res.write(fs.readFileSync(path.replace(new RegExp("[.]", 'g'), ''))); // OK
+    res.write(fs.readFileSync(path.replace(new RegExp("[.]", unknownFlags()), ''))); // OK
+  }
+});
+  
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/UnsafeShellCommandConstruction.expected b/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/UnsafeShellCommandConstruction.expected
index b4022c8550c..f2fa354a305 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/UnsafeShellCommandConstruction.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/UnsafeShellCommandConstruction.expected
@@ -319,6 +319,15 @@ nodes
 | lib/lib.js:626:29:626:32 | name |
 | lib/lib.js:629:25:629:28 | name |
 | lib/lib.js:629:25:629:28 | name |
+| lib/lib.js:632:38:632:41 | name |
+| lib/lib.js:632:38:632:41 | name |
+| lib/lib.js:633:6:633:68 | sanitized |
+| lib/lib.js:633:18:633:68 | "'" + n ... ) + "'" |
+| lib/lib.js:633:24:633:27 | name |
+| lib/lib.js:633:24:633:62 | name.re ... '\\\\''") |
+| lib/lib.js:633:24:633:62 | name.re ... '\\\\''") |
+| lib/lib.js:634:22:634:30 | sanitized |
+| lib/lib.js:634:22:634:30 | sanitized |
 | lib/subLib2/compiled-file.ts:3:26:3:29 | name |
 | lib/subLib2/compiled-file.ts:3:26:3:29 | name |
 | lib/subLib2/compiled-file.ts:4:25:4:28 | name |
@@ -749,6 +758,14 @@ edges
 | lib/lib.js:608:42:608:45 | name | lib/lib.js:629:25:629:28 | name |
 | lib/lib.js:608:42:608:45 | name | lib/lib.js:629:25:629:28 | name |
 | lib/lib.js:608:42:608:45 | name | lib/lib.js:629:25:629:28 | name |
+| lib/lib.js:632:38:632:41 | name | lib/lib.js:633:24:633:27 | name |
+| lib/lib.js:632:38:632:41 | name | lib/lib.js:633:24:633:27 | name |
+| lib/lib.js:633:6:633:68 | sanitized | lib/lib.js:634:22:634:30 | sanitized |
+| lib/lib.js:633:6:633:68 | sanitized | lib/lib.js:634:22:634:30 | sanitized |
+| lib/lib.js:633:18:633:68 | "'" + n ... ) + "'" | lib/lib.js:633:6:633:68 | sanitized |
+| lib/lib.js:633:24:633:27 | name | lib/lib.js:633:24:633:62 | name.re ... '\\\\''") |
+| lib/lib.js:633:24:633:27 | name | lib/lib.js:633:24:633:62 | name.re ... '\\\\''") |
+| lib/lib.js:633:24:633:62 | name.re ... '\\\\''") | lib/lib.js:633:18:633:68 | "'" + n ... ) + "'" |
 | lib/subLib2/compiled-file.ts:3:26:3:29 | name | lib/subLib2/compiled-file.ts:4:25:4:28 | name |
 | lib/subLib2/compiled-file.ts:3:26:3:29 | name | lib/subLib2/compiled-file.ts:4:25:4:28 | name |
 | lib/subLib2/compiled-file.ts:3:26:3:29 | name | lib/subLib2/compiled-file.ts:4:25:4:28 | name |
@@ -879,6 +896,8 @@ edges
 | lib/lib.js:609:10:609:25 | "rm -rf " + name | lib/lib.js:608:42:608:45 | name | lib/lib.js:609:22:609:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:608:42:608:45 | name | library input | lib/lib.js:609:2:609:26 | cp.exec ... + name) | shell command |
 | lib/lib.js:626:17:626:32 | "rm -rf " + name | lib/lib.js:608:42:608:45 | name | lib/lib.js:626:29:626:32 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:608:42:608:45 | name | library input | lib/lib.js:626:9:626:33 | cp.exec ... + name) | shell command |
 | lib/lib.js:629:13:629:28 | "rm -rf " + name | lib/lib.js:608:42:608:45 | name | lib/lib.js:629:25:629:28 | name | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:608:42:608:45 | name | library input | lib/lib.js:629:5:629:29 | cp.exec ... + name) | shell command |
+| lib/lib.js:633:18:633:68 | "'" + n ... ) + "'" | lib/lib.js:632:38:632:41 | name | lib/lib.js:633:24:633:62 | name.re ... '\\\\''") | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:632:38:632:41 | name | library input | lib/lib.js:634:2:634:31 | cp.exec ... itized) | shell command |
+| lib/lib.js:634:10:634:30 | "rm -rf ... nitized | lib/lib.js:632:38:632:41 | name | lib/lib.js:634:22:634:30 | sanitized | This string concatenation which depends on $@ is later used in a $@. | lib/lib.js:632:38:632:41 | name | library input | lib/lib.js:634:2:634:31 | cp.exec ... itized) | shell command |
 | lib/subLib2/compiled-file.ts:4:13:4:28 | "rm -rf " + name | lib/subLib2/compiled-file.ts:3:26:3:29 | name | lib/subLib2/compiled-file.ts:4:25:4:28 | name | This string concatenation which depends on $@ is later used in a $@. | lib/subLib2/compiled-file.ts:3:26:3:29 | name | library input | lib/subLib2/compiled-file.ts:4:5:4:29 | cp.exec ... + name) | shell command |
 | lib/subLib2/special-file.js:4:10:4:25 | "rm -rf " + name | lib/subLib2/special-file.js:3:28:3:31 | name | lib/subLib2/special-file.js:4:22:4:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/subLib2/special-file.js:3:28:3:31 | name | library input | lib/subLib2/special-file.js:4:2:4:26 | cp.exec ... + name) | shell command |
 | lib/subLib3/my-file.ts:4:10:4:25 | "rm -rf " + name | lib/subLib3/my-file.ts:3:28:3:31 | name | lib/subLib3/my-file.ts:4:22:4:25 | name | This string concatenation which depends on $@ is later used in a $@. | lib/subLib3/my-file.ts:3:28:3:31 | name | library input | lib/subLib3/my-file.ts:4:2:4:26 | cp.exec ... + name) | shell command |
diff --git a/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/lib.js b/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/lib.js
index 504de998c1c..09488f0a887 100644
--- a/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/lib.js
+++ b/javascript/ql/test/query-tests/Security/CWE-078/UnsafeShellCommandConstruction/lib/lib.js
@@ -628,3 +628,14 @@ module.exports.veryIndeirect = function (name) {
 
     cp.exec("rm -rf " + name); // NOT OK
 }
+
+module.exports.sanitizer = function (name) {
+	var sanitized = "'" + name.replace(new RegExp("\'"), "'\\''") + "'"
+	cp.exec("rm -rf " + sanitized); // NOT OK 
+
+	var sanitized = "'" + name.replace(new RegExp("\'", 'g'), "'\\''") + "'"
+	cp.exec("rm -rf " + sanitized); // OK 
+
+	var sanitized = "'" + name.replace(new RegExp("\'", unknownFlags()), "'\\''") + "'"
+	cp.exec("rm -rf " + sanitized); // OK -- Most likely should be okay and not flagged to reduce false positives.
+}
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/Xss.expected b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/Xss.expected
index feec74921aa..9b764729c99 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/Xss.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/Xss.expected
@@ -1148,6 +1148,12 @@ nodes
 | tst.js:501:33:501:63 | decodeU ... n.hash) |
 | tst.js:501:43:501:62 | window.location.hash |
 | tst.js:501:43:501:62 | window.location.hash |
+| tst.js:508:7:508:39 | target |
+| tst.js:508:16:508:39 | documen ... .search |
+| tst.js:508:16:508:39 | documen ... .search |
+| tst.js:509:18:509:23 | target |
+| tst.js:509:18:509:54 | target. ... "), '') |
+| tst.js:509:18:509:54 | target. ... "), '') |
 | typeahead.js:20:13:20:45 | target |
 | typeahead.js:20:22:20:45 | documen ... .search |
 | typeahead.js:20:22:20:45 | documen ... .search |
@@ -2331,6 +2337,11 @@ edges
 | tst.js:501:43:501:62 | window.location.hash | tst.js:501:33:501:63 | decodeU ... n.hash) |
 | tst.js:501:43:501:62 | window.location.hash | tst.js:501:33:501:63 | decodeU ... n.hash) |
 | tst.js:501:43:501:62 | window.location.hash | tst.js:501:33:501:63 | decodeU ... n.hash) |
+| tst.js:508:7:508:39 | target | tst.js:509:18:509:23 | target |
+| tst.js:508:16:508:39 | documen ... .search | tst.js:508:7:508:39 | target |
+| tst.js:508:16:508:39 | documen ... .search | tst.js:508:7:508:39 | target |
+| tst.js:509:18:509:23 | target | tst.js:509:18:509:54 | target. ... "), '') |
+| tst.js:509:18:509:23 | target | tst.js:509:18:509:54 | target. ... "), '') |
 | typeahead.js:20:13:20:45 | target | typeahead.js:21:12:21:17 | target |
 | typeahead.js:20:22:20:45 | documen ... .search | typeahead.js:20:13:20:45 | target |
 | typeahead.js:20:22:20:45 | documen ... .search | typeahead.js:20:13:20:45 | target |
@@ -2623,6 +2634,7 @@ edges
 | tst.js:491:23:491:45 | locatio ... bstr(1) | tst.js:491:23:491:35 | location.hash | tst.js:491:23:491:45 | locatio ... bstr(1) | Cross-site scripting vulnerability due to $@. | tst.js:491:23:491:35 | location.hash | user-provided value |
 | tst.js:494:18:494:40 | locatio ... bstr(1) | tst.js:494:18:494:30 | location.hash | tst.js:494:18:494:40 | locatio ... bstr(1) | Cross-site scripting vulnerability due to $@. | tst.js:494:18:494:30 | location.hash | user-provided value |
 | tst.js:501:33:501:63 | decodeU ... n.hash) | tst.js:501:43:501:62 | window.location.hash | tst.js:501:33:501:63 | decodeU ... n.hash) | Cross-site scripting vulnerability due to $@. | tst.js:501:43:501:62 | window.location.hash | user-provided value |
+| tst.js:509:18:509:54 | target. ... "), '') | tst.js:508:16:508:39 | documen ... .search | tst.js:509:18:509:54 | target. ... "), '') | Cross-site scripting vulnerability due to $@. | tst.js:508:16:508:39 | documen ... .search | user-provided value |
 | typeahead.js:25:18:25:20 | val | typeahead.js:20:22:20:45 | documen ... .search | typeahead.js:25:18:25:20 | val | Cross-site scripting vulnerability due to $@. | typeahead.js:20:22:20:45 | documen ... .search | user-provided value |
 | v-html.vue:2:8:2:23 | v-html=tainted | v-html.vue:6:42:6:58 | document.location | v-html.vue:2:8:2:23 | v-html=tainted | Cross-site scripting vulnerability due to $@. | v-html.vue:6:42:6:58 | document.location | user-provided value |
 | various-concat-obfuscations.js:4:4:4:31 | "<div>" ... </div>" | various-concat-obfuscations.js:2:16:2:39 | documen ... .search | various-concat-obfuscations.js:4:4:4:31 | "<div>" ... </div>" | Cross-site scripting vulnerability due to $@. | various-concat-obfuscations.js:2:16:2:39 | documen ... .search | user-provided value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/XssWithAdditionalSources.expected b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/XssWithAdditionalSources.expected
index 3b1d10d5162..185cae0d2d3 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/XssWithAdditionalSources.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/XssWithAdditionalSources.expected
@@ -1160,6 +1160,12 @@ nodes
 | tst.js:501:33:501:63 | decodeU ... n.hash) |
 | tst.js:501:43:501:62 | window.location.hash |
 | tst.js:501:43:501:62 | window.location.hash |
+| tst.js:508:7:508:39 | target |
+| tst.js:508:16:508:39 | documen ... .search |
+| tst.js:508:16:508:39 | documen ... .search |
+| tst.js:509:18:509:23 | target |
+| tst.js:509:18:509:54 | target. ... "), '') |
+| tst.js:509:18:509:54 | target. ... "), '') |
 | typeahead.js:9:28:9:30 | loc |
 | typeahead.js:9:28:9:30 | loc |
 | typeahead.js:9:28:9:30 | loc |
@@ -2393,6 +2399,11 @@ edges
 | tst.js:501:43:501:62 | window.location.hash | tst.js:501:33:501:63 | decodeU ... n.hash) |
 | tst.js:501:43:501:62 | window.location.hash | tst.js:501:33:501:63 | decodeU ... n.hash) |
 | tst.js:501:43:501:62 | window.location.hash | tst.js:501:33:501:63 | decodeU ... n.hash) |
+| tst.js:508:7:508:39 | target | tst.js:509:18:509:23 | target |
+| tst.js:508:16:508:39 | documen ... .search | tst.js:508:7:508:39 | target |
+| tst.js:508:16:508:39 | documen ... .search | tst.js:508:7:508:39 | target |
+| tst.js:509:18:509:23 | target | tst.js:509:18:509:54 | target. ... "), '') |
+| tst.js:509:18:509:23 | target | tst.js:509:18:509:54 | target. ... "), '') |
 | typeahead.js:9:28:9:30 | loc | typeahead.js:10:16:10:18 | loc |
 | typeahead.js:9:28:9:30 | loc | typeahead.js:10:16:10:18 | loc |
 | typeahead.js:9:28:9:30 | loc | typeahead.js:10:16:10:18 | loc |
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/tst.js b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/tst.js
index 3a8c5992645..9a110d0bb72 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/tst.js
@@ -503,3 +503,10 @@ function Foo() {
   };
   Object.assign(this, obj);
 }
+
+function nonGlobalSanitizer() {
+  var target = document.location.search
+  $("#foo").html(target.replace(new RegExp("<|>"), '')); // NOT OK
+  $("#foo").html(target.replace(new RegExp("<|>", unknownFlags()), '')); // OK -- most likely good. We don't know what the flags are.
+  $("#foo").html(target.replace(new RegExp("<|>", "g"), '')); // OK
+}
diff --git a/javascript/ql/test/query-tests/Security/CWE-116/DoubleEscaping/DoubleEscaping.expected b/javascript/ql/test/query-tests/Security/CWE-116/DoubleEscaping/DoubleEscaping.expected
index 651e9443b3a..9ec4549b7f6 100644
--- a/javascript/ql/test/query-tests/Security/CWE-116/DoubleEscaping/DoubleEscaping.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-116/DoubleEscaping/DoubleEscaping.expected
@@ -6,3 +6,4 @@
 | tst.js:60:7:60:28 | s.repla ...  '%25') | This replacement may double-escape '%' characters from $@. | tst.js:59:7:59:28 | s.repla ...  '%26') | here |
 | tst.js:68:10:70:38 | s.repla ... &amp;") | This replacement may double-escape '&' characters from $@. | tst.js:68:10:69:39 | s.repla ... apos;") | here |
 | tst.js:79:10:79:66 | s.repla ... &amp;") | This replacement may double-escape '&' characters from $@. | tst.js:79:10:79:43 | s.repla ... epl[c]) | here |
+| tst.js:99:10:101:49 | s.repla ... &amp;") | This replacement may double-escape '&' characters from $@. | tst.js:99:10:100:51 | s.repla ... apos;") | here |
diff --git a/javascript/ql/test/query-tests/Security/CWE-116/DoubleEscaping/tst.js b/javascript/ql/test/query-tests/Security/CWE-116/DoubleEscaping/tst.js
index 76cfe80b238..4fe8c9d6f22 100644
--- a/javascript/ql/test/query-tests/Security/CWE-116/DoubleEscaping/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-116/DoubleEscaping/tst.js
@@ -94,3 +94,21 @@ function testWithCapturedVar(x) {
 function encodeDecodeEncode(s) {
  return goodEncode(goodDecode(goodEncode(s)));
 }
+
+function badEncode(s) {
+  return s.replace(new RegExp("\"", "g"), "&quot;")
+          .replace(new RegExp("\'", "g"), "&apos;")
+          .replace(new RegExp("&", "g"), "&amp;"); // NOT OK
+}
+
+function goodEncode(s) {
+  return s.replace(new RegExp("\"", ""), "&quot;")
+          .replace(new RegExp("\'", ""), "&apos;")
+          .replace(new RegExp("&", ""), "&amp;"); // OK
+}
+
+function goodEncode(s) {
+  return s.replace(new RegExp("\"", unknownFlags()), "&quot;")
+          .replace(new RegExp("\'", unknownFlags()), "&apos;")
+          .replace(new RegExp("&", unknownFlags()), "&amp;"); // OK
+}
diff --git a/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/IncompleteBlacklistSanitizer.expected b/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/IncompleteBlacklistSanitizer.expected
index 4223a4224d3..379ffbdc9c3 100644
--- a/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/IncompleteBlacklistSanitizer.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/IncompleteBlacklistSanitizer.expected
@@ -65,3 +65,9 @@
 | tst.js:305:10:305:34 | s().rep ... ]/g,'') | This HTML sanitizer does not sanitize double quotes |
 | tst.js:309:10:318:3 | s().rep ... ;";\\n\\t}) | This HTML sanitizer does not sanitize single quotes |
 | tst.js:320:9:329:3 | s().rep ... ;";\\n\\t}) | This HTML sanitizer does not sanitize single quotes |
+| tst.js:333:2:333:40 | s().rep ... g"),'') | This HTML sanitizer does not sanitize ampersands |
+| tst.js:333:2:333:40 | s().rep ... g"),'') | This HTML sanitizer does not sanitize double quotes |
+| tst.js:333:2:333:40 | s().rep ... g"),'') | This HTML sanitizer does not sanitize single quotes |
+| tst.js:337:2:337:46 | s().rep ... ()),'') | This HTML sanitizer does not sanitize ampersands |
+| tst.js:337:2:337:46 | s().rep ... ()),'') | This HTML sanitizer does not sanitize double quotes |
+| tst.js:337:2:337:46 | s().rep ... ()),'') | This HTML sanitizer does not sanitize single quotes |
diff --git a/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/IncompleteMultiCharacterSanitization.expected b/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/IncompleteMultiCharacterSanitization.expected
index 32400608814..96a48fec6cb 100644
--- a/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/IncompleteMultiCharacterSanitization.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/IncompleteMultiCharacterSanitization.expected
@@ -39,3 +39,4 @@
 | tst-multi-character-sanitization.js:145:13:145:90 | content ... /g, '') | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:145:30:145:30 | < | <script |
 | tst-multi-character-sanitization.js:148:3:148:99 | n.clone ... gi, '') | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:148:41:148:41 | < | <script |
 | tst-multi-character-sanitization.js:152:3:152:99 | n.clone ... gi, '') | This string may still contain $@, which may cause an HTML element injection vulnerability. | tst-multi-character-sanitization.js:152:41:152:41 | < | <script |
+| tst.js:341:9:341:44 | p.repla ... "), "") | This string may still contain $@, which may cause a path injection vulnerability. | tst.js:341:31:341:33 | \\. | ../ |
diff --git a/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/IncompleteSanitization.expected b/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/IncompleteSanitization.expected
index cf6105d8c6f..bfee25f1c25 100644
--- a/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/IncompleteSanitization.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/IncompleteSanitization.expected
@@ -29,3 +29,9 @@
 | tst.js:149:2:149:24 | x.repla ... replace | This replaces only the first occurrence of "\\n". |
 | tst.js:193:9:193:17 | s.replace | This replaces only the first occurrence of /'/. |
 | tst.js:202:10:202:18 | p.replace | This replaces only the first occurrence of "/../". |
+| tst.js:341:9:341:17 | p.replace | This replaces only the first occurrence of /\\.\\.//. |
+| tst.js:345:9:345:17 | s.replace | This does not escape backslash characters in the input. |
+| tst.js:349:9:349:17 | s.replace | This replaces only the first occurrence of /'/. |
+| tst.js:353:9:353:17 | s.replace | This does not escape backslash characters in the input. |
+| tst.js:362:2:362:10 | x.replace | This replaces only the first occurrence of /\n/. |
+| tst.js:363:2:363:24 | x.repla ... replace | This replaces only the first occurrence of /\n/. |
diff --git a/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/tst.js b/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/tst.js
index dbd04664a52..0ce637ad6d8 100644
--- a/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-116/IncompleteSanitization/tst.js
@@ -327,4 +327,41 @@ function incompleteComplexSanitizers() {
 		if (str === "\"")
 			return "&quot;";
 	}) + '"';
-}
\ No newline at end of file
+}
+
+function typicalBadHtmlSanitizers(s) {
+	s().replace(new RegExp("[<>]", "g"),''); // NOT OK
+}
+
+function typicalBadHtmlSanitizers(s) {
+	s().replace(new RegExp("[<>]", unknown()),''); // NOT OK
+}
+
+function bad18NewRegExp(p) {
+	return p.replace(new RegExp("\\.\\./"), ""); // NOT OK
+}
+
+function bad4NewRegExpG(s) {
+	return s.replace(new RegExp("\'","g"), "\\$&"); // NOT OK
+}
+
+function bad4NewRegExp(s) {
+	return s.replace(new RegExp("\'"), "\\$&"); // NOT OK
+}
+
+function bad4NewRegExpUnknown(s) {
+	return s.replace(new RegExp("\'", unknownFlags()), "\\$&"); // NOT OK
+}
+
+function newlinesNewReGexp(s) {
+	require("child_process").execSync("which emacs").toString().replace(new RegExp("\n"), ""); // OK
+
+	x.replace(new RegExp("\n", "g"), "").replace(x, y); // OK
+	x.replace(x, y).replace(new RegExp("\n", "g"), ""); // OK
+
+	x.replace(new RegExp("\n"), "").replace(x, y); // NOT OK
+	x.replace(x, y).replace(new RegExp("\n"), ""); // NOT OK
+
+	x.replace(new RegExp("\n", unknownFlags()), "").replace(x, y); // OK
+	x.replace(x, y).replace(new RegExp("\n", unknownFlags()), ""); // OK
+}
diff --git a/javascript/ql/test/query-tests/Security/CWE-178/CaseSensitiveMiddlewarePath.expected b/javascript/ql/test/query-tests/Security/CWE-178/CaseSensitiveMiddlewarePath.expected
index 2195bbf0029..2be1780188a 100644
--- a/javascript/ql/test/query-tests/Security/CWE-178/CaseSensitiveMiddlewarePath.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-178/CaseSensitiveMiddlewarePath.expected
@@ -2,6 +2,7 @@
 | tst.js:14:5:14:28 | new Reg ... (.*)?') | This route uses a case-sensitive path $@, but is guarding a $@. A path such as '/FOO/1' will bypass the middleware. | tst.js:14:5:14:28 | new Reg ... (.*)?') | pattern | tst.js:60:1:61:2 | app.get ... ware\\n}) | case-insensitive path |
 | tst.js:41:9:41:25 | /\\/foo\\/([0-9]+)/ | This route uses a case-sensitive path $@, but is guarding a $@. A path such as '/FOO/1' will bypass the middleware. | tst.js:41:9:41:25 | /\\/foo\\/([0-9]+)/ | pattern | tst.js:60:1:61:2 | app.get ... ware\\n}) | case-insensitive path |
 | tst.js:64:5:64:28 | new Reg ... (.*)?') | This route uses a case-sensitive path $@, but is guarding a $@. A path such as '/BAR/1' will bypass the middleware. | tst.js:64:5:64:28 | new Reg ... (.*)?') | pattern | tst.js:73:1:74:2 | app.get ... ware\\n}) | case-insensitive path |
+| tst.js:64:5:64:28 | new Reg ... (.*)?') | This route uses a case-sensitive path $@, but is guarding a $@. A path such as '/BAR/1' will bypass the middleware. | tst.js:64:5:64:28 | new Reg ... (.*)?') | pattern | tst.js:107:1:108:2 | app.get ... ware\\n}) | case-insensitive path |
 | tst.js:76:9:76:20 | /\\/baz\\/bla/ | This route uses a case-sensitive path $@, but is guarding a $@. A path such as '/BAZ/BLA' will bypass the middleware. | tst.js:76:9:76:20 | /\\/baz\\/bla/ | pattern | tst.js:77:1:79:2 | app.get ...  });\\n}) | case-insensitive path |
 | tst.js:86:9:86:30 | /\\/[Bb] ... 3\\/[a]/ | This route uses a case-sensitive path $@, but is guarding a $@. A path such as '/BAZ3/A' will bypass the middleware. | tst.js:86:9:86:30 | /\\/[Bb] ... 3\\/[a]/ | pattern | tst.js:87:1:89:2 | app.get ...  });\\n}) | case-insensitive path |
 | tst.js:91:9:91:40 | /\\/summ ... ntGame/ | This route uses a case-sensitive path $@, but is guarding a $@. A path such as '/CURRENTGAME' will bypass the middleware. | tst.js:91:9:91:40 | /\\/summ ... ntGame/ | pattern | tst.js:93:1:95:2 | app.get ... O");\\n}) | case-insensitive path |
diff --git a/javascript/ql/test/query-tests/Security/CWE-178/tst.js b/javascript/ql/test/query-tests/Security/CWE-178/tst.js
index 5fcc3cc94a0..81bbe993291 100644
--- a/javascript/ql/test/query-tests/Security/CWE-178/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-178/tst.js
@@ -93,3 +93,16 @@ app.use(/\/summonerByName|\/currentGame/,apiLimit1, apiLimit2);
 app.get('/currentGame', function (req, res) {
     res.send("FOO");
 });
+
+app.get(
+    new RegExp('^/bar(.*)?', unknownFlag()), // OK - Might be OK if the unknown flag evaluates to case insensitive one
+    unknown(),
+    function(req, res, next) {
+        if (req.params.blah) {
+            next();
+        }
+    }
+);
+
+app.get('/bar/*', (req, res) => { // OK - not a middleware
+});
diff --git a/javascript/ql/test/query-tests/Security/CWE-312/CleartextLogging.expected b/javascript/ql/test/query-tests/Security/CWE-312/CleartextLogging.expected
index 01df8b2b672..bcd3160289f 100644
--- a/javascript/ql/test/query-tests/Security/CWE-312/CleartextLogging.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-312/CleartextLogging.expected
@@ -139,6 +139,10 @@ nodes
 | passwords.js:176:17:176:26 | myPasscode |
 | passwords.js:176:17:176:26 | myPasscode |
 | passwords.js:176:17:176:26 | myPasscode |
+| passwords.js:182:14:182:21 | password |
+| passwords.js:182:14:182:21 | password |
+| passwords.js:182:14:182:51 | passwor ... ), "*") |
+| passwords.js:182:14:182:51 | passwor ... ), "*") |
 | passwords_in_browser1.js:2:13:2:20 | password |
 | passwords_in_browser1.js:2:13:2:20 | password |
 | passwords_in_browser1.js:2:13:2:20 | password |
@@ -285,6 +289,10 @@ edges
 | passwords.js:170:11:170:18 | password | passwords.js:170:11:170:39 | passwor ... g, "*") |
 | passwords.js:173:17:173:26 | myPassword | passwords.js:173:17:173:26 | myPassword |
 | passwords.js:176:17:176:26 | myPasscode | passwords.js:176:17:176:26 | myPasscode |
+| passwords.js:182:14:182:21 | password | passwords.js:182:14:182:51 | passwor ... ), "*") |
+| passwords.js:182:14:182:21 | password | passwords.js:182:14:182:51 | passwor ... ), "*") |
+| passwords.js:182:14:182:21 | password | passwords.js:182:14:182:51 | passwor ... ), "*") |
+| passwords.js:182:14:182:21 | password | passwords.js:182:14:182:51 | passwor ... ), "*") |
 | passwords_in_browser1.js:2:13:2:20 | password | passwords_in_browser1.js:2:13:2:20 | password |
 | passwords_in_browser2.js:2:13:2:20 | password | passwords_in_browser2.js:2:13:2:20 | password |
 | passwords_in_server_1.js:6:13:6:20 | password | passwords_in_server_1.js:6:13:6:20 | password |
@@ -332,6 +340,7 @@ edges
 | passwords.js:170:11:170:39 | passwor ... g, "*") | passwords.js:170:11:170:18 | password | passwords.js:170:11:170:39 | passwor ... g, "*") | This logs sensitive data returned by $@ as clear text. | passwords.js:170:11:170:18 | password | an access to password |
 | passwords.js:173:17:173:26 | myPassword | passwords.js:173:17:173:26 | myPassword | passwords.js:173:17:173:26 | myPassword | This logs sensitive data returned by $@ as clear text. | passwords.js:173:17:173:26 | myPassword | an access to myPassword |
 | passwords.js:176:17:176:26 | myPasscode | passwords.js:176:17:176:26 | myPasscode | passwords.js:176:17:176:26 | myPasscode | This logs sensitive data returned by $@ as clear text. | passwords.js:176:17:176:26 | myPasscode | an access to myPasscode |
+| passwords.js:182:14:182:51 | passwor ... ), "*") | passwords.js:182:14:182:21 | password | passwords.js:182:14:182:51 | passwor ... ), "*") | This logs sensitive data returned by $@ as clear text. | passwords.js:182:14:182:21 | password | an access to password |
 | passwords_in_server_1.js:6:13:6:20 | password | passwords_in_server_1.js:6:13:6:20 | password | passwords_in_server_1.js:6:13:6:20 | password | This logs sensitive data returned by $@ as clear text. | passwords_in_server_1.js:6:13:6:20 | password | an access to password |
 | passwords_in_server_2.js:3:13:3:20 | password | passwords_in_server_2.js:3:13:3:20 | password | passwords_in_server_2.js:3:13:3:20 | password | This logs sensitive data returned by $@ as clear text. | passwords_in_server_2.js:3:13:3:20 | password | an access to password |
 | passwords_in_server_3.js:2:13:2:20 | password | passwords_in_server_3.js:2:13:2:20 | password | passwords_in_server_3.js:2:13:2:20 | password | This logs sensitive data returned by $@ as clear text. | passwords_in_server_3.js:2:13:2:20 | password | an access to password |
diff --git a/javascript/ql/test/query-tests/Security/CWE-312/passwords.js b/javascript/ql/test/query-tests/Security/CWE-312/passwords.js
index 370cf5d5af8..d0b15257206 100644
--- a/javascript/ql/test/query-tests/Security/CWE-312/passwords.js
+++ b/javascript/ql/test/query-tests/Security/CWE-312/passwords.js
@@ -174,4 +174,12 @@ const debug = require('debug')('test');
 
     const myPasscode = foo();
     console.log(myPasscode); // NOT OK
-});
\ No newline at end of file
+});
+
+(function () {
+    console.log(password.replace(/./g, "*")); // OK
+	console.log(password.replace(new RegExp(".", "g"), "*")); // OK
+	console.log(password.replace(new RegExp("."), "*")); // NOT OK
+	console.log(password.replace(new RegExp(".", unknownFlags()), "*")); // OK -- Most likely not a problem.
+    console.log(password.replace(new RegExp("pre_._suf", "g"), "*")); // OK
+})();
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/PolynomialBackTracking.expected b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/PolynomialBackTracking.expected
index 9a03bdcd34e..106b143111f 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/PolynomialBackTracking.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/PolynomialBackTracking.expected
@@ -130,6 +130,9 @@
 | polynomial-redos.js:133:22:133:23 | f+ | Strings starting with 'f' and with many repetitions of 'f' can start matching anywhere after the start of the preceeding ff+G |
 | polynomial-redos.js:136:25:136:26 | h+ | Strings starting with 'h' and with many repetitions of 'h' can start matching anywhere after the start of the preceeding hh+I |
 | polynomial-redos.js:138:322:138:323 | .* | Strings starting with 'AAAAAAAAAAAAAAAAAAAAAABBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC' and with many repetitions of 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC' can start matching anywhere after the start of the preceeding (AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)(AA\|BB)C.*X |
+| polynomial-redos.js:140:33:140:34 | h+ | Strings starting with 'h' and with many repetitions of 'h' can start matching anywhere after the start of the preceeding hh+I |
+| polynomial-redos.js:141:33:141:34 | h+ | Strings starting with 'h' and with many repetitions of 'h' can start matching anywhere after the start of the preceeding hh+I |
+| polynomial-redos.js:142:33:142:34 | h+ | Strings starting with 'h' and with many repetitions of 'h' can start matching anywhere after the start of the preceeding hh+I |
 | regexplib/address.js:27:3:27:5 | \\s* | Strings with many repetitions of '\\t' can start matching anywhere after the start of the preceeding (\\s*\\(?0\\d{4}\\)?(\\s*\|-)\\d{3}(\\s*\|-)\\d{3}\\s*) |
 | regexplib/address.js:27:48:27:50 | \\s* | Strings with many repetitions of '\\t' can start matching anywhere after the start of the preceeding (\\s*\\(?0\\d{3}\\)?(\\s*\|-)\\d{3}(\\s*\|-)\\d{4}\\s*) |
 | regexplib/address.js:27:93:27:95 | \\s* | Strings with many repetitions of '\\t' can start matching anywhere after the start of the preceeding (\\s*(7\|8)(\\d{7}\|\\d{3}(\\-\|\\s{1})\\d{4})\\s*) |
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/PolynomialReDoS.expected b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/PolynomialReDoS.expected
index 4c534fffe13..f9504944160 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/PolynomialReDoS.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/PolynomialReDoS.expected
@@ -249,6 +249,12 @@ nodes
 | polynomial-redos.js:136:5:136:13 | modified3 |
 | polynomial-redos.js:138:5:138:11 | tainted |
 | polynomial-redos.js:138:5:138:11 | tainted |
+| polynomial-redos.js:140:2:140:10 | modified3 |
+| polynomial-redos.js:140:2:140:10 | modified3 |
+| polynomial-redos.js:141:2:141:10 | modified3 |
+| polynomial-redos.js:141:2:141:10 | modified3 |
+| polynomial-redos.js:142:2:142:10 | modified3 |
+| polynomial-redos.js:142:2:142:10 | modified3 |
 edges
 | lib/closure.js:3:21:3:21 | x | lib/closure.js:4:16:4:16 | x |
 | lib/closure.js:3:21:3:21 | x | lib/closure.js:4:16:4:16 | x |
@@ -489,6 +495,12 @@ edges
 | polynomial-redos.js:132:18:132:50 | tainted ... g, "e") | polynomial-redos.js:132:6:132:50 | modified2 |
 | polynomial-redos.js:135:9:135:47 | modified3 | polynomial-redos.js:136:5:136:13 | modified3 |
 | polynomial-redos.js:135:9:135:47 | modified3 | polynomial-redos.js:136:5:136:13 | modified3 |
+| polynomial-redos.js:135:9:135:47 | modified3 | polynomial-redos.js:140:2:140:10 | modified3 |
+| polynomial-redos.js:135:9:135:47 | modified3 | polynomial-redos.js:140:2:140:10 | modified3 |
+| polynomial-redos.js:135:9:135:47 | modified3 | polynomial-redos.js:141:2:141:10 | modified3 |
+| polynomial-redos.js:135:9:135:47 | modified3 | polynomial-redos.js:141:2:141:10 | modified3 |
+| polynomial-redos.js:135:9:135:47 | modified3 | polynomial-redos.js:142:2:142:10 | modified3 |
+| polynomial-redos.js:135:9:135:47 | modified3 | polynomial-redos.js:142:2:142:10 | modified3 |
 | polynomial-redos.js:135:21:135:27 | tainted | polynomial-redos.js:135:21:135:47 | tainted ... /g, "") |
 | polynomial-redos.js:135:21:135:47 | tainted ... /g, "") | polynomial-redos.js:135:9:135:47 | modified3 |
 #select
@@ -590,3 +602,6 @@ edges
 | polynomial-redos.js:133:2:133:32 | modifie ... g, "b") | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:133:2:133:10 | modified2 | This $@ that depends on $@ may run slow on strings starting with 'f' and with many repetitions of 'f'. | polynomial-redos.js:133:22:133:23 | f+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
 | polynomial-redos.js:136:5:136:35 | modifie ... g, "b") | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:136:5:136:13 | modified3 | This $@ that depends on $@ may run slow on strings starting with 'h' and with many repetitions of 'h'. | polynomial-redos.js:136:25:136:26 | h+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
 | polynomial-redos.js:138:5:138:326 | tainted ... )C.*X/) | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:138:5:138:11 | tainted | This $@ that depends on $@ may run slow on strings starting with 'AAAAAAAAAAAAAAAAAAAAAABBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC' and with many repetitions of 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC'. | polynomial-redos.js:138:322:138:323 | .* | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:140:2:140:48 | modifie ... ), "b") | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:140:2:140:10 | modified3 | This $@ that depends on $@ may run slow on strings starting with 'h' and with many repetitions of 'h'. | polynomial-redos.js:140:33:140:34 | h+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:141:2:141:59 | modifie ... ), "b") | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:141:2:141:10 | modified3 | This $@ that depends on $@ may run slow on strings starting with 'h' and with many repetitions of 'h'. | polynomial-redos.js:141:33:141:34 | h+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
+| polynomial-redos.js:142:2:142:47 | modifie ... ), "b") | polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:142:2:142:10 | modified3 | This $@ that depends on $@ may run slow on strings starting with 'h' and with many repetitions of 'h'. | polynomial-redos.js:142:33:142:34 | h+ | regular expression | polynomial-redos.js:5:16:5:32 | req.query.tainted | a user-provided value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/polynomial-redos.js b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/polynomial-redos.js
index fc0ddde66b2..860472428ff 100644
--- a/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/polynomial-redos.js
+++ b/javascript/ql/test/query-tests/Security/CWE-400/ReDoS/polynomial-redos.js
@@ -136,4 +136,8 @@ app.use(function(req, res) {
     modified3.replace(/hh+I/g, "b"); // NOT OK
 
     tainted.match(/(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)(AA|BB)C.*X/); // NOT OK
+	
+	modified3.replace(new RegExp("hh+I", "g"), "b"); // NOT OK
+	modified3.replace(new RegExp("hh+I", unknownFlags()), "b"); // NOT OK
+	modified3.replace(new RegExp("hh+I", ""), "b"); // NOT OK
 });
diff --git a/javascript/ql/test/query-tests/Security/CWE-730/RegExpInjection.expected b/javascript/ql/test/query-tests/Security/CWE-730/RegExpInjection.expected
index 105f6a85563..c9e21be5709 100644
--- a/javascript/ql/test/query-tests/Security/CWE-730/RegExpInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-730/RegExpInjection.expected
@@ -64,6 +64,14 @@ nodes
 | RegExpInjection.js:93:20:93:31 | process.argv |
 | RegExpInjection.js:93:20:93:31 | process.argv |
 | RegExpInjection.js:93:20:93:34 | process.argv[1] |
+| RegExpInjection.js:97:7:97:32 | input |
+| RegExpInjection.js:97:15:97:32 | req.param("input") |
+| RegExpInjection.js:97:15:97:32 | req.param("input") |
+| RegExpInjection.js:99:7:99:106 | sanitized |
+| RegExpInjection.js:99:19:99:23 | input |
+| RegExpInjection.js:99:19:99:106 | input.r ... "\\\\$&") |
+| RegExpInjection.js:100:14:100:22 | sanitized |
+| RegExpInjection.js:100:14:100:22 | sanitized |
 | tst.js:5:9:5:29 | data |
 | tst.js:5:16:5:29 | req.query.data |
 | tst.js:5:16:5:29 | req.query.data |
@@ -133,6 +141,13 @@ edges
 | RegExpInjection.js:93:20:93:31 | process.argv | RegExpInjection.js:93:20:93:34 | process.argv[1] |
 | RegExpInjection.js:93:20:93:34 | process.argv[1] | RegExpInjection.js:93:16:93:49 | `^${pro ... r.app$` |
 | RegExpInjection.js:93:20:93:34 | process.argv[1] | RegExpInjection.js:93:16:93:49 | `^${pro ... r.app$` |
+| RegExpInjection.js:97:7:97:32 | input | RegExpInjection.js:99:19:99:23 | input |
+| RegExpInjection.js:97:15:97:32 | req.param("input") | RegExpInjection.js:97:7:97:32 | input |
+| RegExpInjection.js:97:15:97:32 | req.param("input") | RegExpInjection.js:97:7:97:32 | input |
+| RegExpInjection.js:99:7:99:106 | sanitized | RegExpInjection.js:100:14:100:22 | sanitized |
+| RegExpInjection.js:99:7:99:106 | sanitized | RegExpInjection.js:100:14:100:22 | sanitized |
+| RegExpInjection.js:99:19:99:23 | input | RegExpInjection.js:99:19:99:106 | input.r ... "\\\\$&") |
+| RegExpInjection.js:99:19:99:106 | input.r ... "\\\\$&") | RegExpInjection.js:99:7:99:106 | sanitized |
 | tst.js:5:9:5:29 | data | tst.js:6:21:6:24 | data |
 | tst.js:5:16:5:29 | req.query.data | tst.js:5:9:5:29 | data |
 | tst.js:5:16:5:29 | req.query.data | tst.js:5:9:5:29 | data |
@@ -157,4 +172,5 @@ edges
 | RegExpInjection.js:87:14:87:55 | "^.*\\.( ...  + ")$" | RegExpInjection.js:82:15:82:32 | req.param("input") | RegExpInjection.js:87:14:87:55 | "^.*\\.( ...  + ")$" | This regular expression is constructed from a $@. | RegExpInjection.js:82:15:82:32 | req.param("input") | user-provided value |
 | RegExpInjection.js:91:16:91:50 | `^${pro ... r.app$` | RegExpInjection.js:91:20:91:30 | process.env | RegExpInjection.js:91:16:91:50 | `^${pro ... r.app$` | This regular expression is constructed from a $@. | RegExpInjection.js:91:20:91:30 | process.env | environment variable |
 | RegExpInjection.js:93:16:93:49 | `^${pro ... r.app$` | RegExpInjection.js:93:20:93:31 | process.argv | RegExpInjection.js:93:16:93:49 | `^${pro ... r.app$` | This regular expression is constructed from a $@. | RegExpInjection.js:93:20:93:31 | process.argv | command-line argument |
+| RegExpInjection.js:100:14:100:22 | sanitized | RegExpInjection.js:97:15:97:32 | req.param("input") | RegExpInjection.js:100:14:100:22 | sanitized | This regular expression is constructed from a $@. | RegExpInjection.js:97:15:97:32 | req.param("input") | user-provided value |
 | tst.js:6:16:6:35 | "^"+ data.name + "$" | tst.js:5:16:5:29 | req.query.data | tst.js:6:16:6:35 | "^"+ data.name + "$" | This regular expression is constructed from a $@. | tst.js:5:16:5:29 | req.query.data | user-provided value |
diff --git a/javascript/ql/test/query-tests/Security/CWE-730/RegExpInjection.js b/javascript/ql/test/query-tests/Security/CWE-730/RegExpInjection.js
index 6cf3938486e..c2f74e5b114 100644
--- a/javascript/ql/test/query-tests/Security/CWE-730/RegExpInjection.js
+++ b/javascript/ql/test/query-tests/Security/CWE-730/RegExpInjection.js
@@ -92,3 +92,16 @@ app.get("argv", function(req, res) {
 
     new RegExp(`^${process.argv[1]}/Foo/bar.app$`); // NOT OK
 });
+
+app.get("argv", function(req, res) {
+  var input = req.param("input");
+
+  var sanitized = input.replace(new RegExp("[\\-\\[\\]\\/\\{\\}\\(\\)\\*\\+\\?\\.\\\\\\^\\$\\|]"), "\\$&");
+  new RegExp(sanitized); // NOT OK
+  
+  var sanitized = input.replace(new RegExp("[\\-\\[\\]\\/\\{\\}\\(\\)\\*\\+\\?\\.\\\\\\^\\$\\|]", "g"), "\\$&");
+  new RegExp(sanitized); // OK
+
+  var sanitized = input.replace(new RegExp("[\\-\\[\\]\\/\\{\\}\\(\\)\\*\\+\\?\\.\\\\\\^\\$\\|]", unknownFlags()), "\\$&");
+  new RegExp(sanitized); // OK -- Most likely not a problem.
+});
diff --git a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/PrototypePollutingAssignment.expected b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/PrototypePollutingAssignment.expected
index 891aeff4221..50262859441 100644
--- a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/PrototypePollutingAssignment.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/PrototypePollutingAssignment.expected
@@ -190,6 +190,11 @@ nodes
 | tst.js:105:5:105:17 | object[taint] |
 | tst.js:105:5:105:17 | object[taint] |
 | tst.js:105:12:105:16 | taint |
+| tst.js:130:5:130:53 | obj[req ... ), '')] |
+| tst.js:130:5:130:53 | obj[req ... ), '')] |
+| tst.js:130:9:130:19 | req.query.x |
+| tst.js:130:9:130:19 | req.query.x |
+| tst.js:130:9:130:52 | req.que ... '), '') |
 edges
 | lib.js:1:38:1:40 | obj | lib.js:6:7:6:9 | obj |
 | lib.js:1:38:1:40 | obj | lib.js:6:7:6:9 | obj |
@@ -366,6 +371,10 @@ edges
 | tst.js:102:24:102:37 | req.query.data | tst.js:102:17:102:38 | String( ... y.data) |
 | tst.js:105:12:105:16 | taint | tst.js:105:5:105:17 | object[taint] |
 | tst.js:105:12:105:16 | taint | tst.js:105:5:105:17 | object[taint] |
+| tst.js:130:9:130:19 | req.query.x | tst.js:130:9:130:52 | req.que ... '), '') |
+| tst.js:130:9:130:19 | req.query.x | tst.js:130:9:130:52 | req.que ... '), '') |
+| tst.js:130:9:130:52 | req.que ... '), '') | tst.js:130:5:130:53 | obj[req ... ), '')] |
+| tst.js:130:9:130:52 | req.que ... '), '') | tst.js:130:5:130:53 | obj[req ... ), '')] |
 #select
 | lib.js:6:7:6:9 | obj | lib.js:1:43:1:46 | path | lib.js:6:7:6:9 | obj | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | lib.js:1:43:1:46 | path | library input |
 | lib.js:15:3:15:14 | obj[path[0]] | lib.js:14:38:14:41 | path | lib.js:15:3:15:14 | obj[path[0]] | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | lib.js:14:38:14:41 | path | library input |
@@ -394,3 +403,4 @@ edges
 | tst.js:94:5:94:37 | obj[req ... ', '')] | tst.js:94:9:94:19 | req.query.x | tst.js:94:5:94:37 | obj[req ... ', '')] | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | tst.js:94:9:94:19 | req.query.x | user controlled input |
 | tst.js:97:5:97:46 | obj[req ... g, '')] | tst.js:97:9:97:19 | req.query.x | tst.js:97:5:97:46 | obj[req ... g, '')] | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | tst.js:97:9:97:19 | req.query.x | user controlled input |
 | tst.js:105:5:105:17 | object[taint] | tst.js:102:24:102:37 | req.query.data | tst.js:105:5:105:17 | object[taint] | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | tst.js:102:24:102:37 | req.query.data | user controlled input |
+| tst.js:130:5:130:53 | obj[req ... ), '')] | tst.js:130:9:130:19 | req.query.x | tst.js:130:5:130:53 | obj[req ... ), '')] | This assignment may alter Object.prototype if a malicious '__proto__' string is injected from $@. | tst.js:130:9:130:19 | req.query.x | user controlled input |
diff --git a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/tst.js b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/tst.js
index d301fe40bf6..a622a891390 100644
--- a/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/tst.js
+++ b/javascript/ql/test/query-tests/Security/CWE-915/PrototypePollutingAssignment/tst.js
@@ -123,3 +123,10 @@ app.get('/assign', (req, res) => {
     Object.assign(dest, plainObj[taint]);
     dest[taint] = taint; // OK - 'dest' is not Object.prototype itself (but possibly a copy)
 });
+
+app.get('/foo', (req, res) => {
+    let obj = {};
+    obj[req.query.x.replace(new RegExp('_', 'g'), '')].x = 'foo'; // OK
+    obj[req.query.x.replace(new RegExp('_', ''), '')].x = 'foo'; // NOT OK
+    obj[req.query.x.replace(new RegExp('_', unknownFlags()), '')].x = 'foo'; // OK
+});
diff --git a/javascript/ql/test/query-tests/Statements/UseOfReturnlessFunction/UseOfReturnlessFunction.expected b/javascript/ql/test/query-tests/Statements/UseOfReturnlessFunction/UseOfReturnlessFunction.expected
index 1cbbd9faa5a..dec3eea044d 100644
--- a/javascript/ql/test/query-tests/Statements/UseOfReturnlessFunction/UseOfReturnlessFunction.expected
+++ b/javascript/ql/test/query-tests/Statements/UseOfReturnlessFunction/UseOfReturnlessFunction.expected
@@ -7,3 +7,5 @@
 | tst.js:53:10:53:34 | bothOnl ... fects() | the $@ does not return anything, yet the return value is used. | tst.js:48:2:50:5 | functio ... )\\n    } | function onlySideEffects2 |
 | tst.js:76:12:76:46 | [1,2,3] ... n, 3)}) | the $@ does not return anything, yet the return value from the call to filter is used. | tst.js:76:27:76:45 | n => {equals(n, 3)} | callback function |
 | tst.js:80:12:80:50 | filter( ...  3) } ) | the $@ does not return anything, yet the return value from the call to filter is used. | tst.js:80:28:80:48 | x => {  ... x, 3) } | callback function |
+| tst.js:114:12:114:56 | [1,2,3] ...  3); }) | the $@ does not return anything, yet the return value from the call to findLastIndex is used. | tst.js:114:34:114:55 | n => {  ... , 3); } | callback function |
+| tst.js:117:12:117:51 | [1,2,3] ...  3); }) | the $@ does not return anything, yet the return value from the call to findLast is used. | tst.js:117:29:117:50 | n => {  ... , 3); } | callback function |
diff --git a/javascript/ql/test/query-tests/Statements/UseOfReturnlessFunction/tst.js b/javascript/ql/test/query-tests/Statements/UseOfReturnlessFunction/tst.js
index dbedb3dee3c..7b9968115f5 100644
--- a/javascript/ql/test/query-tests/Statements/UseOfReturnlessFunction/tst.js
+++ b/javascript/ql/test/query-tests/Statements/UseOfReturnlessFunction/tst.js
@@ -107,3 +107,13 @@ class Bar extends Foo {
 		console.log(super()); // OK.
 	}
 }
+
+() => {
+	let equals = (x, y) => { return x === y; };
+
+	var foo = [1,2,3].findLastIndex(n => { equals(n, 3); }) // NOT OK
+	console.log(foo);
+
+	var foo = [1,2,3].findLast(n => { equals(n, 3); }) // NOT OK
+	console.log(foo);
+}
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bazel
index 844d385f8a4..0e886c727a0 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bazel
@@ -55,6 +55,12 @@ alias(
     tags = ["manual"],
 )
 
+alias(
+    name = "dunce",
+    actual = "@vendor__dunce-1.0.5//:dunce",
+    tags = ["manual"],
+)
+
 alias(
     name = "encoding",
     actual = "@vendor__encoding-0.2.33//:encoding",
@@ -243,7 +249,7 @@ alias(
 
 alias(
     name = "serde_json",
-    actual = "@vendor__serde_json-1.0.132//:serde_json",
+    actual = "@vendor__serde_json-1.0.133//:serde_json",
     tags = ["manual"],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo_metadata-0.18.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo_metadata-0.18.1.bazel
index e31c61cfac7..9ad331aa5f7 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo_metadata-0.18.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo_metadata-0.18.1.bazel
@@ -86,7 +86,7 @@ rust_library(
         "@vendor__cargo-platform-0.1.8//:cargo_platform",
         "@vendor__semver-1.0.23//:semver",
         "@vendor__serde-1.0.214//:serde",
-        "@vendor__serde_json-1.0.132//:serde_json",
+        "@vendor__serde_json-1.0.133//:serde_json",
         "@vendor__thiserror-1.0.69//:thiserror",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dunce-1.0.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dunce-1.0.5.bazel
new file mode 100644
index 00000000000..c5341a0cb67
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.dunce-1.0.5.bazel
@@ -0,0 +1,81 @@
+###############################################################################
+# @generated
+# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
+# regenerate this file, run the following:
+#
+#     bazel run @@//misc/bazel/3rdparty:vendor_tree_sitter_extractors
+###############################################################################
+
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+rust_library(
+    name = "dunce",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = True,
+    ),
+    compile_data = glob(
+        include = ["**"],
+        allow_empty = True,
+        exclude = [
+            "**/* *",
+            ".tmp_git_root/**/*",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=dunce",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    target_compatible_with = select({
+        "@rules_rust//rust/platform:aarch64-apple-darwin": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios": [],
+        "@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
+        "@rules_rust//rust/platform:aarch64-fuchsia": [],
+        "@rules_rust//rust/platform:aarch64-linux-android": [],
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
+        "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:armv7-linux-androideabi": [],
+        "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
+        "@rules_rust//rust/platform:i686-apple-darwin": [],
+        "@rules_rust//rust/platform:i686-linux-android": [],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:i686-unknown-freebsd": [],
+        "@rules_rust//rust/platform:i686-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [],
+        "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:thumbv7em-none-eabi": [],
+        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
+        "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+        "@rules_rust//rust/platform:wasm32-wasi": [],
+        "@rules_rust//rust/platform:x86_64-apple-darwin": [],
+        "@rules_rust//rust/platform:x86_64-apple-ios": [],
+        "@rules_rust//rust/platform:x86_64-fuchsia": [],
+        "@rules_rust//rust/platform:x86_64-linux-android": [],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
+        "@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
+        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
+        "@rules_rust//rust/platform:x86_64-unknown-none": [],
+        "//conditions:default": ["@platforms//:incompatible"],
+    }),
+    version = "1.0.5",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_proc_macro_api-0.0.232.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_proc_macro_api-0.0.232.bazel
index d1f5d480d71..fa3b71f570c 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_proc_macro_api-0.0.232.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_proc_macro_api-0.0.232.bazel
@@ -96,7 +96,7 @@ rust_library(
         "@vendor__ra_ap_tt-0.0.232//:ra_ap_tt",
         "@vendor__rustc-hash-1.1.0//:rustc_hash",
         "@vendor__serde-1.0.214//:serde",
-        "@vendor__serde_json-1.0.132//:serde_json",
+        "@vendor__serde_json-1.0.133//:serde_json",
         "@vendor__tracing-0.1.40//:tracing",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_project_model-0.0.232.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_project_model-0.0.232.bazel
index 6f6f3bb303a..5608e6dd6b0 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_project_model-0.0.232.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_project_model-0.0.232.bazel
@@ -102,7 +102,7 @@ rust_library(
         "@vendor__rustc-hash-1.1.0//:rustc_hash",
         "@vendor__semver-1.0.23//:semver",
         "@vendor__serde-1.0.214//:serde",
-        "@vendor__serde_json-1.0.132//:serde_json",
+        "@vendor__serde_json-1.0.133//:serde_json",
         "@vendor__tracing-0.1.40//:tracing",
         "@vendor__triomphe-0.1.14//:triomphe",
     ],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_json-1.0.132.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_json-1.0.133.bazel
similarity index 97%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_json-1.0.132.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_json-1.0.133.bazel
index ecbae32eeaf..710772e4f37 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_json-1.0.132.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_json-1.0.133.bazel
@@ -83,13 +83,13 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-none": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.0.132",
+    version = "1.0.133",
     deps = [
         "@vendor__itoa-1.0.11//:itoa",
         "@vendor__memchr-2.7.4//:memchr",
         "@vendor__ryu-1.0.18//:ryu",
         "@vendor__serde-1.0.214//:serde",
-        "@vendor__serde_json-1.0.132//:build_script_build",
+        "@vendor__serde_json-1.0.133//:build_script_build",
     ],
 )
 
@@ -143,7 +143,7 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "1.0.132",
+    version = "1.0.133",
     visibility = ["//visibility:private"],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/defs.bzl b/misc/bazel/3rdparty/tree_sitter_extractors_deps/defs.bzl
index 1d0b825c235..dfdfdd8560d 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/defs.bzl
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/defs.bzl
@@ -320,7 +320,9 @@ _NORMAL_DEPENDENCIES = {
         _COMMON_CONDITION: {
             "anyhow": Label("@vendor__anyhow-1.0.93//:anyhow"),
             "argfile": Label("@vendor__argfile-0.2.1//:argfile"),
+            "chrono": Label("@vendor__chrono-0.4.38//:chrono"),
             "clap": Label("@vendor__clap-4.5.20//:clap"),
+            "dunce": Label("@vendor__dunce-1.0.5//:dunce"),
             "figment": Label("@vendor__figment-0.10.19//:figment"),
             "glob": Label("@vendor__glob-0.3.1//:glob"),
             "itertools": Label("@vendor__itertools-0.13.0//:itertools"),
@@ -341,6 +343,7 @@ _NORMAL_DEPENDENCIES = {
             "ra_ap_syntax": Label("@vendor__ra_ap_syntax-0.0.232//:ra_ap_syntax"),
             "ra_ap_vfs": Label("@vendor__ra_ap_vfs-0.0.232//:ra_ap_vfs"),
             "serde": Label("@vendor__serde-1.0.214//:serde"),
+            "serde_json": Label("@vendor__serde_json-1.0.133//:serde_json"),
             "serde_with": Label("@vendor__serde_with-3.11.0//:serde_with"),
             "stderrlog": Label("@vendor__stderrlog-0.6.0//:stderrlog"),
             "triomphe": Label("@vendor__triomphe-0.1.14//:triomphe"),
@@ -363,7 +366,7 @@ _NORMAL_DEPENDENCIES = {
             "rayon": Label("@vendor__rayon-1.10.0//:rayon"),
             "regex": Label("@vendor__regex-1.11.1//:regex"),
             "serde": Label("@vendor__serde-1.0.214//:serde"),
-            "serde_json": Label("@vendor__serde_json-1.0.132//:serde_json"),
+            "serde_json": Label("@vendor__serde_json-1.0.133//:serde_json"),
             "tracing": Label("@vendor__tracing-0.1.40//:tracing"),
             "tracing-subscriber": Label("@vendor__tracing-subscriber-0.3.18//:tracing_subscriber"),
             "tree-sitter": Label("@vendor__tree-sitter-0.24.4//:tree_sitter"),
@@ -1117,6 +1120,16 @@ def crate_repositories():
         build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.drop_bomb-0.1.5.bazel"),
     )
 
+    maybe(
+        http_archive,
+        name = "vendor__dunce-1.0.5",
+        sha256 = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/dunce/1.0.5/download"],
+        strip_prefix = "dunce-1.0.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.dunce-1.0.5.bazel"),
+    )
+
     maybe(
         http_archive,
         name = "vendor__either-1.13.0",
@@ -2508,12 +2521,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor__serde_json-1.0.132",
-        sha256 = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03",
+        name = "vendor__serde_json-1.0.133",
+        sha256 = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/serde_json/1.0.132/download"],
-        strip_prefix = "serde_json-1.0.132",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_json-1.0.132.bazel"),
+        urls = ["https://static.crates.io/crates/serde_json/1.0.133/download"],
+        strip_prefix = "serde_json-1.0.133",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_json-1.0.133.bazel"),
     )
 
     maybe(
@@ -3311,6 +3324,7 @@ def crate_repositories():
         struct(repo = "vendor__argfile-0.2.1", is_dev_dep = False),
         struct(repo = "vendor__chrono-0.4.38", is_dev_dep = False),
         struct(repo = "vendor__clap-4.5.20", is_dev_dep = False),
+        struct(repo = "vendor__dunce-1.0.5", is_dev_dep = False),
         struct(repo = "vendor__encoding-0.2.33", is_dev_dep = False),
         struct(repo = "vendor__figment-0.10.19", is_dev_dep = False),
         struct(repo = "vendor__flate2-1.0.34", is_dev_dep = False),
@@ -3341,7 +3355,7 @@ def crate_repositories():
         struct(repo = "vendor__rayon-1.10.0", is_dev_dep = False),
         struct(repo = "vendor__regex-1.11.1", is_dev_dep = False),
         struct(repo = "vendor__serde-1.0.214", is_dev_dep = False),
-        struct(repo = "vendor__serde_json-1.0.132", is_dev_dep = False),
+        struct(repo = "vendor__serde_json-1.0.133", is_dev_dep = False),
         struct(repo = "vendor__serde_with-3.11.0", is_dev_dep = False),
         struct(repo = "vendor__stderrlog-0.6.0", is_dev_dep = False),
         struct(repo = "vendor__syn-2.0.87", is_dev_dep = False),
diff --git a/misc/codegen/codegen.py b/misc/codegen/codegen.py
index acc8e59bba5..ae3a67d3fba 100755
--- a/misc/codegen/codegen.py
+++ b/misc/codegen/codegen.py
@@ -54,6 +54,8 @@ def _parse_args() -> argparse.Namespace:
                             "generated qll file importing every class file"),
         p.add_argument("--ql-test-output",
                        help="output directory for QL generated extractor test files"),
+        p.add_argument("--ql-cfg-output",
+                       help="output directory for QL CFG layer (optional)."),
         p.add_argument("--cpp-output",
                        help="output directory for generated C++ files, required if trap or cpp is provided to "
                             "--generate"),
diff --git a/misc/codegen/generators/dbschemegen.py b/misc/codegen/generators/dbschemegen.py
index 2c3cd5598d5..e2cc4220dc7 100755
--- a/misc/codegen/generators/dbschemegen.py
+++ b/misc/codegen/generators/dbschemegen.py
@@ -110,7 +110,8 @@ def cls_to_dbscheme(cls: schema.Class, lookup: typing.Dict[str, schema.Class], a
 
 def get_declarations(data: schema.Schema):
     add_or_none_except = data.root_class.name if data.null else None
-    declarations = [d for cls in data.classes.values() for d in cls_to_dbscheme(cls, data.classes, add_or_none_except)]
+    declarations = [d for cls in data.classes.values() if not cls.imported for d in cls_to_dbscheme(cls,
+                                                                                                    data.classes, add_or_none_except)]
     if data.null:
         property_classes = {
             prop.type for cls in data.classes.values() for prop in cls.properties
diff --git a/misc/codegen/generators/qlgen.py b/misc/codegen/generators/qlgen.py
index c5e7153489b..5cdc16a8af5 100755
--- a/misc/codegen/generators/qlgen.py
+++ b/misc/codegen/generators/qlgen.py
@@ -64,6 +64,7 @@ abbreviations = {
     "int": "integer",
     "var": "variable",
     "ref": "reference",
+    "pat": "pattern",
 }
 
 abbreviations.update({f"{k}s": f"{v}s" for k, v in abbreviations.items()})
@@ -104,8 +105,17 @@ def _get_doc(cls: schema.Class, prop: schema.Property, plural=None):
     return f"{prop_name} of this {class_name}"
 
 
-def get_ql_property(cls: schema.Class, prop: schema.Property, lookup: typing.Dict[str, schema.Class],
+def _type_is_hideable(t: str, lookup: typing.Dict[str, schema.ClassBase]) -> bool:
+    if t in lookup:
+        match lookup[t]:
+            case schema.Class() as cls:
+                return "ql_hideable" in cls.pragmas
+    return False
+
+
+def get_ql_property(cls: schema.Class, prop: schema.Property, lookup: typing.Dict[str, schema.ClassBase],
                     prev_child: str = "") -> ql.Property:
+
     args = dict(
         type=prop.type if not prop.is_predicate else "predicate",
         qltest_skip="qltest_skip" in prop.pragmas,
@@ -115,20 +125,22 @@ def get_ql_property(cls: schema.Class, prop: schema.Property, lookup: typing.Dic
         is_unordered=prop.is_unordered,
         description=prop.description,
         synth=bool(cls.synth) or prop.synth,
-        type_is_hideable="ql_hideable" in lookup[prop.type].pragmas if prop.type in lookup else False,
+        type_is_hideable=_type_is_hideable(prop.type, lookup),
+        type_is_codegen_class=prop.type in lookup and not lookup[prop.type].imported,
         internal="ql_internal" in prop.pragmas,
     )
+    ql_name = prop.pragmas.get("ql_name", prop.name)
     if prop.is_single:
         args.update(
-            singular=inflection.camelize(prop.name),
+            singular=inflection.camelize(ql_name),
             tablename=inflection.tableize(cls.name),
             tableparams=["this"] + ["result" if p is prop else "_" for p in cls.properties if p.is_single],
             doc=_get_doc(cls, prop),
         )
     elif prop.is_repeated:
         args.update(
-            singular=inflection.singularize(inflection.camelize(prop.name)),
-            plural=inflection.pluralize(inflection.camelize(prop.name)),
+            singular=inflection.singularize(inflection.camelize(ql_name)),
+            plural=inflection.pluralize(inflection.camelize(ql_name)),
             tablename=inflection.tableize(f"{cls.name}_{prop.name}"),
             tableparams=["this", "index", "result"] if not prop.is_unordered else ["this", "result"],
             doc=_get_doc(cls, prop, plural=False),
@@ -136,14 +148,14 @@ def get_ql_property(cls: schema.Class, prop: schema.Property, lookup: typing.Dic
         )
     elif prop.is_optional:
         args.update(
-            singular=inflection.camelize(prop.name),
+            singular=inflection.camelize(ql_name),
             tablename=inflection.tableize(f"{cls.name}_{prop.name}"),
             tableparams=["this", "result"],
             doc=_get_doc(cls, prop),
         )
     elif prop.is_predicate:
         args.update(
-            singular=inflection.camelize(prop.name, uppercase_first_letter=False),
+            singular=inflection.camelize(ql_name, uppercase_first_letter=False),
             tablename=inflection.underscore(f"{cls.name}_{prop.name}"),
             tableparams=["this"],
             doc=_get_doc(cls, prop),
@@ -153,13 +165,17 @@ def get_ql_property(cls: schema.Class, prop: schema.Property, lookup: typing.Dic
     return ql.Property(**args)
 
 
-def get_ql_class(cls: schema.Class, lookup: typing.Dict[str, schema.Class]) -> ql.Class:
+def get_ql_class(cls: schema.Class, lookup: typing.Dict[str, schema.ClassBase]) -> ql.Class:
+    if "ql_name" in cls.pragmas:
+        raise Error("ql_name is not supported yet for classes, only for properties")
     prev_child = ""
     properties = []
     for p in cls.properties:
         prop = get_ql_property(cls, p, lookup, prev_child)
         if prop.is_child:
             prev_child = prop.singular
+            if prop.type in lookup and lookup[prop.type].cfg:
+                prop.cfg = True
         properties.append(prop)
     return ql.Class(
         name=cls.name,
@@ -171,6 +187,16 @@ def get_ql_class(cls: schema.Class, lookup: typing.Dict[str, schema.Class]) -> q
         doc=cls.doc,
         hideable="ql_hideable" in cls.pragmas,
         internal="ql_internal" in cls.pragmas,
+        cfg=cls.cfg,
+    )
+
+
+def get_ql_cfg_class(cls: schema.Class, lookup: typing.Dict[str, ql.Class]) -> ql.CfgClass:
+    return ql.CfgClass(
+        name=cls.name,
+        bases=[base for base in cls.bases if lookup[base.base].cfg],
+        properties=cls.properties,
+        doc=cls.doc
     )
 
 
@@ -361,6 +387,7 @@ def generate(opts, renderer):
     input = opts.schema
     out = opts.ql_output
     stub_out = opts.ql_stub_output
+    cfg_out = opts.ql_cfg_output
     test_out = opts.ql_test_output
     missing_test_source_filename = "MISSING_SOURCE.txt"
     include_file = stub_out.with_suffix(".qll")
@@ -375,16 +402,18 @@ def generate(opts, renderer):
 
     data = schemaloader.load_file(input)
 
-    classes = {name: get_ql_class(cls, data.classes) for name, cls in data.classes.items()}
+    classes = {name: get_ql_class(cls, data.classes) for name, cls in data.classes.items() if not cls.imported}
     if not classes:
         raise NoClasses
     root = next(iter(classes.values()))
     if root.has_children:
         raise RootElementHasChildren(root)
 
-    imports = {}
+    pre_imports = {n: cls.module for n, cls in data.classes.items() if cls.imported}
+    imports = dict(pre_imports)
     imports_impl = {}
     classes_used_by = {}
+    cfg_classes = []
     generated_import_prefix = get_import(out, opts.root_dir)
     registry = opts.generated_registry or pathlib.Path(
         os.path.commonpath((out, stub_out, test_out)), ".generated.list")
@@ -393,7 +422,7 @@ def generate(opts, renderer):
                          force=opts.force) as renderer:
 
         db_classes = [cls for name, cls in classes.items() if not data.classes[name].synth]
-        renderer.render(ql.DbClasses(db_classes), out / "Raw.qll")
+        renderer.render(ql.DbClasses(classes=db_classes, imports=sorted(set(pre_imports.values()))), out / "Raw.qll")
 
         classes_by_dir_and_name = sorted(classes.values(), key=lambda cls: (cls.dir, cls.name))
         for c in classes_by_dir_and_name:
@@ -402,6 +431,8 @@ def generate(opts, renderer):
             imports[c.name] = path
             path_impl = get_import(stub_out / c.dir / "internal" / c.name, opts.root_dir)
             imports_impl[c.name + "Impl"] = path_impl + "Impl"
+            if c.cfg:
+                cfg_classes.append(get_ql_cfg_class(c, classes))
 
         for c in classes.values():
             qll = out / c.path.with_suffix(".qll")
@@ -411,7 +442,17 @@ def generate(opts, renderer):
             c.import_prefix = generated_import_prefix
             renderer.render(c, qll)
 
+        if cfg_out:
+            cfg_classes_val = ql.CfgClasses(
+                include_file_import=get_import(include_file, opts.root_dir),
+                classes=cfg_classes
+            )
+            cfg_qll = cfg_out / "CfgNodes.qll"
+            renderer.render(cfg_classes_val, cfg_qll)
+
         for c in data.classes.values():
+            if c.imported:
+                continue
             path = _get_path(c)
             path_impl = _get_path_impl(c)
             stub_file = stub_out / path_impl
@@ -430,7 +471,7 @@ def generate(opts, renderer):
             renderer.render(class_public, class_public_file)
 
         # for example path/to/elements -> path/to/elements.qll
-        renderer.render(ql.ImportList([i for name, i in imports.items() if not classes[name].internal]),
+        renderer.render(ql.ImportList([i for name, i in imports.items() if name not in classes or not classes[name].internal]),
                         include_file)
 
         elements_module = get_import(include_file, opts.root_dir)
@@ -438,12 +479,15 @@ def generate(opts, renderer):
         renderer.render(
             ql.GetParentImplementation(
                 classes=list(classes.values()),
-                imports=[elements_module] + [i for name, i in imports.items() if classes[name].internal],
+                imports=[elements_module] + [i for name,
+                                             i in imports.items() if name in classes and classes[name].internal],
             ),
             out / 'ParentChild.qll')
 
         if test_out:
             for c in data.classes.values():
+                if c.imported:
+                    continue
                 if should_skip_qltest(c, data.classes):
                     continue
                 test_with_name = c.pragmas.get("qltest_test_with")
@@ -473,7 +517,8 @@ def generate(opts, renderer):
         constructor_imports = []
         synth_constructor_imports = []
         stubs = {}
-        for cls in sorted(data.classes.values(), key=lambda cls: (cls.group, cls.name)):
+        for cls in sorted((cls for cls in data.classes.values() if not cls.imported),
+                          key=lambda cls: (cls.group, cls.name)):
             synth_type = get_ql_synth_class(cls)
             if synth_type.is_final:
                 final_synth_types.append(synth_type)
diff --git a/misc/codegen/generators/rustgen.py b/misc/codegen/generators/rustgen.py
index f4c977c0fdb..b47e5cc4bd9 100644
--- a/misc/codegen/generators/rustgen.py
+++ b/misc/codegen/generators/rustgen.py
@@ -49,7 +49,7 @@ def _get_field(cls: schema.Class, p: schema.Property) -> rust.Field:
 
 
 def _get_properties(
-    cls: schema.Class, lookup: dict[str, schema.Class],
+    cls: schema.Class, lookup: dict[str, schema.ClassBase],
 ) -> typing.Iterable[tuple[schema.Class, schema.Property]]:
     for b in cls.bases:
         yield from _get_properties(lookup[b], lookup)
@@ -58,12 +58,14 @@ def _get_properties(
 
 
 def _get_ancestors(
-    cls: schema.Class, lookup: dict[str, schema.Class]
+    cls: schema.Class, lookup: dict[str, schema.ClassBase]
 ) -> typing.Iterable[schema.Class]:
     for b in cls.bases:
         base = lookup[b]
-        yield base
-        yield from _get_ancestors(base, lookup)
+        if not base.imported:
+            base = typing.cast(schema.Class, base)
+            yield base
+            yield from _get_ancestors(base, lookup)
 
 
 class Processor:
@@ -71,7 +73,7 @@ class Processor:
         self._classmap = data.classes
 
     def _get_class(self, name: str) -> rust.Class:
-        cls = self._classmap[name]
+        cls = typing.cast(schema.Class, self._classmap[name])
         properties = [
             (c, p)
             for c, p in _get_properties(cls, self._classmap)
@@ -101,8 +103,10 @@ class Processor:
     def get_classes(self):
         ret = {"": []}
         for k, cls in self._classmap.items():
-            if not cls.synth:
+            if not cls.imported and not cls.synth:
                 ret.setdefault(cls.group, []).append(self._get_class(cls.name))
+            elif cls.imported:
+                ret[""].append(rust.Class(name=cls.name))
         return ret
 
 
diff --git a/misc/codegen/generators/rusttestgen.py b/misc/codegen/generators/rusttestgen.py
index d360db27a65..e7a23fedacd 100644
--- a/misc/codegen/generators/rusttestgen.py
+++ b/misc/codegen/generators/rusttestgen.py
@@ -56,6 +56,8 @@ def generate(opts, renderer):
                          registry=opts.ql_test_output / ".generated_tests.list",
                          force=opts.force) as renderer:
         for cls in schema.classes.values():
+            if cls.imported:
+                continue
             if (qlgen.should_skip_qltest(cls, schema.classes) or
                     "rust_skip_doc_test" in cls.pragmas):
                 continue
diff --git a/misc/codegen/lib/ql.py b/misc/codegen/lib/ql.py
index 1920a813e20..b9362a556ef 100644
--- a/misc/codegen/lib/ql.py
+++ b/misc/codegen/lib/ql.py
@@ -44,7 +44,9 @@ class Property:
     doc_plural: Optional[str] = None
     synth: bool = False
     type_is_hideable: bool = False
+    type_is_codegen_class: bool = False
     internal: bool = False
+    cfg: bool = False
 
     def __post_init__(self):
         if self.tableparams:
@@ -65,10 +67,6 @@ class Property:
             article = "An" if self.singular[0] in "AEIO" else "A"
             return f"get{article}{self.singular}"
 
-    @property
-    def type_is_class(self):
-        return bool(self.type) and self.type[0].isupper()
-
     @property
     def is_repeated(self):
         return bool(self.plural)
@@ -110,6 +108,7 @@ class Class:
     internal: bool = False
     doc: List[str] = field(default_factory=list)
     hideable: bool = False
+    cfg: bool = False
 
     def __post_init__(self):
         def get_bases(bases): return [Base(str(b), str(prev)) for b, prev in zip(bases, itertools.chain([""], bases))]
@@ -189,6 +188,7 @@ class DbClasses:
     template: ClassVar = 'ql_db'
 
     classes: List[Class] = field(default_factory=list)
+    imports: List[str] = field(default_factory=list)
 
 
 @dataclass
@@ -333,3 +333,18 @@ class Synth:
 
         cls: "Synth.FinalClass"
         import_prefix: str
+
+
+@dataclass
+class CfgClass:
+    name: str
+    bases: List[Base] = field(default_factory=list)
+    properties: List[Property] = field(default_factory=list)
+    doc: List[str] = field(default_factory=list)
+
+
+@dataclass
+class CfgClasses:
+    template: ClassVar = 'ql_cfg_nodes'
+    include_file_import: Optional[str] = None
+    classes: List[CfgClass] = field(default_factory=list)
diff --git a/misc/codegen/lib/schema.py b/misc/codegen/lib/schema.py
index c5c3dc810b6..5178e61d384 100644
--- a/misc/codegen/lib/schema.py
+++ b/misc/codegen/lib/schema.py
@@ -3,7 +3,7 @@ import abc
 import typing
 from collections.abc import Iterable
 from dataclasses import dataclass, field
-from typing import List, Set, Union, Dict, Optional
+from typing import List, Set, Union, Dict, Optional, FrozenSet
 from enum import Enum, auto
 import functools
 
@@ -87,13 +87,28 @@ class SynthInfo:
 
 
 @dataclass
-class Class:
+class ClassBase:
+    imported: typing.ClassVar[bool]
     name: str
+
+
+@dataclass
+class ImportedClass(ClassBase):
+    imported: typing.ClassVar[bool] = True
+
+    module: str
+
+
+@dataclass
+class Class(ClassBase):
+    imported: typing.ClassVar[bool] = False
+
     bases: List[str] = field(default_factory=list)
     derived: Set[str] = field(default_factory=set)
     properties: List[Property] = field(default_factory=list)
     pragmas: List[str] | Dict[str, object] = field(default_factory=dict)
     doc: List[str] = field(default_factory=list)
+    cfg: bool = False
 
     def __post_init__(self):
         if not isinstance(self.pragmas, dict):
@@ -132,7 +147,7 @@ class Class:
 
 @dataclass
 class Schema:
-    classes: Dict[str, Class] = field(default_factory=dict)
+    classes: Dict[str, ClassBase] = field(default_factory=dict)
     includes: List[str] = field(default_factory=list)
     null: Optional[str] = None
 
@@ -154,7 +169,7 @@ class Schema:
 
 predicate_marker = object()
 
-TypeRef = Union[type, str]
+TypeRef = type | str | ImportedClass
 
 
 def get_type_name(arg: TypeRef) -> str:
@@ -163,6 +178,8 @@ def get_type_name(arg: TypeRef) -> str:
             return arg.__name__
         case str():
             return arg
+        case ImportedClass():
+            return arg.name
         case _:
             raise Error(f"Not a schema type or string ({arg})")
 
@@ -171,9 +188,9 @@ def _make_property(arg: object) -> Property:
     match arg:
         case _ if arg is predicate_marker:
             return PredicateProperty()
-        case str() | type():
+        case (str() | type() | ImportedClass()) as arg:
             return SingleProperty(type=get_type_name(arg))
-        case Property():
+        case Property() as arg:
             return arg
         case _:
             raise Error(f"Illegal property specifier {arg}")
diff --git a/misc/codegen/lib/schemadefs.py b/misc/codegen/lib/schemadefs.py
index 997b85b4ca6..c81b2f2e215 100644
--- a/misc/codegen/lib/schemadefs.py
+++ b/misc/codegen/lib/schemadefs.py
@@ -8,8 +8,6 @@ from misc.codegen.lib import schema as _schema
 import inspect as _inspect
 from dataclasses import dataclass as _dataclass
 
-from misc.codegen.lib.schema import Property
-
 _set = set
 
 
@@ -69,14 +67,17 @@ def include(source: str):
     _inspect.currentframe().f_back.f_locals.setdefault("includes", []).append(source)
 
 
+imported = _schema.ImportedClass
+
+
 @_dataclass
 class _Namespace:
     """ simple namespacing mechanism """
-    name: str
+    _name: str
 
     def add(self, pragma: "_PragmaBase", key: str | None = None):
         self.__dict__[pragma.pragma] = pragma
-        pragma.pragma = key or f"{self.name}_{pragma.pragma}"
+        pragma.pragma = key or f"{self._name}_{pragma.pragma}"
 
 
 @_dataclass
@@ -87,7 +88,7 @@ class _SynthModifier(_schema.PropertyModifier, _Namespace):
         prop.synth = self.synth
 
     def negate(self) -> _schema.PropertyModifier:
-        return _SynthModifier(self.name, False)
+        return _SynthModifier(self._name, False)
 
 
 qltest = _Namespace("qltest")
@@ -239,6 +240,7 @@ qltest.add(_ParametrizedClassPragma("test_with", inherited=True, factory=_schema
 ql.add(_ParametrizedClassPragma("default_doc_name", factory=lambda doc: doc))
 ql.add(_ClassPragma("hideable", inherited=True))
 ql.add(_Pragma("internal"))
+ql.add(_ParametrizedPragma("name", factory=lambda name: name))
 
 cpp.add(_Pragma("skip"))
 
@@ -256,30 +258,24 @@ synth.add(_ParametrizedClassPragma("on_arguments", factory=lambda **kwargs:
                                    _schema.SynthInfo(on_arguments={k: _schema.get_type_name(t) for k, t in kwargs.items()})), key="synth")
 
 
+@_dataclass(frozen=True)
 class _PropertyModifierList(_schema.PropertyModifier):
-    def __init__(self):
-        self._mods = []
+    _mods: tuple[_schema.PropertyModifier, ...]
 
     def __or__(self, other: _schema.PropertyModifier):
-        self._mods.append(other)
-        return self
+        return _PropertyModifierList(self._mods + (other,))
 
-    def modify(self, prop: Property):
+    def modify(self, prop: _schema.Property):
         for m in self._mods:
             m.modify(prop)
 
 
-class _PropertyAnnotation:
-    def __or__(self, other: _schema.PropertyModifier):
-        return _PropertyModifierList() | other
-
-
-_ = _PropertyAnnotation()
+_ = _PropertyModifierList(())
 
 drop = object()
 
 
-def annotate(annotated_cls: type, add_bases: _Iterable[type] | None = None, replace_bases: _Dict[type, type] | None = None) -> _Callable[[type], _PropertyAnnotation]:
+def annotate(annotated_cls: type, add_bases: _Iterable[type] | None = None, replace_bases: _Dict[type, type] | None = None, cfg: bool = False) -> _Callable[[type], _PropertyModifierList]:
     """
     Add or modify schema annotations after a class has been defined previously.
 
@@ -287,7 +283,7 @@ def annotate(annotated_cls: type, add_bases: _Iterable[type] | None = None, repl
 
     `replace_bases` can be used to replace bases on the annotated class.
     """
-    def decorator(cls: type) -> _PropertyAnnotation:
+    def decorator(cls: type) -> _PropertyModifierList:
         if cls.__name__ != "_":
             raise _schema.Error("Annotation classes must be named _")
         if cls.__doc__ is not None:
@@ -298,6 +294,7 @@ def annotate(annotated_cls: type, add_bases: _Iterable[type] | None = None, repl
             annotated_cls.__bases__ = tuple(replace_bases.get(b, b) for b in annotated_cls.__bases__)
         if add_bases:
             annotated_cls.__bases__ += tuple(add_bases)
+        annotated_cls.__cfg__ = cfg
         for a in dir(cls):
             if a.startswith(_schema.inheritable_pragma_prefix):
                 setattr(annotated_cls, a, getattr(cls, a))
@@ -306,7 +303,7 @@ def annotate(annotated_cls: type, add_bases: _Iterable[type] | None = None, repl
                 del annotated_cls.__annotations__[p]
             elif p in annotated_cls.__annotations__:
                 annotated_cls.__annotations__[p] |= a
-            elif isinstance(a, (_PropertyAnnotation, _PropertyModifierList)):
+            elif isinstance(a, (_PropertyModifierList, _PropertyModifierList)):
                 raise _schema.Error(f"annotated property {p} not present in annotated class "
                                     f"{annotated_cls.__name__}")
             else:
diff --git a/misc/codegen/loaders/schemaloader.py b/misc/codegen/loaders/schemaloader.py
index 069e3b65474..3b5f20cbbed 100644
--- a/misc/codegen/loaders/schemaloader.py
+++ b/misc/codegen/loaders/schemaloader.py
@@ -53,6 +53,7 @@ def _get_class(cls: type) -> schema.Class:
                         bases=[b.__name__ for b in cls.__bases__ if b is not object],
                         derived=derived,
                         pragmas=pragmas,
+                        cfg=cls.__cfg__ if hasattr(cls, "__cfg__") else False,
                         # in the following we don't use `getattr` to avoid inheriting
                         properties=[
                             a | _PropertyNamer(n)
@@ -131,6 +132,7 @@ def _check_test_with(classes: typing.Dict[str, schema.Class]):
 def load(m: types.ModuleType) -> schema.Schema:
     includes = set()
     classes = {}
+    imported_classes = {}
     known = {"int", "string", "boolean"}
     known.update(n for n in m.__dict__ if not n.startswith("__"))
     import misc.codegen.lib.schemadefs as defs
@@ -145,6 +147,9 @@ def load(m: types.ModuleType) -> schema.Schema:
             continue
         if isinstance(data, types.ModuleType):
             continue
+        if isinstance(data, schema.ImportedClass):
+            imported_classes[name] = data
+            continue
         cls = _get_class(data)
         if classes and not cls.bases:
             raise schema.Error(
@@ -161,7 +166,7 @@ def load(m: types.ModuleType) -> schema.Schema:
     _fill_hideable_information(classes)
     _check_test_with(classes)
 
-    return schema.Schema(includes=includes, classes=_toposort_classes_by_group(classes), null=null)
+    return schema.Schema(includes=includes, classes=imported_classes | _toposort_classes_by_group(classes), null=null)
 
 
 def load_file(path: pathlib.Path) -> schema.Schema:
diff --git a/misc/codegen/templates/ql_cfg_nodes.mustache b/misc/codegen/templates/ql_cfg_nodes.mustache
new file mode 100644
index 00000000000..a2edf4410be
--- /dev/null
+++ b/misc/codegen/templates/ql_cfg_nodes.mustache
@@ -0,0 +1,199 @@
+// generated by {{generator}}, do not edit
+/**
+ * This module provides generated wrappers around the `CfgNode` type.
+ *
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.util.Location
+private import codeql.util.Unit
+private import {{include_file_import}}
+
+/** Provides the input to `MakeCfgNodes` */
+signature module InputSig<LocationSig Loc> {
+  class CfgNode {
+    AstNode getAstNode();
+
+    string toString();
+
+    Loc getLocation();
+  }
+
+  AstNode getDesugared(AstNode n);
+}
+
+/**
+ * Given a `CfgNode` implementation, provides the module `Nodes` that
+ * contains wrappers around `CfgNode` for relevant classes.
+ */
+module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
+  private import Input
+
+  final private class AstNodeFinal = AstNode;
+
+  final private class CfgNodeFinal = CfgNode;
+
+  /**
+   * INTERNAL: Do not expose.
+   */
+  abstract class ParentAstNode extends AstNodeFinal {
+    /**
+     * Holds if `child` is a (possibly nested) child of this AST node
+     * for which we would like to find a matching CFG child.
+     */
+    abstract predicate relevantChild(AstNode child);
+  }
+
+  /**
+   * INTERNAL: Do not expose.
+   */
+  abstract class ChildMapping extends Unit {
+    /**
+     * Holds if `child` is a (possibly nested) child of AST node `parent`
+     * for which we would like to find a matching CFG child.
+     */
+    final predicate relevantChild(AstNode parent, AstNode child) {
+      parent.(ParentAstNode).relevantChild(child)
+    }
+
+    /**
+     * Holds if there is a control flow path from `cfn` to `cfnChild`, where `cfn`
+     * is a control flow node for this AST node, and `cfnChild` is a control flow
+     * node for `child`.
+     *
+     * This predicate should be implemented at the place where `MakeCfgNodes` is
+     * invoked. Ideally, `MakeCfgNodes` should be a higher-order parameterized
+     * module, but since that is currently not supported, we achieve the "callback"
+     * effect using this `abstract` class instead.
+     */
+    cached
+    abstract predicate hasCfgChild(AstNode parent, AstNode child, CfgNode cfn, CfgNode cfnChild);
+  }
+
+  /** Provides sub classes of `CfgNode`. */
+  module Nodes {
+    {{#classes}}
+    private final class Parent{{name}} extends ParentAstNode, {{name}} {
+      override predicate relevantChild(AstNode child) {
+        none()
+        {{#properties}}
+        {{#cfg}}
+        or
+        child = this.{{getter}}({{#is_indexed}}_{{/is_indexed}})
+        {{/cfg}}
+        {{/properties}}
+      }
+    }
+
+    /**
+    {{#doc}}
+    * {{.}}
+    {{/doc}}
+    */
+    final class {{name}}CfgNode extends CfgNodeFinal{{#bases}}, {{.}}CfgNode{{/bases}} {
+      private {{name}} node;
+
+      {{name}}CfgNode() {
+        node = this.getAstNode()
+      }
+
+      /** Gets the underlying `{{name}}`. */
+      {{name}} get{{name}}() { result = node }
+    
+      {{#properties}}
+      /**
+      * {{>ql_property_doc}}     *
+      {{#description}}
+      * {{.}}
+      {{/description}}
+      {{#internal}}
+      * INTERNAL: Do not use.
+      {{/internal}}
+      */
+      {{type}}{{#cfg}}CfgNode{{/cfg}} {{getter}}({{#is_indexed}}int index{{/is_indexed}}) {
+        {{#cfg}}
+        any(ChildMapping mapping).hasCfgChild(node, node.{{getter}}({{#is_indexed}}index{{/is_indexed}}), this, result)
+        {{/cfg}}
+        {{^cfg}}
+        {{^is_predicate}}result = {{/is_predicate}}node.{{getter}}({{#is_indexed}}index{{/is_indexed}})
+        {{/cfg}}
+      }
+
+      {{#is_optional}}
+      /**
+      * Holds if `{{getter}}({{#is_repeated}}index{{/is_repeated}})` exists.
+      {{#internal}}
+      * INTERNAL: Do not use.
+      {{/internal}}
+      */
+      predicate has{{singular}}({{#is_repeated}}int index{{/is_repeated}}) {
+        exists(this.{{getter}}({{#is_repeated}}index{{/is_repeated}}))
+      }
+      {{/is_optional}}
+      {{#is_indexed}}
+
+      /**
+      * Gets any of the {{doc_plural}}.
+      {{#internal}}
+      * INTERNAL: Do not use.
+      {{/internal}}
+      */
+      {{type}}{{#cfg}}CfgNode{{/cfg}} {{indefinite_getter}}() {
+        result = this.{{getter}}(_)
+      }
+      {{^is_optional}}
+
+      /**
+      * Gets the number of {{doc_plural}}.
+      {{#internal}}
+      * INTERNAL: Do not use.
+      {{/internal}}
+      */
+      int getNumberOf{{plural}}() {
+        result = count(int i | exists(this.{{getter}}(i)))
+      }
+      {{/is_optional}}
+      {{/is_indexed}}
+      {{#is_unordered}}
+      /**
+      * Gets the number of {{doc_plural}}.
+      {{#internal}}
+      * INTERNAL: Do not use.
+      {{/internal}}
+      */
+      int getNumberOf{{plural}}() {
+        result = count(this.{{getter}}())
+      }
+      {{/is_unordered}}
+      {{/properties}}
+    }
+    {{/classes}}
+  }
+
+  module Consistency {
+    private predicate hasCfgNode(AstNode astNode) {
+      astNode = any(CfgNode cfgNode).getAstNode()
+    }
+
+    query predicate missingCfgChild(CfgNode parent, string pred, int i, AstNode child) {
+      none()
+      {{#classes}}
+      {{#properties}}
+      {{#cfg}}
+      or
+      pred = "{{getter}}" and
+      parent = any(Nodes::{{name}}CfgNode cfgNode, {{name}} astNode |
+        astNode = cfgNode.get{{name}}() and
+        child = getDesugared(astNode.{{getter}}({{#is_indexed}}i{{/is_indexed}}))
+        {{^is_indexed}}and i = -1{{/is_indexed}} and
+        hasCfgNode(child) and
+        not child = cfgNode.{{getter}}({{#is_indexed}}i{{/is_indexed}}).getAstNode()
+        |
+        cfgNode
+      )
+      {{/cfg}}
+      {{/properties}}
+      {{/classes}}
+    }
+  }
+}
\ No newline at end of file
diff --git a/misc/codegen/templates/ql_class.mustache b/misc/codegen/templates/ql_class.mustache
index da6524d6d37..d39238ff9ba 100644
--- a/misc/codegen/templates/ql_class.mustache
+++ b/misc/codegen/templates/ql_class.mustache
@@ -113,7 +113,7 @@ module Generated {
      */
     {{type}} {{getter}}({{#is_indexed}}int index{{/is_indexed}}) {
       {{^synth}}
-      {{^is_predicate}}result = {{/is_predicate}}{{#type_is_class}}Synth::convert{{type}}FromRaw({{/type_is_class}}Synth::convert{{name}}ToRaw(this){{^root}}.(Raw::{{name}}){{/root}}.{{getter}}({{#is_indexed}}index{{/is_indexed}}){{#type_is_class}}){{/type_is_class}}
+      {{^is_predicate}}result = {{/is_predicate}}{{#type_is_codegen_class}}Synth::convert{{type}}FromRaw({{/type_is_codegen_class}}Synth::convert{{name}}ToRaw(this){{^root}}.(Raw::{{name}}){{/root}}.{{getter}}({{#is_indexed}}index{{/is_indexed}}){{#type_is_codegen_class}}){{/type_is_codegen_class}}
       {{/synth}}
       {{#synth}}
       none()
diff --git a/misc/codegen/templates/ql_db.mustache b/misc/codegen/templates/ql_db.mustache
index 8326bb3adb7..e63e0aae903 100644
--- a/misc/codegen/templates/ql_db.mustache
+++ b/misc/codegen/templates/ql_db.mustache
@@ -3,6 +3,10 @@
  * This module holds thin fully generated class definitions around DB entities.
  */
 module Raw {
+  {{#imports}}
+  private import {{.}}
+  {{/imports}}
+
   {{#classes}}
   /**
    * INTERNAL: Do not use.
diff --git a/misc/codegen/test/test_ql.py b/misc/codegen/test/test_ql.py
index eef840ddad6..e326e65a9e4 100644
--- a/misc/codegen/test/test_ql.py
+++ b/misc/codegen/test/test_ql.py
@@ -12,21 +12,6 @@ def test_property_has_first_table_param_marked():
     assert [p.param for p in prop.tableparams] == tableparams
 
 
-@pytest.mark.parametrize("type,expected", [
-    ("Foo", True),
-    ("Bar", True),
-    ("foo", False),
-    ("bar", False),
-    (None, False),
-])
-def test_property_is_a_class(type, expected):
-    tableparams = ["a", "result", "b"]
-    expected_tableparams = ["a", "result" if expected else "result", "b"]
-    prop = ql.Property("Prop", type, tableparams=tableparams)
-    assert prop.type_is_class is expected
-    assert [p.param for p in prop.tableparams] == expected_tableparams
-
-
 indefinite_getters = [
     ("Argument", "getAnArgument"),
     ("Element", "getAnElement"),
diff --git a/misc/codegen/test/test_qlgen.py b/misc/codegen/test/test_qlgen.py
index 684d3d6a1a1..431f25d5aae 100644
--- a/misc/codegen/test/test_qlgen.py
+++ b/misc/codegen/test/test_qlgen.py
@@ -448,7 +448,8 @@ def test_single_class_property(generate_classes, is_child, prev_child):
                 ql.Property(singular="Foo", type="Bar", tablename="my_objects",
                             tableparams=[
                                 "this", "result"],
-                            prev_child=prev_child, doc="foo of this my object"),
+                            prev_child=prev_child, doc="foo of this my object",
+                            type_is_codegen_class=True),
             ],
         )),
         "Bar.qll": (a_ql_class_public(name="Bar"), a_ql_stub(name="Bar"), a_ql_class(name="Bar", final=True, imports=[stub_import_prefix + "Bar"])),
@@ -1006,6 +1007,7 @@ def test_hideable_property(generate_classes):
                                  final=True, properties=[
                                  ql.Property(singular="X", type="MyObject", tablename="others",
                                              type_is_hideable=True,
+                                             type_is_codegen_class=True,
                                              tableparams=["this", "result"], doc="x of this other"),
                                  ])),
     }
diff --git a/misc/scripts/create-change-note.py b/misc/scripts/create-change-note.py
new file mode 100644
index 00000000000..548fa4e87fb
--- /dev/null
+++ b/misc/scripts/create-change-note.py
@@ -0,0 +1,55 @@
+#!/usr/bin/env python3
+
+# Creates a change note and opens it in VSCode for editing.
+
+# Expects to receive the following arguments:
+# - What language the change note is for
+# - Whether it's a query or library change (the string `src` or `lib`)
+# - The name of the change note (in kebab-case)
+# - The category of the change.
+
+# The change note will be created in the `{language}/ql/{subdir}/change-notes` directory, where `subdir` is either `src` or `lib`.
+
+# The format of the change note filename is `{current_date}-{change_note_name}.md` with the date in
+# the format `YYYY-MM-DD`.
+
+import sys
+import os
+
+# Read the given arguments
+language = sys.argv[1]
+subdir = sys.argv[2]
+change_note_name = sys.argv[3]
+change_category = sys.argv[4]
+
+# Find the root of the repository. The current script should be located in `misc/scripts`.
+root = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+# Go to the repo root
+os.chdir(root)
+
+output_dir = f"{language}/ql/{subdir}/change-notes"
+
+# Abort if the output directory doesn't exist
+if not os.path.exists(output_dir):
+    print(f"Output directory {output_dir} does not exist")
+    sys.exit(1)
+
+# Get the current date
+import datetime
+current_date = datetime.datetime.now().strftime("%Y-%m-%d")
+
+# Create the change note file
+change_note_file = f"{output_dir}/{current_date}-{change_note_name}.md"
+
+change_note = f"""
+---
+category: {change_category}
+---
+* """.lstrip()
+
+with open(change_note_file, "w") as f:
+    f.write(change_note)
+
+# Open the change note file in VSCode, reusing the existing window if possible
+os.system(f"code -r {change_note_file}")
diff --git a/python/extractor/extending-the-parser.md b/python/extractor/extending-the-parser.md
new file mode 100644
index 00000000000..55bdd6c2a0d
--- /dev/null
+++ b/python/extractor/extending-the-parser.md
@@ -0,0 +1,94 @@
+# How to update the Python parser
+
+## Step 1: Add an extractor test
+
+Extractor parser tests live in the `tests/parser` directory. There are two different kinds of tests
+
+- Tests that compare the behavior of the old (Python-based) and new (`tree-sitter`-based) parsers, and verify that they yield the same output on the given source files, and
+- Tests that compare the output of the parser (old or new) against a fixed `.expected` file.
+
+What kind of test is run is determined based on the file name.
+If it ends in either `_new.py` or `_old.py`, then the test is run against an `.expected` file. If not, it is used to compare old against new.
+
+In most cases when adding new features, you'll only be interested in modifying the new parser (the old one is mostly there for legacy reasons).
+Thus, you will almost certainly want to create a test that ends in `_new.py`.
+
+It's a good habit to start by adding the parser test, as this makes it more easy to test when various bits of the parser have been added/modified successfully.
+
+The rest of this document will only concern itself with the process of extending the _new_ parser.
+
+To actually _run_ the tests, the easiest way is to use `pytest`.
+In the main `extractor` directory (i.e. where this file is located) run
+
+```sh
+pytest tests/test_parser.py
+```
+
+and wait for the tests to complete. It is normal and expected that the test seemingly freezes on the first run.
+This is simply because the `tsg-python` Rust binary is being built in the background.
+
+Once you have added a new test (or modified an old one) and start making modifications to the parser itself, it quickly becomes tedious to run _all_ the parser tests.
+To run just a single test using `pytest`, use the `::` syntax to specify specific tests.
+For instance, if you want to just run the tests associated with the file `types_new.py`, you would write
+
+```sh
+pytest tests/test_parser.py::ParserTest::test_types_new
+```
+
+## Step 2: Extend the `tree-sitter-python` grammar
+
+The new parser is based on `tree-sitter`, so the first task is to extend the existing `tree-sitter-python` grammar.
+This grammar can be found in the `grammar.js` file in the `tsg-python/tsp` subdirectory of the extractor directory.
+
+Note that whenever changes are made to `grammar.js`, you must regenerate the parser files by running
+
+```sh
+tree-sitter generate
+```
+
+inside the `tsp` directory.
+You'll need to install the `tree-sitter` CLI in order to run this command.
+One way to install it is to use `cargo`:
+
+```sh
+cargo install tree-sitter-cli
+```
+
+(This presupposes you have `cargo` available, but you'll need this anyway when compiling `tsg-python`.)
+
+Once the parser files have been regenerated, they'll get picked up automatically when `tsg-python` is rebuilt.
+
+> Pro-tip: When you're done with your parser changes, and go to commit these to a branch, put the autogenerated files in their own commit.
+> This makes it easier to review the changes, and if you need to go back and regenerate the files again, it's easy to modify just that commit.
+
+Once you have extended `grammar.js` and regenerated the parser files, you should be able to check that the grammar changes are sufficient by rerunning the parser test using `pytest`. If it fails while producing an AST that doesn't make sense, then you're probably on the right track. If it fails _without_ producing an AST, then something went wrong with the actual `tree-sitter` parse. To check if this is the case, you can run
+
+```sh
+tree-sitter parse path/to/test.py
+```
+
+and see what kind of errors are emitted (possibly as `ERROR` or `MISSING` nodes in the AST that is output).
+
+## Step 3: Extend `python.tsg`
+
+Once the grammar has been extended, we need to also tell `tsg-python` how to turn the `tree-sitter-python` AST into something that better matches the AST structure that we use in the Python extractor.
+
+For an introduction to the language of `tree-sitter-graph` (and in particular how we use it in the Python extractor), see the `README.md` file in the `tsg-python` directory.
+
+## Step 4: Extend the set of known AST nodes
+
+If you added new node types, or added fields to known node types, then you'll need to update a few files in the Python extractor before it is able to reconstruct the output from `tsg-python`.
+
+New AST nodes should be added in two places: `master.py` and `semmle/python/ast.py`. The former of these is used to automatically generate the Python dbscheme and `AstGenerated.qll`. The latter is what the parser actually uses as its internal representation of the AST.
+
+## Step 5: Rebuild the autogenerated AST and database scheme
+
+If you made changes to `master.py`, you'll need to regenerate a couple of files. This can be done from within the `extractor` directory using the `make dbscheme` and `make ast` commands. Note that for the latter, you need a copy of the CodeQL CLI present, as it is used to autoformat the `AstGenerated.qll` file.
+
+## Step 6: Add dbscheme upgrade and downgrade scripts
+
+If you ended up making changes to the database scheme inw step 5, then you'll need to add an appropriate pair of up- and downgrade scripts to handle any changes between the different versions of the dbscheme.
+
+This can be a bit fiddly, but luckily there are [tools](https://github.com/github/codeql/blob/main/misc/scripts/prepare-db-upgrade.sh) that can help set up some of the necessary files for you.
+
+See also the [guide](https://github.com/github/codeql/blob/main/docs/prepare-db-upgrade.md) for preparing database upgrades.
diff --git a/python/extractor/semmle/python/passes/pruner.py b/python/extractor/semmle/python/passes/pruner.py
index d6363e529f1..fe3b03d453c 100644
--- a/python/extractor/semmle/python/passes/pruner.py
+++ b/python/extractor/semmle/python/passes/pruner.py
@@ -196,6 +196,25 @@ class SkippedVisitor(ASTVisitor):
         if isinstance(node.value, ast.Name):
             self.nodes.add(node.value)
 
+class NotBooleanTestVisitor(ASTVisitor):
+    """Visitor that checks if a test is not a boolean test."""
+
+    def __init__(self):
+        self.nodes = set()
+
+    def visit_MatchLiteralPattern(self, node):
+        # MatchLiteralPatterns _look_ like boolean tests, but are not.
+        # Thus, without this check, we would interpret
+        #
+        # match x:
+        #    case False:
+        #        pass
+        #
+        # (and similarly for True) as if it was a boolean test. This would cause the true edge
+        # (leading to pass) to be pruned later on.
+        if isinstance(node.literal, ast.Name) and node.literal.id in ('True', 'False'):
+            self.nodes.add(node.literal)
+
 class NonlocalVisitor(ASTVisitor):
     def __init__(self):
         self.names = set()
@@ -306,6 +325,8 @@ def effective_constants_definitions(bool_const_defns, graph, branching_edges):
 def do_pruning(tree, graph):
     v = BoolConstVisitor()
     v.visit(tree)
+    not_boolean_test = NotBooleanTestVisitor()
+    not_boolean_test.visit(tree)
     nonlocals = NonlocalVisitor()
     nonlocals.visit(tree)
     global_vars = GlobalVisitor()
@@ -353,6 +374,8 @@ def do_pruning(tree, graph):
             b = const_value(pred.node)
             if b is None:
                 continue
+            if pred.node in not_boolean_test.nodes:
+                continue
             if b.contradicts(val):
                 to_be_removed.add((pred, succ))
         if not to_be_removed:
diff --git a/python/extractor/semmle/util.py b/python/extractor/semmle/util.py
index 1763d24e99e..e0720a86312 100644
--- a/python/extractor/semmle/util.py
+++ b/python/extractor/semmle/util.py
@@ -10,7 +10,7 @@ from io import BytesIO
 
 #Semantic version of extractor.
 #Update this if any changes are made
-VERSION = "7.1.1"
+VERSION = "7.1.2"
 
 PY_EXTENSIONS = ".py", ".pyw"
 
diff --git a/python/ql/lib/change-notes/2024-11-26-fix-match-cfg-pruning.md b/python/ql/lib/change-notes/2024-11-26-fix-match-cfg-pruning.md
new file mode 100644
index 00000000000..3ee1094c13b
--- /dev/null
+++ b/python/ql/lib/change-notes/2024-11-26-fix-match-cfg-pruning.md
@@ -0,0 +1,5 @@
+---
+category: fix
+---
+
+- Fixed a problem with the control-flow graph construction, where writing `case True:` or `case False:` would cause parts of the graph to be pruned by mistake.
diff --git a/python/ql/lib/change-notes/2024-12-03-remove-dataflow-config-class-api.md b/python/ql/lib/change-notes/2024-12-03-remove-dataflow-config-class-api.md
new file mode 100644
index 00000000000..d09ec528c99
--- /dev/null
+++ b/python/ql/lib/change-notes/2024-12-03-remove-dataflow-config-class-api.md
@@ -0,0 +1,4 @@
+---
+category: breaking
+---
+* Deleted the old deprecated data flow API that was based on extending a configuration class. See https://github.blog/changelog/2023-08-14-new-dataflow-api-for-writing-custom-codeql-queries for instructions on migrating your queries to use the new API.
diff --git a/python/ql/lib/semmle/python/dataflow/new/DataFlow.qll b/python/ql/lib/semmle/python/dataflow/new/DataFlow.qll
index 17cc0a0ee85..670f42a8dc5 100644
--- a/python/ql/lib/semmle/python/dataflow/new/DataFlow.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/DataFlow.qll
@@ -25,5 +25,5 @@ module DataFlow {
   private import internal.DataFlowImplSpecific
   private import codeql.dataflow.DataFlow
   import DataFlowMake<Location, PythonDataFlow>
-  import internal.DataFlowImpl1
+  import Public
 }
diff --git a/python/ql/lib/semmle/python/dataflow/new/DataFlow2.qll b/python/ql/lib/semmle/python/dataflow/new/DataFlow2.qll
deleted file mode 100644
index 753fe553093..00000000000
--- a/python/ql/lib/semmle/python/dataflow/new/DataFlow2.qll
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Provides a library for local (intra-procedural) and global (inter-procedural)
- * data flow analysis: deciding whether data can flow from a _source_ to a
- * _sink_.
- *
- * Unless configured otherwise, _flow_ means that the exact value of
- * the source may reach the sink. We do not track flow across pointer
- * dereferences or array indexing. To track these types of flow, where the
- * exact value may not be preserved, import
- * `semmle.python.dataflow.new.TaintTracking`.
- *
- * To use global (interprocedural) data flow, extend the class
- * `DataFlow::Configuration` as documented on that class. To use local
- * (intraprocedural) data flow, call `DataFlow::localFlow` or
- * `DataFlow::localFlowStep` with arguments of type `DataFlow::Node`.
- */
-
-private import python
-
-/**
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) data flow analyses.
- */
-module DataFlow2 {
-  import semmle.python.dataflow.new.internal.DataFlowImpl2
-}
diff --git a/python/ql/lib/semmle/python/dataflow/new/DataFlow3.qll b/python/ql/lib/semmle/python/dataflow/new/DataFlow3.qll
deleted file mode 100644
index c6b7304319b..00000000000
--- a/python/ql/lib/semmle/python/dataflow/new/DataFlow3.qll
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Provides a library for local (intra-procedural) and global (inter-procedural)
- * data flow analysis: deciding whether data can flow from a _source_ to a
- * _sink_.
- *
- * Unless configured otherwise, _flow_ means that the exact value of
- * the source may reach the sink. We do not track flow across pointer
- * dereferences or array indexing. To track these types of flow, where the
- * exact value may not be preserved, import
- * `semmle.python.dataflow.new.TaintTracking`.
- *
- * To use global (interprocedural) data flow, extend the class
- * `DataFlow::Configuration` as documented on that class. To use local
- * (intraprocedural) data flow, call `DataFlow::localFlow` or
- * `DataFlow::localFlowStep` with arguments of type `DataFlow::Node`.
- */
-
-private import python
-
-/**
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) data flow analyses.
- */
-module DataFlow3 {
-  import semmle.python.dataflow.new.internal.DataFlowImpl3
-}
diff --git a/python/ql/lib/semmle/python/dataflow/new/DataFlow4.qll b/python/ql/lib/semmle/python/dataflow/new/DataFlow4.qll
deleted file mode 100644
index 44d926a274d..00000000000
--- a/python/ql/lib/semmle/python/dataflow/new/DataFlow4.qll
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Provides a library for local (intra-procedural) and global (inter-procedural)
- * data flow analysis: deciding whether data can flow from a _source_ to a
- * _sink_.
- *
- * Unless configured otherwise, _flow_ means that the exact value of
- * the source may reach the sink. We do not track flow across pointer
- * dereferences or array indexing. To track these types of flow, where the
- * exact value may not be preserved, import
- * `semmle.python.dataflow.new.TaintTracking`.
- *
- * To use global (interprocedural) data flow, extend the class
- * `DataFlow::Configuration` as documented on that class. To use local
- * (intraprocedural) data flow, call `DataFlow::localFlow` or
- * `DataFlow::localFlowStep` with arguments of type `DataFlow::Node`.
- */
-
-private import python
-
-/**
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) data flow analyses.
- */
-module DataFlow4 {
-  import semmle.python.dataflow.new.internal.DataFlowImpl4
-}
diff --git a/python/ql/lib/semmle/python/dataflow/new/TaintTracking.qll b/python/ql/lib/semmle/python/dataflow/new/TaintTracking.qll
index e085ba45dd0..01174d5e7a0 100644
--- a/python/ql/lib/semmle/python/dataflow/new/TaintTracking.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/TaintTracking.qll
@@ -15,10 +15,9 @@ private import python
  * global (inter-procedural) taint-tracking analyses.
  */
 module TaintTracking {
-  import semmle.python.dataflow.new.internal.tainttracking1.TaintTrackingParameter::Public
+  import semmle.python.dataflow.new.internal.TaintTrackingPublic
   private import semmle.python.dataflow.new.internal.DataFlowImplSpecific
   private import semmle.python.dataflow.new.internal.TaintTrackingImplSpecific
   private import codeql.dataflow.TaintTracking
   import TaintFlowMake<Location, PythonDataFlow, PythonTaintTracking>
-  import internal.tainttracking1.TaintTrackingImpl
 }
diff --git a/python/ql/lib/semmle/python/dataflow/new/TaintTracking2.qll b/python/ql/lib/semmle/python/dataflow/new/TaintTracking2.qll
deleted file mode 100644
index 5d78a531e2e..00000000000
--- a/python/ql/lib/semmle/python/dataflow/new/TaintTracking2.qll
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) taint-tracking analyses.
- *
- * To use global (interprocedural) taint tracking, extend the class
- * `TaintTracking::Configuration` as documented on that class. To use local
- * (intraprocedural) taint tracking, call `TaintTracking::localTaint` or
- * `TaintTracking::localTaintStep` with arguments of type `DataFlow::Node`.
- */
-
-private import python
-
-/**
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) taint-tracking analyses.
- */
-module TaintTracking2 {
-  import semmle.python.dataflow.new.internal.tainttracking2.TaintTrackingImpl
-}
diff --git a/python/ql/lib/semmle/python/dataflow/new/TaintTracking3.qll b/python/ql/lib/semmle/python/dataflow/new/TaintTracking3.qll
deleted file mode 100644
index d3173ec8f9f..00000000000
--- a/python/ql/lib/semmle/python/dataflow/new/TaintTracking3.qll
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) taint-tracking analyses.
- *
- * To use global (interprocedural) taint tracking, extend the class
- * `TaintTracking::Configuration` as documented on that class. To use local
- * (intraprocedural) taint tracking, call `TaintTracking::localTaint` or
- * `TaintTracking::localTaintStep` with arguments of type `DataFlow::Node`.
- */
-
-private import python
-
-/**
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) taint-tracking analyses.
- */
-module TaintTracking3 {
-  import semmle.python.dataflow.new.internal.tainttracking3.TaintTrackingImpl
-}
diff --git a/python/ql/lib/semmle/python/dataflow/new/TaintTracking4.qll b/python/ql/lib/semmle/python/dataflow/new/TaintTracking4.qll
deleted file mode 100644
index f452cf4ed00..00000000000
--- a/python/ql/lib/semmle/python/dataflow/new/TaintTracking4.qll
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) taint-tracking analyses.
- *
- * To use global (interprocedural) taint tracking, extend the class
- * `TaintTracking::Configuration` as documented on that class. To use local
- * (intraprocedural) taint tracking, call `TaintTracking::localTaint` or
- * `TaintTracking::localTaintStep` with arguments of type `DataFlow::Node`.
- */
-
-private import python
-
-/**
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) taint-tracking analyses.
- */
-module TaintTracking4 {
-  import semmle.python.dataflow.new.internal.tainttracking4.TaintTrackingImpl
-}
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl1.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl1.qll
deleted file mode 100644
index 17def0c431d..00000000000
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl1.qll
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides a `Configuration` class backwards-compatible interface to the data
- * flow library.
- */
-
-private import DataFlowImplCommon
-private import DataFlowImplSpecific::Private
-import DataFlowImplSpecific::Public
-private import DataFlowImpl
-import DataFlowImplCommonPublic
-deprecated import FlowStateString
-private import codeql.util.Unit
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural data flow analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the global data flow library must define its own unique extension
- * of this abstract class. To create a configuration, extend this class with
- * a subclass whose characteristic predicate is a unique singleton string.
- * For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends DataFlow::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isBarrier`.
- *   // Optionally override `isAdditionalFlowStep`.
- * }
- * ```
- * Conceptually, this defines a graph where the nodes are `DataFlow::Node`s and
- * the edges are those data-flow steps that preserve the value of the node
- * along with any additional edges defined by `isAdditionalFlowStep`.
- * Specifying nodes in `isBarrier` will remove those nodes from the graph, and
- * specifying nodes in `isBarrierIn` and/or `isBarrierOut` will remove in-going
- * and/or out-going edges from those nodes, respectively.
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but two classes extending
- * `DataFlow::Configuration` should never depend on each other. One of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`.
- */
-abstract deprecated class Configuration extends string {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant data flow source.
-   */
-  predicate isSource(Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant data flow source with the given initial
-   * `state`.
-   */
-  predicate isSource(Node source, FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink.
-   */
-  predicate isSink(Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink accepting `state`.
-   */
-  predicate isSink(Node sink, FlowState state) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited. This completely removes
-   * `node` from the data flow graph.
-   */
-  predicate isBarrier(Node node) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited when the flow state is
-   * `state`.
-   */
-  predicate isBarrier(Node node, FlowState state) { none() }
-
-  /** Holds if data flow into `node` is prohibited. */
-  predicate isBarrierIn(Node node) { none() }
-
-  /** Holds if data flow out of `node` is prohibited. */
-  predicate isBarrierOut(Node node) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   */
-  predicate isAdditionalFlowStep(Node node1, Node node2) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
-    none()
-  }
-
-  /**
-   * Holds if an arbitrary number of implicit read steps of content `c` may be
-   * taken at `node`.
-   */
-  predicate allowImplicitRead(Node node, ContentSet c) { none() }
-
-  /**
-   * Gets the virtual dispatch branching limit when calculating field flow.
-   * This can be overridden to a smaller value to improve performance (a
-   * value of 0 disables field flow), or a larger value to get more results.
-   */
-  int fieldFlowBranchLimit() { result = 2 }
-
-  /**
-   * Gets a data flow configuration feature to add restrictions to the set of
-   * valid flow paths.
-   *
-   * - `FeatureHasSourceCallContext`:
-   *    Assume that sources have some existing call context to disallow
-   *    conflicting return-flow directly following the source.
-   * - `FeatureHasSinkCallContext`:
-   *    Assume that sinks have some existing call context to disallow
-   *    conflicting argument-to-parameter flow directly preceding the sink.
-   * - `FeatureEqualSourceSinkCallContext`:
-   *    Implies both of the above and additionally ensures that the entire flow
-   *    path preserves the call context.
-   *
-   * These features are generally not relevant for typical end-to-end data flow
-   * queries, but should only be used for constructing paths that need to
-   * somehow be pluggable in another path context.
-   */
-  FlowFeature getAFeature() { none() }
-
-  /** Holds if sources should be grouped in the result of `hasFlowPath`. */
-  predicate sourceGrouping(Node source, string sourceGroup) { none() }
-
-  /** Holds if sinks should be grouped in the result of `hasFlowPath`. */
-  predicate sinkGrouping(Node sink, string sinkGroup) { none() }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   */
-  predicate hasFlow(Node source, Node sink) { hasFlow(source, sink, this) }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   *
-   * The corresponding paths are generated from the end-points and the graph
-   * included in the module `PathGraph`.
-   */
-  predicate hasFlowPath(PathNode source, PathNode sink) { hasFlowPath(source, sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowTo(Node sink) { hasFlowTo(sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowToExpr(DataFlowExpr sink) { this.hasFlowTo(exprNode(sink)) }
-
-  /**
-   * Holds if hidden nodes should be included in the data flow graph.
-   *
-   * This feature should only be used for debugging or when the data flow graph
-   * is not visualized (for example in a `path-problem` query).
-   */
-  predicate includeHiddenNodes() { none() }
-}
-
-/**
- * This class exists to prevent mutual recursion between the user-overridden
- * member predicates of `Configuration` and the rest of the data-flow library.
- * Good performance cannot be guaranteed in the presence of such recursion, so
- * it should be replaced by using more than one copy of the data flow library.
- */
-abstract deprecated private class ConfigurationRecursionPrevention extends Configuration {
-  bindingset[this]
-  ConfigurationRecursionPrevention() { any() }
-
-  override predicate hasFlow(Node source, Node sink) {
-    strictcount(Node n | this.isSource(n)) < 0
-    or
-    strictcount(Node n | this.isSource(n, _)) < 0
-    or
-    strictcount(Node n | this.isSink(n)) < 0
-    or
-    strictcount(Node n | this.isSink(n, _)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, _, n2, _)) < 0
-    or
-    super.hasFlow(source, sink)
-  }
-}
-
-deprecated private FlowState relevantState(Configuration config) {
-  config.isSource(_, result) or
-  config.isSink(_, result) or
-  config.isBarrier(_, result) or
-  config.isAdditionalFlowStep(_, result, _, _) or
-  config.isAdditionalFlowStep(_, _, _, result)
-}
-
-private newtype TConfigState =
-  deprecated TMkConfigState(Configuration config, FlowState state) {
-    state = relevantState(config) or state instanceof FlowStateEmpty
-  }
-
-deprecated private Configuration getConfig(TConfigState state) { state = TMkConfigState(result, _) }
-
-deprecated private FlowState getState(TConfigState state) { state = TMkConfigState(_, result) }
-
-deprecated private predicate singleConfiguration() { 1 = strictcount(Configuration c) }
-
-deprecated private module Config implements FullStateConfigSig {
-  class FlowState = TConfigState;
-
-  predicate isSource(Node source, FlowState state) {
-    getConfig(state).isSource(source, getState(state))
-    or
-    getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isSink(Node sink) { none() }
-
-  predicate isSink(Node sink, FlowState state) {
-    getConfig(state).isSink(sink, getState(state))
-    or
-    getConfig(state).isSink(sink) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isBarrier(Node node) { none() }
-
-  predicate isBarrier(Node node, FlowState state) {
-    getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node)
-  }
-
-  predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
-
-  predicate isBarrierOut(Node node) { any(Configuration config).isBarrierOut(node) }
-
-  predicate isBarrierIn(Node node, FlowState state) { none() }
-
-  predicate isBarrierOut(Node node, FlowState state) { none() }
-
-  predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
-    singleConfiguration() and
-    any(Configuration config).isAdditionalFlowStep(node1, node2) and
-    model = ""
-  }
-
-  predicate isAdditionalFlowStep(
-    Node node1, FlowState state1, Node node2, FlowState state2, string model
-  ) {
-    getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1) and
-    model = ""
-    or
-    not singleConfiguration() and
-    getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1 and
-    model = ""
-  }
-
-  predicate allowImplicitRead(Node node, ContentSet c) {
-    any(Configuration config).allowImplicitRead(node, c)
-  }
-
-  predicate neverSkip(Node node) { none() }
-
-  int fieldFlowBranchLimit() { result = min(any(Configuration config).fieldFlowBranchLimit()) }
-
-  int accessPathLimit() { result = 5 }
-
-  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
-
-  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
-
-  predicate observeDiffInformedIncrementalMode() { none() }
-}
-
-deprecated private import Impl<Config> as I
-
-/**
- * A `Node` augmented with a call context (except for sinks), an access path, and a configuration.
- * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
- */
-deprecated class PathNode instanceof I::PathNode {
-  /** Gets a textual representation of this element. */
-  final string toString() { result = super.toString() }
-
-  /**
-   * Gets a textual representation of this element, including a textual
-   * representation of the call context.
-   */
-  final string toStringWithContext() { result = super.toStringWithContext() }
-
-  /**
-   * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
-   * For more information, see
-   * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
-   */
-  final predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    super.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-
-  /** Gets the underlying `Node`. */
-  final Node getNode() { result = super.getNode() }
-
-  /** Gets the `FlowState` of this node. */
-  deprecated final FlowState getState() { result = getState(super.getState()) }
-
-  /** Gets the associated configuration. */
-  deprecated final Configuration getConfiguration() { result = getConfig(super.getState()) }
-
-  /** Gets a successor of this node, if any. */
-  final PathNode getASuccessor() { result = super.getASuccessor() }
-
-  /** Holds if this node is a source. */
-  final predicate isSource() { super.isSource() }
-
-  /** Holds if this node is a grouping of source nodes. */
-  final predicate isSourceGroup(string group) { super.isSourceGroup(group) }
-
-  /** Holds if this node is a grouping of sink nodes. */
-  final predicate isSinkGroup(string group) { super.isSinkGroup(group) }
-}
-
-deprecated module PathGraph = I::PathGraph;
-
-deprecated private predicate hasFlow(Node source, Node sink, Configuration config) {
-  exists(PathNode source0, PathNode sink0 |
-    hasFlowPath(source0, sink0, config) and
-    source0.getNode() = source and
-    sink0.getNode() = sink
-  )
-}
-
-deprecated private predicate hasFlowPath(PathNode source, PathNode sink, Configuration config) {
-  I::flowPath(source, sink) and source.getConfiguration() = config
-}
-
-deprecated private predicate hasFlowTo(Node sink, Configuration config) { hasFlow(_, sink, config) }
-
-deprecated predicate flowsTo = hasFlow/3;
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl2.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl2.qll
deleted file mode 100644
index 17def0c431d..00000000000
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl2.qll
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides a `Configuration` class backwards-compatible interface to the data
- * flow library.
- */
-
-private import DataFlowImplCommon
-private import DataFlowImplSpecific::Private
-import DataFlowImplSpecific::Public
-private import DataFlowImpl
-import DataFlowImplCommonPublic
-deprecated import FlowStateString
-private import codeql.util.Unit
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural data flow analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the global data flow library must define its own unique extension
- * of this abstract class. To create a configuration, extend this class with
- * a subclass whose characteristic predicate is a unique singleton string.
- * For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends DataFlow::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isBarrier`.
- *   // Optionally override `isAdditionalFlowStep`.
- * }
- * ```
- * Conceptually, this defines a graph where the nodes are `DataFlow::Node`s and
- * the edges are those data-flow steps that preserve the value of the node
- * along with any additional edges defined by `isAdditionalFlowStep`.
- * Specifying nodes in `isBarrier` will remove those nodes from the graph, and
- * specifying nodes in `isBarrierIn` and/or `isBarrierOut` will remove in-going
- * and/or out-going edges from those nodes, respectively.
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but two classes extending
- * `DataFlow::Configuration` should never depend on each other. One of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`.
- */
-abstract deprecated class Configuration extends string {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant data flow source.
-   */
-  predicate isSource(Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant data flow source with the given initial
-   * `state`.
-   */
-  predicate isSource(Node source, FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink.
-   */
-  predicate isSink(Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink accepting `state`.
-   */
-  predicate isSink(Node sink, FlowState state) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited. This completely removes
-   * `node` from the data flow graph.
-   */
-  predicate isBarrier(Node node) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited when the flow state is
-   * `state`.
-   */
-  predicate isBarrier(Node node, FlowState state) { none() }
-
-  /** Holds if data flow into `node` is prohibited. */
-  predicate isBarrierIn(Node node) { none() }
-
-  /** Holds if data flow out of `node` is prohibited. */
-  predicate isBarrierOut(Node node) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   */
-  predicate isAdditionalFlowStep(Node node1, Node node2) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
-    none()
-  }
-
-  /**
-   * Holds if an arbitrary number of implicit read steps of content `c` may be
-   * taken at `node`.
-   */
-  predicate allowImplicitRead(Node node, ContentSet c) { none() }
-
-  /**
-   * Gets the virtual dispatch branching limit when calculating field flow.
-   * This can be overridden to a smaller value to improve performance (a
-   * value of 0 disables field flow), or a larger value to get more results.
-   */
-  int fieldFlowBranchLimit() { result = 2 }
-
-  /**
-   * Gets a data flow configuration feature to add restrictions to the set of
-   * valid flow paths.
-   *
-   * - `FeatureHasSourceCallContext`:
-   *    Assume that sources have some existing call context to disallow
-   *    conflicting return-flow directly following the source.
-   * - `FeatureHasSinkCallContext`:
-   *    Assume that sinks have some existing call context to disallow
-   *    conflicting argument-to-parameter flow directly preceding the sink.
-   * - `FeatureEqualSourceSinkCallContext`:
-   *    Implies both of the above and additionally ensures that the entire flow
-   *    path preserves the call context.
-   *
-   * These features are generally not relevant for typical end-to-end data flow
-   * queries, but should only be used for constructing paths that need to
-   * somehow be pluggable in another path context.
-   */
-  FlowFeature getAFeature() { none() }
-
-  /** Holds if sources should be grouped in the result of `hasFlowPath`. */
-  predicate sourceGrouping(Node source, string sourceGroup) { none() }
-
-  /** Holds if sinks should be grouped in the result of `hasFlowPath`. */
-  predicate sinkGrouping(Node sink, string sinkGroup) { none() }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   */
-  predicate hasFlow(Node source, Node sink) { hasFlow(source, sink, this) }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   *
-   * The corresponding paths are generated from the end-points and the graph
-   * included in the module `PathGraph`.
-   */
-  predicate hasFlowPath(PathNode source, PathNode sink) { hasFlowPath(source, sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowTo(Node sink) { hasFlowTo(sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowToExpr(DataFlowExpr sink) { this.hasFlowTo(exprNode(sink)) }
-
-  /**
-   * Holds if hidden nodes should be included in the data flow graph.
-   *
-   * This feature should only be used for debugging or when the data flow graph
-   * is not visualized (for example in a `path-problem` query).
-   */
-  predicate includeHiddenNodes() { none() }
-}
-
-/**
- * This class exists to prevent mutual recursion between the user-overridden
- * member predicates of `Configuration` and the rest of the data-flow library.
- * Good performance cannot be guaranteed in the presence of such recursion, so
- * it should be replaced by using more than one copy of the data flow library.
- */
-abstract deprecated private class ConfigurationRecursionPrevention extends Configuration {
-  bindingset[this]
-  ConfigurationRecursionPrevention() { any() }
-
-  override predicate hasFlow(Node source, Node sink) {
-    strictcount(Node n | this.isSource(n)) < 0
-    or
-    strictcount(Node n | this.isSource(n, _)) < 0
-    or
-    strictcount(Node n | this.isSink(n)) < 0
-    or
-    strictcount(Node n | this.isSink(n, _)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, _, n2, _)) < 0
-    or
-    super.hasFlow(source, sink)
-  }
-}
-
-deprecated private FlowState relevantState(Configuration config) {
-  config.isSource(_, result) or
-  config.isSink(_, result) or
-  config.isBarrier(_, result) or
-  config.isAdditionalFlowStep(_, result, _, _) or
-  config.isAdditionalFlowStep(_, _, _, result)
-}
-
-private newtype TConfigState =
-  deprecated TMkConfigState(Configuration config, FlowState state) {
-    state = relevantState(config) or state instanceof FlowStateEmpty
-  }
-
-deprecated private Configuration getConfig(TConfigState state) { state = TMkConfigState(result, _) }
-
-deprecated private FlowState getState(TConfigState state) { state = TMkConfigState(_, result) }
-
-deprecated private predicate singleConfiguration() { 1 = strictcount(Configuration c) }
-
-deprecated private module Config implements FullStateConfigSig {
-  class FlowState = TConfigState;
-
-  predicate isSource(Node source, FlowState state) {
-    getConfig(state).isSource(source, getState(state))
-    or
-    getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isSink(Node sink) { none() }
-
-  predicate isSink(Node sink, FlowState state) {
-    getConfig(state).isSink(sink, getState(state))
-    or
-    getConfig(state).isSink(sink) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isBarrier(Node node) { none() }
-
-  predicate isBarrier(Node node, FlowState state) {
-    getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node)
-  }
-
-  predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
-
-  predicate isBarrierOut(Node node) { any(Configuration config).isBarrierOut(node) }
-
-  predicate isBarrierIn(Node node, FlowState state) { none() }
-
-  predicate isBarrierOut(Node node, FlowState state) { none() }
-
-  predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
-    singleConfiguration() and
-    any(Configuration config).isAdditionalFlowStep(node1, node2) and
-    model = ""
-  }
-
-  predicate isAdditionalFlowStep(
-    Node node1, FlowState state1, Node node2, FlowState state2, string model
-  ) {
-    getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1) and
-    model = ""
-    or
-    not singleConfiguration() and
-    getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1 and
-    model = ""
-  }
-
-  predicate allowImplicitRead(Node node, ContentSet c) {
-    any(Configuration config).allowImplicitRead(node, c)
-  }
-
-  predicate neverSkip(Node node) { none() }
-
-  int fieldFlowBranchLimit() { result = min(any(Configuration config).fieldFlowBranchLimit()) }
-
-  int accessPathLimit() { result = 5 }
-
-  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
-
-  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
-
-  predicate observeDiffInformedIncrementalMode() { none() }
-}
-
-deprecated private import Impl<Config> as I
-
-/**
- * A `Node` augmented with a call context (except for sinks), an access path, and a configuration.
- * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
- */
-deprecated class PathNode instanceof I::PathNode {
-  /** Gets a textual representation of this element. */
-  final string toString() { result = super.toString() }
-
-  /**
-   * Gets a textual representation of this element, including a textual
-   * representation of the call context.
-   */
-  final string toStringWithContext() { result = super.toStringWithContext() }
-
-  /**
-   * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
-   * For more information, see
-   * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
-   */
-  final predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    super.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-
-  /** Gets the underlying `Node`. */
-  final Node getNode() { result = super.getNode() }
-
-  /** Gets the `FlowState` of this node. */
-  deprecated final FlowState getState() { result = getState(super.getState()) }
-
-  /** Gets the associated configuration. */
-  deprecated final Configuration getConfiguration() { result = getConfig(super.getState()) }
-
-  /** Gets a successor of this node, if any. */
-  final PathNode getASuccessor() { result = super.getASuccessor() }
-
-  /** Holds if this node is a source. */
-  final predicate isSource() { super.isSource() }
-
-  /** Holds if this node is a grouping of source nodes. */
-  final predicate isSourceGroup(string group) { super.isSourceGroup(group) }
-
-  /** Holds if this node is a grouping of sink nodes. */
-  final predicate isSinkGroup(string group) { super.isSinkGroup(group) }
-}
-
-deprecated module PathGraph = I::PathGraph;
-
-deprecated private predicate hasFlow(Node source, Node sink, Configuration config) {
-  exists(PathNode source0, PathNode sink0 |
-    hasFlowPath(source0, sink0, config) and
-    source0.getNode() = source and
-    sink0.getNode() = sink
-  )
-}
-
-deprecated private predicate hasFlowPath(PathNode source, PathNode sink, Configuration config) {
-  I::flowPath(source, sink) and source.getConfiguration() = config
-}
-
-deprecated private predicate hasFlowTo(Node sink, Configuration config) { hasFlow(_, sink, config) }
-
-deprecated predicate flowsTo = hasFlow/3;
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl3.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl3.qll
deleted file mode 100644
index 17def0c431d..00000000000
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl3.qll
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides a `Configuration` class backwards-compatible interface to the data
- * flow library.
- */
-
-private import DataFlowImplCommon
-private import DataFlowImplSpecific::Private
-import DataFlowImplSpecific::Public
-private import DataFlowImpl
-import DataFlowImplCommonPublic
-deprecated import FlowStateString
-private import codeql.util.Unit
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural data flow analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the global data flow library must define its own unique extension
- * of this abstract class. To create a configuration, extend this class with
- * a subclass whose characteristic predicate is a unique singleton string.
- * For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends DataFlow::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isBarrier`.
- *   // Optionally override `isAdditionalFlowStep`.
- * }
- * ```
- * Conceptually, this defines a graph where the nodes are `DataFlow::Node`s and
- * the edges are those data-flow steps that preserve the value of the node
- * along with any additional edges defined by `isAdditionalFlowStep`.
- * Specifying nodes in `isBarrier` will remove those nodes from the graph, and
- * specifying nodes in `isBarrierIn` and/or `isBarrierOut` will remove in-going
- * and/or out-going edges from those nodes, respectively.
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but two classes extending
- * `DataFlow::Configuration` should never depend on each other. One of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`.
- */
-abstract deprecated class Configuration extends string {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant data flow source.
-   */
-  predicate isSource(Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant data flow source with the given initial
-   * `state`.
-   */
-  predicate isSource(Node source, FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink.
-   */
-  predicate isSink(Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink accepting `state`.
-   */
-  predicate isSink(Node sink, FlowState state) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited. This completely removes
-   * `node` from the data flow graph.
-   */
-  predicate isBarrier(Node node) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited when the flow state is
-   * `state`.
-   */
-  predicate isBarrier(Node node, FlowState state) { none() }
-
-  /** Holds if data flow into `node` is prohibited. */
-  predicate isBarrierIn(Node node) { none() }
-
-  /** Holds if data flow out of `node` is prohibited. */
-  predicate isBarrierOut(Node node) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   */
-  predicate isAdditionalFlowStep(Node node1, Node node2) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
-    none()
-  }
-
-  /**
-   * Holds if an arbitrary number of implicit read steps of content `c` may be
-   * taken at `node`.
-   */
-  predicate allowImplicitRead(Node node, ContentSet c) { none() }
-
-  /**
-   * Gets the virtual dispatch branching limit when calculating field flow.
-   * This can be overridden to a smaller value to improve performance (a
-   * value of 0 disables field flow), or a larger value to get more results.
-   */
-  int fieldFlowBranchLimit() { result = 2 }
-
-  /**
-   * Gets a data flow configuration feature to add restrictions to the set of
-   * valid flow paths.
-   *
-   * - `FeatureHasSourceCallContext`:
-   *    Assume that sources have some existing call context to disallow
-   *    conflicting return-flow directly following the source.
-   * - `FeatureHasSinkCallContext`:
-   *    Assume that sinks have some existing call context to disallow
-   *    conflicting argument-to-parameter flow directly preceding the sink.
-   * - `FeatureEqualSourceSinkCallContext`:
-   *    Implies both of the above and additionally ensures that the entire flow
-   *    path preserves the call context.
-   *
-   * These features are generally not relevant for typical end-to-end data flow
-   * queries, but should only be used for constructing paths that need to
-   * somehow be pluggable in another path context.
-   */
-  FlowFeature getAFeature() { none() }
-
-  /** Holds if sources should be grouped in the result of `hasFlowPath`. */
-  predicate sourceGrouping(Node source, string sourceGroup) { none() }
-
-  /** Holds if sinks should be grouped in the result of `hasFlowPath`. */
-  predicate sinkGrouping(Node sink, string sinkGroup) { none() }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   */
-  predicate hasFlow(Node source, Node sink) { hasFlow(source, sink, this) }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   *
-   * The corresponding paths are generated from the end-points and the graph
-   * included in the module `PathGraph`.
-   */
-  predicate hasFlowPath(PathNode source, PathNode sink) { hasFlowPath(source, sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowTo(Node sink) { hasFlowTo(sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowToExpr(DataFlowExpr sink) { this.hasFlowTo(exprNode(sink)) }
-
-  /**
-   * Holds if hidden nodes should be included in the data flow graph.
-   *
-   * This feature should only be used for debugging or when the data flow graph
-   * is not visualized (for example in a `path-problem` query).
-   */
-  predicate includeHiddenNodes() { none() }
-}
-
-/**
- * This class exists to prevent mutual recursion between the user-overridden
- * member predicates of `Configuration` and the rest of the data-flow library.
- * Good performance cannot be guaranteed in the presence of such recursion, so
- * it should be replaced by using more than one copy of the data flow library.
- */
-abstract deprecated private class ConfigurationRecursionPrevention extends Configuration {
-  bindingset[this]
-  ConfigurationRecursionPrevention() { any() }
-
-  override predicate hasFlow(Node source, Node sink) {
-    strictcount(Node n | this.isSource(n)) < 0
-    or
-    strictcount(Node n | this.isSource(n, _)) < 0
-    or
-    strictcount(Node n | this.isSink(n)) < 0
-    or
-    strictcount(Node n | this.isSink(n, _)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, _, n2, _)) < 0
-    or
-    super.hasFlow(source, sink)
-  }
-}
-
-deprecated private FlowState relevantState(Configuration config) {
-  config.isSource(_, result) or
-  config.isSink(_, result) or
-  config.isBarrier(_, result) or
-  config.isAdditionalFlowStep(_, result, _, _) or
-  config.isAdditionalFlowStep(_, _, _, result)
-}
-
-private newtype TConfigState =
-  deprecated TMkConfigState(Configuration config, FlowState state) {
-    state = relevantState(config) or state instanceof FlowStateEmpty
-  }
-
-deprecated private Configuration getConfig(TConfigState state) { state = TMkConfigState(result, _) }
-
-deprecated private FlowState getState(TConfigState state) { state = TMkConfigState(_, result) }
-
-deprecated private predicate singleConfiguration() { 1 = strictcount(Configuration c) }
-
-deprecated private module Config implements FullStateConfigSig {
-  class FlowState = TConfigState;
-
-  predicate isSource(Node source, FlowState state) {
-    getConfig(state).isSource(source, getState(state))
-    or
-    getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isSink(Node sink) { none() }
-
-  predicate isSink(Node sink, FlowState state) {
-    getConfig(state).isSink(sink, getState(state))
-    or
-    getConfig(state).isSink(sink) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isBarrier(Node node) { none() }
-
-  predicate isBarrier(Node node, FlowState state) {
-    getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node)
-  }
-
-  predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
-
-  predicate isBarrierOut(Node node) { any(Configuration config).isBarrierOut(node) }
-
-  predicate isBarrierIn(Node node, FlowState state) { none() }
-
-  predicate isBarrierOut(Node node, FlowState state) { none() }
-
-  predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
-    singleConfiguration() and
-    any(Configuration config).isAdditionalFlowStep(node1, node2) and
-    model = ""
-  }
-
-  predicate isAdditionalFlowStep(
-    Node node1, FlowState state1, Node node2, FlowState state2, string model
-  ) {
-    getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1) and
-    model = ""
-    or
-    not singleConfiguration() and
-    getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1 and
-    model = ""
-  }
-
-  predicate allowImplicitRead(Node node, ContentSet c) {
-    any(Configuration config).allowImplicitRead(node, c)
-  }
-
-  predicate neverSkip(Node node) { none() }
-
-  int fieldFlowBranchLimit() { result = min(any(Configuration config).fieldFlowBranchLimit()) }
-
-  int accessPathLimit() { result = 5 }
-
-  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
-
-  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
-
-  predicate observeDiffInformedIncrementalMode() { none() }
-}
-
-deprecated private import Impl<Config> as I
-
-/**
- * A `Node` augmented with a call context (except for sinks), an access path, and a configuration.
- * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
- */
-deprecated class PathNode instanceof I::PathNode {
-  /** Gets a textual representation of this element. */
-  final string toString() { result = super.toString() }
-
-  /**
-   * Gets a textual representation of this element, including a textual
-   * representation of the call context.
-   */
-  final string toStringWithContext() { result = super.toStringWithContext() }
-
-  /**
-   * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
-   * For more information, see
-   * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
-   */
-  final predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    super.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-
-  /** Gets the underlying `Node`. */
-  final Node getNode() { result = super.getNode() }
-
-  /** Gets the `FlowState` of this node. */
-  deprecated final FlowState getState() { result = getState(super.getState()) }
-
-  /** Gets the associated configuration. */
-  deprecated final Configuration getConfiguration() { result = getConfig(super.getState()) }
-
-  /** Gets a successor of this node, if any. */
-  final PathNode getASuccessor() { result = super.getASuccessor() }
-
-  /** Holds if this node is a source. */
-  final predicate isSource() { super.isSource() }
-
-  /** Holds if this node is a grouping of source nodes. */
-  final predicate isSourceGroup(string group) { super.isSourceGroup(group) }
-
-  /** Holds if this node is a grouping of sink nodes. */
-  final predicate isSinkGroup(string group) { super.isSinkGroup(group) }
-}
-
-deprecated module PathGraph = I::PathGraph;
-
-deprecated private predicate hasFlow(Node source, Node sink, Configuration config) {
-  exists(PathNode source0, PathNode sink0 |
-    hasFlowPath(source0, sink0, config) and
-    source0.getNode() = source and
-    sink0.getNode() = sink
-  )
-}
-
-deprecated private predicate hasFlowPath(PathNode source, PathNode sink, Configuration config) {
-  I::flowPath(source, sink) and source.getConfiguration() = config
-}
-
-deprecated private predicate hasFlowTo(Node sink, Configuration config) { hasFlow(_, sink, config) }
-
-deprecated predicate flowsTo = hasFlow/3;
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl4.qll b/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl4.qll
deleted file mode 100644
index 17def0c431d..00000000000
--- a/python/ql/lib/semmle/python/dataflow/new/internal/DataFlowImpl4.qll
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides a `Configuration` class backwards-compatible interface to the data
- * flow library.
- */
-
-private import DataFlowImplCommon
-private import DataFlowImplSpecific::Private
-import DataFlowImplSpecific::Public
-private import DataFlowImpl
-import DataFlowImplCommonPublic
-deprecated import FlowStateString
-private import codeql.util.Unit
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural data flow analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the global data flow library must define its own unique extension
- * of this abstract class. To create a configuration, extend this class with
- * a subclass whose characteristic predicate is a unique singleton string.
- * For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends DataFlow::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isBarrier`.
- *   // Optionally override `isAdditionalFlowStep`.
- * }
- * ```
- * Conceptually, this defines a graph where the nodes are `DataFlow::Node`s and
- * the edges are those data-flow steps that preserve the value of the node
- * along with any additional edges defined by `isAdditionalFlowStep`.
- * Specifying nodes in `isBarrier` will remove those nodes from the graph, and
- * specifying nodes in `isBarrierIn` and/or `isBarrierOut` will remove in-going
- * and/or out-going edges from those nodes, respectively.
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but two classes extending
- * `DataFlow::Configuration` should never depend on each other. One of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`.
- */
-abstract deprecated class Configuration extends string {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant data flow source.
-   */
-  predicate isSource(Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant data flow source with the given initial
-   * `state`.
-   */
-  predicate isSource(Node source, FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink.
-   */
-  predicate isSink(Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink accepting `state`.
-   */
-  predicate isSink(Node sink, FlowState state) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited. This completely removes
-   * `node` from the data flow graph.
-   */
-  predicate isBarrier(Node node) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited when the flow state is
-   * `state`.
-   */
-  predicate isBarrier(Node node, FlowState state) { none() }
-
-  /** Holds if data flow into `node` is prohibited. */
-  predicate isBarrierIn(Node node) { none() }
-
-  /** Holds if data flow out of `node` is prohibited. */
-  predicate isBarrierOut(Node node) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   */
-  predicate isAdditionalFlowStep(Node node1, Node node2) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
-    none()
-  }
-
-  /**
-   * Holds if an arbitrary number of implicit read steps of content `c` may be
-   * taken at `node`.
-   */
-  predicate allowImplicitRead(Node node, ContentSet c) { none() }
-
-  /**
-   * Gets the virtual dispatch branching limit when calculating field flow.
-   * This can be overridden to a smaller value to improve performance (a
-   * value of 0 disables field flow), or a larger value to get more results.
-   */
-  int fieldFlowBranchLimit() { result = 2 }
-
-  /**
-   * Gets a data flow configuration feature to add restrictions to the set of
-   * valid flow paths.
-   *
-   * - `FeatureHasSourceCallContext`:
-   *    Assume that sources have some existing call context to disallow
-   *    conflicting return-flow directly following the source.
-   * - `FeatureHasSinkCallContext`:
-   *    Assume that sinks have some existing call context to disallow
-   *    conflicting argument-to-parameter flow directly preceding the sink.
-   * - `FeatureEqualSourceSinkCallContext`:
-   *    Implies both of the above and additionally ensures that the entire flow
-   *    path preserves the call context.
-   *
-   * These features are generally not relevant for typical end-to-end data flow
-   * queries, but should only be used for constructing paths that need to
-   * somehow be pluggable in another path context.
-   */
-  FlowFeature getAFeature() { none() }
-
-  /** Holds if sources should be grouped in the result of `hasFlowPath`. */
-  predicate sourceGrouping(Node source, string sourceGroup) { none() }
-
-  /** Holds if sinks should be grouped in the result of `hasFlowPath`. */
-  predicate sinkGrouping(Node sink, string sinkGroup) { none() }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   */
-  predicate hasFlow(Node source, Node sink) { hasFlow(source, sink, this) }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   *
-   * The corresponding paths are generated from the end-points and the graph
-   * included in the module `PathGraph`.
-   */
-  predicate hasFlowPath(PathNode source, PathNode sink) { hasFlowPath(source, sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowTo(Node sink) { hasFlowTo(sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowToExpr(DataFlowExpr sink) { this.hasFlowTo(exprNode(sink)) }
-
-  /**
-   * Holds if hidden nodes should be included in the data flow graph.
-   *
-   * This feature should only be used for debugging or when the data flow graph
-   * is not visualized (for example in a `path-problem` query).
-   */
-  predicate includeHiddenNodes() { none() }
-}
-
-/**
- * This class exists to prevent mutual recursion between the user-overridden
- * member predicates of `Configuration` and the rest of the data-flow library.
- * Good performance cannot be guaranteed in the presence of such recursion, so
- * it should be replaced by using more than one copy of the data flow library.
- */
-abstract deprecated private class ConfigurationRecursionPrevention extends Configuration {
-  bindingset[this]
-  ConfigurationRecursionPrevention() { any() }
-
-  override predicate hasFlow(Node source, Node sink) {
-    strictcount(Node n | this.isSource(n)) < 0
-    or
-    strictcount(Node n | this.isSource(n, _)) < 0
-    or
-    strictcount(Node n | this.isSink(n)) < 0
-    or
-    strictcount(Node n | this.isSink(n, _)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, _, n2, _)) < 0
-    or
-    super.hasFlow(source, sink)
-  }
-}
-
-deprecated private FlowState relevantState(Configuration config) {
-  config.isSource(_, result) or
-  config.isSink(_, result) or
-  config.isBarrier(_, result) or
-  config.isAdditionalFlowStep(_, result, _, _) or
-  config.isAdditionalFlowStep(_, _, _, result)
-}
-
-private newtype TConfigState =
-  deprecated TMkConfigState(Configuration config, FlowState state) {
-    state = relevantState(config) or state instanceof FlowStateEmpty
-  }
-
-deprecated private Configuration getConfig(TConfigState state) { state = TMkConfigState(result, _) }
-
-deprecated private FlowState getState(TConfigState state) { state = TMkConfigState(_, result) }
-
-deprecated private predicate singleConfiguration() { 1 = strictcount(Configuration c) }
-
-deprecated private module Config implements FullStateConfigSig {
-  class FlowState = TConfigState;
-
-  predicate isSource(Node source, FlowState state) {
-    getConfig(state).isSource(source, getState(state))
-    or
-    getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isSink(Node sink) { none() }
-
-  predicate isSink(Node sink, FlowState state) {
-    getConfig(state).isSink(sink, getState(state))
-    or
-    getConfig(state).isSink(sink) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isBarrier(Node node) { none() }
-
-  predicate isBarrier(Node node, FlowState state) {
-    getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node)
-  }
-
-  predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
-
-  predicate isBarrierOut(Node node) { any(Configuration config).isBarrierOut(node) }
-
-  predicate isBarrierIn(Node node, FlowState state) { none() }
-
-  predicate isBarrierOut(Node node, FlowState state) { none() }
-
-  predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
-    singleConfiguration() and
-    any(Configuration config).isAdditionalFlowStep(node1, node2) and
-    model = ""
-  }
-
-  predicate isAdditionalFlowStep(
-    Node node1, FlowState state1, Node node2, FlowState state2, string model
-  ) {
-    getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1) and
-    model = ""
-    or
-    not singleConfiguration() and
-    getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1 and
-    model = ""
-  }
-
-  predicate allowImplicitRead(Node node, ContentSet c) {
-    any(Configuration config).allowImplicitRead(node, c)
-  }
-
-  predicate neverSkip(Node node) { none() }
-
-  int fieldFlowBranchLimit() { result = min(any(Configuration config).fieldFlowBranchLimit()) }
-
-  int accessPathLimit() { result = 5 }
-
-  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
-
-  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
-
-  predicate observeDiffInformedIncrementalMode() { none() }
-}
-
-deprecated private import Impl<Config> as I
-
-/**
- * A `Node` augmented with a call context (except for sinks), an access path, and a configuration.
- * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
- */
-deprecated class PathNode instanceof I::PathNode {
-  /** Gets a textual representation of this element. */
-  final string toString() { result = super.toString() }
-
-  /**
-   * Gets a textual representation of this element, including a textual
-   * representation of the call context.
-   */
-  final string toStringWithContext() { result = super.toStringWithContext() }
-
-  /**
-   * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
-   * For more information, see
-   * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
-   */
-  final predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    super.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-
-  /** Gets the underlying `Node`. */
-  final Node getNode() { result = super.getNode() }
-
-  /** Gets the `FlowState` of this node. */
-  deprecated final FlowState getState() { result = getState(super.getState()) }
-
-  /** Gets the associated configuration. */
-  deprecated final Configuration getConfiguration() { result = getConfig(super.getState()) }
-
-  /** Gets a successor of this node, if any. */
-  final PathNode getASuccessor() { result = super.getASuccessor() }
-
-  /** Holds if this node is a source. */
-  final predicate isSource() { super.isSource() }
-
-  /** Holds if this node is a grouping of source nodes. */
-  final predicate isSourceGroup(string group) { super.isSourceGroup(group) }
-
-  /** Holds if this node is a grouping of sink nodes. */
-  final predicate isSinkGroup(string group) { super.isSinkGroup(group) }
-}
-
-deprecated module PathGraph = I::PathGraph;
-
-deprecated private predicate hasFlow(Node source, Node sink, Configuration config) {
-  exists(PathNode source0, PathNode sink0 |
-    hasFlowPath(source0, sink0, config) and
-    source0.getNode() = source and
-    sink0.getNode() = sink
-  )
-}
-
-deprecated private predicate hasFlowPath(PathNode source, PathNode sink, Configuration config) {
-  I::flowPath(source, sink) and source.getConfiguration() = config
-}
-
-deprecated private predicate hasFlowTo(Node sink, Configuration config) { hasFlow(_, sink, config) }
-
-deprecated predicate flowsTo = hasFlow/3;
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking1/TaintTrackingImpl.qll b/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking1/TaintTrackingImpl.qll
deleted file mode 100644
index 75e7856fd26..00000000000
--- a/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking1/TaintTrackingImpl.qll
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides an implementation of global (interprocedural) taint tracking.
- * This file re-exports the local (intraprocedural) taint-tracking analysis
- * from `TaintTrackingParameter::Public` and adds a global analysis, mainly
- * exposed through the `Configuration` class. For some languages, this file
- * exists in several identical copies, allowing queries to use multiple
- * `Configuration` classes that depend on each other without introducing
- * mutual recursion among those configurations.
- */
-
-import TaintTrackingParameter::Public
-private import TaintTrackingParameter::Private
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural taint tracking analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the taint tracking library must define its own unique extension of
- * this abstract class.
- *
- * A taint-tracking configuration is a special data flow configuration
- * (`DataFlow::Configuration`) that allows for flow through nodes that do not
- * necessarily preserve values but are still relevant from a taint tracking
- * perspective. (For example, string concatenation, where one of the operands
- * is tainted.)
- *
- * To create a configuration, extend this class with a subclass whose
- * characteristic predicate is a unique singleton string. For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends TaintTracking::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isSanitizer`.
- *   // Optionally override `isSanitizerIn`.
- *   // Optionally override `isSanitizerOut`.
- *   // Optionally override `isSanitizerGuard`.
- *   // Optionally override `isAdditionalTaintStep`.
- * }
- * ```
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but it is unsupported to depend on
- * another `TaintTracking::Configuration` or a `DataFlow::Configuration` in the
- * overridden predicates that define sources, sinks, or additional steps.
- * Instead, the dependency should go to a `TaintTracking2::Configuration` or a
- * `DataFlow2::Configuration`, `DataFlow3::Configuration`, etc.
- */
-abstract deprecated class Configuration extends DataFlow::Configuration {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant taint source.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant taint source with the given initial
-   * `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink accepting `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
-
-  /** Holds if the node `node` is a taint sanitizer. */
-  predicate isSanitizer(DataFlow::Node node) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node) {
-    this.isSanitizer(node) or
-    defaultTaintSanitizer(node)
-  }
-
-  /**
-   * Holds if the node `node` is a taint sanitizer when the flow state is
-   * `state`.
-   */
-  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
-    this.isSanitizer(node, state)
-  }
-
-  /** Holds if taint propagation into `node` is prohibited. */
-  predicate isSanitizerIn(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierIn(DataFlow::Node node) { this.isSanitizerIn(node) }
-
-  /** Holds if taint propagation out of `node` is prohibited. */
-  predicate isSanitizerOut(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   */
-  predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) { none() }
-
-  final override predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
-    this.isAdditionalTaintStep(node1, node2) or
-    defaultAdditionalTaintStep(node1, node2, _)
-  }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalTaintStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    none()
-  }
-
-  final override predicate isAdditionalFlowStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    this.isAdditionalTaintStep(node1, state1, node2, state2)
-  }
-
-  override predicate allowImplicitRead(DataFlow::Node node, DataFlow::ContentSet c) {
-    (
-      this.isSink(node) or
-      this.isSink(node, _) or
-      this.isAdditionalTaintStep(node, _) or
-      this.isAdditionalTaintStep(node, _, _, _)
-    ) and
-    defaultImplicitTaintRead(node, c)
-  }
-
-  /**
-   * Holds if taint may flow from `source` to `sink` for this configuration.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate hasFlow(DataFlow::Node source, DataFlow::Node sink) {
-    super.hasFlow(source, sink)
-  }
-}
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking1/TaintTrackingParameter.qll b/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking1/TaintTrackingParameter.qll
deleted file mode 100644
index badbe01f4c5..00000000000
--- a/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking1/TaintTrackingParameter.qll
+++ /dev/null
@@ -1,7 +0,0 @@
-import semmle.python.dataflow.new.internal.TaintTrackingPublic as Public
-
-module Private {
-  import semmle.python.dataflow.new.DataFlow::DataFlow as DataFlow
-  import semmle.python.dataflow.new.internal.DataFlowImpl as DataFlowInternal
-  import semmle.python.dataflow.new.internal.TaintTrackingPrivate
-}
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking2/TaintTrackingImpl.qll b/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking2/TaintTrackingImpl.qll
deleted file mode 100644
index 75e7856fd26..00000000000
--- a/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking2/TaintTrackingImpl.qll
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides an implementation of global (interprocedural) taint tracking.
- * This file re-exports the local (intraprocedural) taint-tracking analysis
- * from `TaintTrackingParameter::Public` and adds a global analysis, mainly
- * exposed through the `Configuration` class. For some languages, this file
- * exists in several identical copies, allowing queries to use multiple
- * `Configuration` classes that depend on each other without introducing
- * mutual recursion among those configurations.
- */
-
-import TaintTrackingParameter::Public
-private import TaintTrackingParameter::Private
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural taint tracking analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the taint tracking library must define its own unique extension of
- * this abstract class.
- *
- * A taint-tracking configuration is a special data flow configuration
- * (`DataFlow::Configuration`) that allows for flow through nodes that do not
- * necessarily preserve values but are still relevant from a taint tracking
- * perspective. (For example, string concatenation, where one of the operands
- * is tainted.)
- *
- * To create a configuration, extend this class with a subclass whose
- * characteristic predicate is a unique singleton string. For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends TaintTracking::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isSanitizer`.
- *   // Optionally override `isSanitizerIn`.
- *   // Optionally override `isSanitizerOut`.
- *   // Optionally override `isSanitizerGuard`.
- *   // Optionally override `isAdditionalTaintStep`.
- * }
- * ```
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but it is unsupported to depend on
- * another `TaintTracking::Configuration` or a `DataFlow::Configuration` in the
- * overridden predicates that define sources, sinks, or additional steps.
- * Instead, the dependency should go to a `TaintTracking2::Configuration` or a
- * `DataFlow2::Configuration`, `DataFlow3::Configuration`, etc.
- */
-abstract deprecated class Configuration extends DataFlow::Configuration {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant taint source.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant taint source with the given initial
-   * `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink accepting `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
-
-  /** Holds if the node `node` is a taint sanitizer. */
-  predicate isSanitizer(DataFlow::Node node) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node) {
-    this.isSanitizer(node) or
-    defaultTaintSanitizer(node)
-  }
-
-  /**
-   * Holds if the node `node` is a taint sanitizer when the flow state is
-   * `state`.
-   */
-  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
-    this.isSanitizer(node, state)
-  }
-
-  /** Holds if taint propagation into `node` is prohibited. */
-  predicate isSanitizerIn(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierIn(DataFlow::Node node) { this.isSanitizerIn(node) }
-
-  /** Holds if taint propagation out of `node` is prohibited. */
-  predicate isSanitizerOut(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   */
-  predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) { none() }
-
-  final override predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
-    this.isAdditionalTaintStep(node1, node2) or
-    defaultAdditionalTaintStep(node1, node2, _)
-  }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalTaintStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    none()
-  }
-
-  final override predicate isAdditionalFlowStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    this.isAdditionalTaintStep(node1, state1, node2, state2)
-  }
-
-  override predicate allowImplicitRead(DataFlow::Node node, DataFlow::ContentSet c) {
-    (
-      this.isSink(node) or
-      this.isSink(node, _) or
-      this.isAdditionalTaintStep(node, _) or
-      this.isAdditionalTaintStep(node, _, _, _)
-    ) and
-    defaultImplicitTaintRead(node, c)
-  }
-
-  /**
-   * Holds if taint may flow from `source` to `sink` for this configuration.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate hasFlow(DataFlow::Node source, DataFlow::Node sink) {
-    super.hasFlow(source, sink)
-  }
-}
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking2/TaintTrackingParameter.qll b/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking2/TaintTrackingParameter.qll
deleted file mode 100644
index fa5201b6020..00000000000
--- a/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking2/TaintTrackingParameter.qll
+++ /dev/null
@@ -1,6 +0,0 @@
-import semmle.python.dataflow.new.internal.TaintTrackingPublic as Public
-
-module Private {
-  import semmle.python.dataflow.new.DataFlow2::DataFlow2 as DataFlow
-  import semmle.python.dataflow.new.internal.TaintTrackingPrivate
-}
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking3/TaintTrackingImpl.qll b/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking3/TaintTrackingImpl.qll
deleted file mode 100644
index 75e7856fd26..00000000000
--- a/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking3/TaintTrackingImpl.qll
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides an implementation of global (interprocedural) taint tracking.
- * This file re-exports the local (intraprocedural) taint-tracking analysis
- * from `TaintTrackingParameter::Public` and adds a global analysis, mainly
- * exposed through the `Configuration` class. For some languages, this file
- * exists in several identical copies, allowing queries to use multiple
- * `Configuration` classes that depend on each other without introducing
- * mutual recursion among those configurations.
- */
-
-import TaintTrackingParameter::Public
-private import TaintTrackingParameter::Private
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural taint tracking analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the taint tracking library must define its own unique extension of
- * this abstract class.
- *
- * A taint-tracking configuration is a special data flow configuration
- * (`DataFlow::Configuration`) that allows for flow through nodes that do not
- * necessarily preserve values but are still relevant from a taint tracking
- * perspective. (For example, string concatenation, where one of the operands
- * is tainted.)
- *
- * To create a configuration, extend this class with a subclass whose
- * characteristic predicate is a unique singleton string. For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends TaintTracking::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isSanitizer`.
- *   // Optionally override `isSanitizerIn`.
- *   // Optionally override `isSanitizerOut`.
- *   // Optionally override `isSanitizerGuard`.
- *   // Optionally override `isAdditionalTaintStep`.
- * }
- * ```
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but it is unsupported to depend on
- * another `TaintTracking::Configuration` or a `DataFlow::Configuration` in the
- * overridden predicates that define sources, sinks, or additional steps.
- * Instead, the dependency should go to a `TaintTracking2::Configuration` or a
- * `DataFlow2::Configuration`, `DataFlow3::Configuration`, etc.
- */
-abstract deprecated class Configuration extends DataFlow::Configuration {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant taint source.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant taint source with the given initial
-   * `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink accepting `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
-
-  /** Holds if the node `node` is a taint sanitizer. */
-  predicate isSanitizer(DataFlow::Node node) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node) {
-    this.isSanitizer(node) or
-    defaultTaintSanitizer(node)
-  }
-
-  /**
-   * Holds if the node `node` is a taint sanitizer when the flow state is
-   * `state`.
-   */
-  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
-    this.isSanitizer(node, state)
-  }
-
-  /** Holds if taint propagation into `node` is prohibited. */
-  predicate isSanitizerIn(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierIn(DataFlow::Node node) { this.isSanitizerIn(node) }
-
-  /** Holds if taint propagation out of `node` is prohibited. */
-  predicate isSanitizerOut(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   */
-  predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) { none() }
-
-  final override predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
-    this.isAdditionalTaintStep(node1, node2) or
-    defaultAdditionalTaintStep(node1, node2, _)
-  }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalTaintStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    none()
-  }
-
-  final override predicate isAdditionalFlowStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    this.isAdditionalTaintStep(node1, state1, node2, state2)
-  }
-
-  override predicate allowImplicitRead(DataFlow::Node node, DataFlow::ContentSet c) {
-    (
-      this.isSink(node) or
-      this.isSink(node, _) or
-      this.isAdditionalTaintStep(node, _) or
-      this.isAdditionalTaintStep(node, _, _, _)
-    ) and
-    defaultImplicitTaintRead(node, c)
-  }
-
-  /**
-   * Holds if taint may flow from `source` to `sink` for this configuration.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate hasFlow(DataFlow::Node source, DataFlow::Node sink) {
-    super.hasFlow(source, sink)
-  }
-}
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking3/TaintTrackingParameter.qll b/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking3/TaintTrackingParameter.qll
deleted file mode 100644
index 390a1fd7ed0..00000000000
--- a/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking3/TaintTrackingParameter.qll
+++ /dev/null
@@ -1,6 +0,0 @@
-import semmle.python.dataflow.new.internal.TaintTrackingPublic as Public
-
-module Private {
-  import semmle.python.dataflow.new.DataFlow3::DataFlow3 as DataFlow
-  import semmle.python.dataflow.new.internal.TaintTrackingPrivate
-}
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking4/TaintTrackingImpl.qll b/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking4/TaintTrackingImpl.qll
deleted file mode 100644
index 75e7856fd26..00000000000
--- a/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking4/TaintTrackingImpl.qll
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides an implementation of global (interprocedural) taint tracking.
- * This file re-exports the local (intraprocedural) taint-tracking analysis
- * from `TaintTrackingParameter::Public` and adds a global analysis, mainly
- * exposed through the `Configuration` class. For some languages, this file
- * exists in several identical copies, allowing queries to use multiple
- * `Configuration` classes that depend on each other without introducing
- * mutual recursion among those configurations.
- */
-
-import TaintTrackingParameter::Public
-private import TaintTrackingParameter::Private
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural taint tracking analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the taint tracking library must define its own unique extension of
- * this abstract class.
- *
- * A taint-tracking configuration is a special data flow configuration
- * (`DataFlow::Configuration`) that allows for flow through nodes that do not
- * necessarily preserve values but are still relevant from a taint tracking
- * perspective. (For example, string concatenation, where one of the operands
- * is tainted.)
- *
- * To create a configuration, extend this class with a subclass whose
- * characteristic predicate is a unique singleton string. For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends TaintTracking::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isSanitizer`.
- *   // Optionally override `isSanitizerIn`.
- *   // Optionally override `isSanitizerOut`.
- *   // Optionally override `isSanitizerGuard`.
- *   // Optionally override `isAdditionalTaintStep`.
- * }
- * ```
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but it is unsupported to depend on
- * another `TaintTracking::Configuration` or a `DataFlow::Configuration` in the
- * overridden predicates that define sources, sinks, or additional steps.
- * Instead, the dependency should go to a `TaintTracking2::Configuration` or a
- * `DataFlow2::Configuration`, `DataFlow3::Configuration`, etc.
- */
-abstract deprecated class Configuration extends DataFlow::Configuration {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant taint source.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant taint source with the given initial
-   * `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink accepting `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
-
-  /** Holds if the node `node` is a taint sanitizer. */
-  predicate isSanitizer(DataFlow::Node node) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node) {
-    this.isSanitizer(node) or
-    defaultTaintSanitizer(node)
-  }
-
-  /**
-   * Holds if the node `node` is a taint sanitizer when the flow state is
-   * `state`.
-   */
-  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
-    this.isSanitizer(node, state)
-  }
-
-  /** Holds if taint propagation into `node` is prohibited. */
-  predicate isSanitizerIn(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierIn(DataFlow::Node node) { this.isSanitizerIn(node) }
-
-  /** Holds if taint propagation out of `node` is prohibited. */
-  predicate isSanitizerOut(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   */
-  predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) { none() }
-
-  final override predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
-    this.isAdditionalTaintStep(node1, node2) or
-    defaultAdditionalTaintStep(node1, node2, _)
-  }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalTaintStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    none()
-  }
-
-  final override predicate isAdditionalFlowStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    this.isAdditionalTaintStep(node1, state1, node2, state2)
-  }
-
-  override predicate allowImplicitRead(DataFlow::Node node, DataFlow::ContentSet c) {
-    (
-      this.isSink(node) or
-      this.isSink(node, _) or
-      this.isAdditionalTaintStep(node, _) or
-      this.isAdditionalTaintStep(node, _, _, _)
-    ) and
-    defaultImplicitTaintRead(node, c)
-  }
-
-  /**
-   * Holds if taint may flow from `source` to `sink` for this configuration.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate hasFlow(DataFlow::Node source, DataFlow::Node sink) {
-    super.hasFlow(source, sink)
-  }
-}
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking4/TaintTrackingParameter.qll b/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking4/TaintTrackingParameter.qll
deleted file mode 100644
index 3072d32c126..00000000000
--- a/python/ql/lib/semmle/python/dataflow/new/internal/tainttracking4/TaintTrackingParameter.qll
+++ /dev/null
@@ -1,6 +0,0 @@
-import semmle.python.dataflow.new.internal.TaintTrackingPublic as Public
-
-module Private {
-  import semmle.python.dataflow.new.DataFlow4::DataFlow4 as DataFlow
-  import semmle.python.dataflow.new.internal.TaintTrackingPrivate
-}
diff --git a/python/ql/lib/semmle/python/security/dataflow/CleartextLoggingQuery.qll b/python/ql/lib/semmle/python/security/dataflow/CleartextLoggingQuery.qll
index 0b0cb046820..03b1db49d17 100644
--- a/python/ql/lib/semmle/python/security/dataflow/CleartextLoggingQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/CleartextLoggingQuery.qll
@@ -15,25 +15,6 @@ private import semmle.python.dataflow.new.BarrierGuards
 private import semmle.python.dataflow.new.SensitiveDataSources
 import CleartextLoggingCustomizations::CleartextLogging
 
-/**
- * DEPRECATED: Use `CleartextLoggingFlow` module instead.
- *
- * A taint-tracking configuration for detecting "Clear-text logging of sensitive information".
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "CleartextLogging" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) {
-    super.isSanitizer(node)
-    or
-    node instanceof Sanitizer
-  }
-}
-
 private module CleartextLoggingConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/python/ql/lib/semmle/python/security/dataflow/CleartextStorageQuery.qll b/python/ql/lib/semmle/python/security/dataflow/CleartextStorageQuery.qll
index ef9c8c13b56..7ee85230c84 100644
--- a/python/ql/lib/semmle/python/security/dataflow/CleartextStorageQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/CleartextStorageQuery.qll
@@ -15,25 +15,6 @@ private import semmle.python.dataflow.new.BarrierGuards
 private import semmle.python.dataflow.new.SensitiveDataSources
 import CleartextStorageCustomizations::CleartextStorage
 
-/**
- * DEPRECATED: Use `CleartextStorageFlow` module instead.
- *
- * A taint-tracking configuration for detecting "Clear-text storage of sensitive information".
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "CleartextStorage" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) {
-    super.isSanitizer(node)
-    or
-    node instanceof Sanitizer
-  }
-}
-
 private module CleartextStorageConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/python/ql/lib/semmle/python/security/dataflow/CodeInjectionQuery.qll b/python/ql/lib/semmle/python/security/dataflow/CodeInjectionQuery.qll
index ecb0435fec8..486d06a6b21 100644
--- a/python/ql/lib/semmle/python/security/dataflow/CodeInjectionQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/CodeInjectionQuery.qll
@@ -11,21 +11,6 @@ import semmle.python.dataflow.new.DataFlow
 import semmle.python.dataflow.new.TaintTracking
 import CodeInjectionCustomizations::CodeInjection
 
-/**
- * DEPRECATED: Use `CodeInjectionFlow` module instead.
- *
- * A taint-tracking configuration for detecting "code injection" vulnerabilities.
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "CodeInjection" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-}
-
 private module CodeInjectionConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/python/ql/lib/semmle/python/security/dataflow/CommandInjectionQuery.qll b/python/ql/lib/semmle/python/security/dataflow/CommandInjectionQuery.qll
index 8874a12132f..18bcbe8cdd5 100644
--- a/python/ql/lib/semmle/python/security/dataflow/CommandInjectionQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/CommandInjectionQuery.qll
@@ -11,21 +11,6 @@ import semmle.python.dataflow.new.DataFlow
 import semmle.python.dataflow.new.TaintTracking
 import CommandInjectionCustomizations::CommandInjection
 
-/**
- * DEPRECATED: Use `CommandInjectionFlow` module instead.
- *
- * A taint-tracking configuration for detecting "command injection" vulnerabilities.
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "CommandInjection" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-}
-
 /**
  * A taint-tracking configuration for detecting "command injection" vulnerabilities.
  */
diff --git a/python/ql/lib/semmle/python/security/dataflow/LdapInjectionQuery.qll b/python/ql/lib/semmle/python/security/dataflow/LdapInjectionQuery.qll
index 9dd24bceddb..527c1cbfe43 100644
--- a/python/ql/lib/semmle/python/security/dataflow/LdapInjectionQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/LdapInjectionQuery.qll
@@ -13,22 +13,6 @@ import semmle.python.dataflow.new.TaintTracking
 import semmle.python.dataflow.new.RemoteFlowSources
 import LdapInjectionCustomizations::LdapInjection
 
-/**
- * DEPRECATED: Use `LdapInjectionDnFlow` module instead.
- *
- * A taint-tracking configuration for detecting LDAP injection vulnerabilities
- * via the distinguished name (DN) parameter of an LDAP search.
- */
-deprecated class DnConfiguration extends TaintTracking::Configuration {
-  DnConfiguration() { this = "LdapDnInjection" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof DnSink }
-
-  override predicate isSanitizer(DataFlow::Node node) { node instanceof DnSanitizer }
-}
-
 private module LdapInjectionDnConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof Source }
 
@@ -40,22 +24,6 @@ private module LdapInjectionDnConfig implements DataFlow::ConfigSig {
 /** Global taint-tracking for detecting "LDAP injection via the distinguished name (DN) parameter" vulnerabilities. */
 module LdapInjectionDnFlow = TaintTracking::Global<LdapInjectionDnConfig>;
 
-/**
- * DEPRECATED: Use `LdapInjectionFilterFlow` module instead.
- *
- * A taint-tracking configuration for detecting LDAP injection vulnerabilities
- * via the filter parameter of an LDAP search.
- */
-deprecated class FilterConfiguration extends TaintTracking::Configuration {
-  FilterConfiguration() { this = "LdapFilterInjection" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof FilterSink }
-
-  override predicate isSanitizer(DataFlow::Node node) { node instanceof FilterSanitizer }
-}
-
 private module LdapInjectionFilterConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/python/ql/lib/semmle/python/security/dataflow/LogInjectionQuery.qll b/python/ql/lib/semmle/python/security/dataflow/LogInjectionQuery.qll
index 780c27bb213..7204accbdcf 100644
--- a/python/ql/lib/semmle/python/security/dataflow/LogInjectionQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/LogInjectionQuery.qll
@@ -11,21 +11,6 @@ import semmle.python.dataflow.new.DataFlow
 import semmle.python.dataflow.new.TaintTracking
 import LogInjectionCustomizations::LogInjection
 
-/**
- * DEPRECATED: Use `LogInjectionFlow` module instead.
- *
- * A taint-tracking configuration for tracking untrusted user input used in log entries.
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "LogInjection" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-}
-
 private module LogInjectionConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/python/ql/lib/semmle/python/security/dataflow/PamAuthorizationQuery.qll b/python/ql/lib/semmle/python/security/dataflow/PamAuthorizationQuery.qll
index 4b150299b31..eb83d0bf84f 100644
--- a/python/ql/lib/semmle/python/security/dataflow/PamAuthorizationQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/PamAuthorizationQuery.qll
@@ -11,35 +11,6 @@ import semmle.python.ApiGraphs
 import semmle.python.dataflow.new.TaintTracking
 import PamAuthorizationCustomizations::PamAuthorizationCustomizations
 
-/**
- * DEPRECATED: Use `PamAuthorizationFlow` module instead.
- *
- * A taint-tracking configuration for detecting "PAM Authorization" vulnerabilities.
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "PamAuthorization" }
-
-  override predicate isSource(DataFlow::Node node) { node instanceof Source }
-
-  override predicate isSink(DataFlow::Node node) { node instanceof Sink }
-
-  override predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) {
-    // Models flow from a remotely supplied username field to a PAM `handle`.
-    // `retval = pam_start(service, username, byref(conv), byref(handle))`
-    exists(API::CallNode pamStart, DataFlow::Node handle, API::CallNode pointer |
-      pointer = API::moduleImport("ctypes").getMember(["pointer", "byref"]).getACall() and
-      pamStart = libPam().getMember("pam_start").getACall() and
-      pointer = pamStart.getArg(3) and
-      handle = pointer.getArg(0) and
-      pamStart.getArg(1) = node1 and
-      handle = node2
-    )
-    or
-    // Flow from handle to the authenticate call in the final step
-    exists(VulnPamAuthCall c | c.getArg(0) = node1 | node2 = c)
-  }
-}
-
 private module PamAuthorizationConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/python/ql/lib/semmle/python/security/dataflow/PathInjectionQuery.qll b/python/ql/lib/semmle/python/security/dataflow/PathInjectionQuery.qll
index 2cd6ba2a6f4..b3081fd9996 100644
--- a/python/ql/lib/semmle/python/security/dataflow/PathInjectionQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/PathInjectionQuery.qll
@@ -12,57 +12,6 @@ import semmle.python.dataflow.new.DataFlow
 import semmle.python.dataflow.new.TaintTracking
 import PathInjectionCustomizations::PathInjection
 
-/**
- * DEPRECATED: Use `PathInjectionFlow` module instead.
- *
- * A taint-tracking configuration for detecting "path injection" vulnerabilities.
- *
- * This configuration uses two flow states, `NotNormalized` and `NormalizedUnchecked`,
- * to track the requirement that a file path must be first normalized and then checked
- * before it is safe to use.
- *
- * At sources, paths are assumed not normalized. At normalization points, they change
- * state to `NormalizedUnchecked` after which they can be made safe by an appropriate
- * check of the prefix.
- *
- * Such checks are ineffective in the `NotNormalized` state.
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "PathInjection" }
-
-  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) {
-    source instanceof Source and state instanceof NotNormalized
-  }
-
-  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) {
-    sink instanceof Sink and
-    (
-      state instanceof NotNormalized or
-      state instanceof NormalizedUnchecked
-    )
-  }
-
-  override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-
-  override predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) {
-    // Block `NotNormalized` paths here, since they change state to `NormalizedUnchecked`
-    node instanceof Path::PathNormalization and
-    state instanceof NotNormalized
-    or
-    node instanceof Path::SafeAccessCheck and
-    state instanceof NormalizedUnchecked
-  }
-
-  override predicate isAdditionalTaintStep(
-    DataFlow::Node nodeFrom, DataFlow::FlowState stateFrom, DataFlow::Node nodeTo,
-    DataFlow::FlowState stateTo
-  ) {
-    nodeFrom = nodeTo.(Path::PathNormalization).getPathArg() and
-    stateFrom instanceof NotNormalized and
-    stateTo instanceof NormalizedUnchecked
-  }
-}
-
 abstract private class NormalizationState extends string {
   bindingset[this]
   NormalizationState() { any() }
diff --git a/python/ql/lib/semmle/python/security/dataflow/PolynomialReDoSQuery.qll b/python/ql/lib/semmle/python/security/dataflow/PolynomialReDoSQuery.qll
index 3ca67fff82e..4e082aac26e 100644
--- a/python/ql/lib/semmle/python/security/dataflow/PolynomialReDoSQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/PolynomialReDoSQuery.qll
@@ -11,21 +11,6 @@ import semmle.python.dataflow.new.DataFlow
 import semmle.python.dataflow.new.TaintTracking
 import PolynomialReDoSCustomizations::PolynomialReDoS
 
-/**
- * DEPRECATED: Use `PolynomialReDoSFlow` module instead.
- *
- * A taint-tracking configuration for detecting "polynomial regular expression denial of service (ReDoS)" vulnerabilities.
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "PolynomialReDoS" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-}
-
 private module PolynomialReDoSConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/python/ql/lib/semmle/python/security/dataflow/ReflectedXssQuery.qll b/python/ql/lib/semmle/python/security/dataflow/ReflectedXssQuery.qll
index d67c5e3cb39..5f5b2dd58df 100644
--- a/python/ql/lib/semmle/python/security/dataflow/ReflectedXssQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/ReflectedXssQuery.qll
@@ -11,21 +11,6 @@ import semmle.python.dataflow.new.DataFlow
 import semmle.python.dataflow.new.TaintTracking
 import ReflectedXSSCustomizations::ReflectedXss
 
-/**
- * DEPRECATED: Use `ReflectedXssFlow` module instead.
- *
- * A taint-tracking configuration for detecting "reflected server-side cross-site scripting" vulnerabilities.
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "ReflectedXSS" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-}
-
 private module ReflectedXssConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/python/ql/lib/semmle/python/security/dataflow/RegexInjectionQuery.qll b/python/ql/lib/semmle/python/security/dataflow/RegexInjectionQuery.qll
index d79b76a8685..ae21270a63e 100644
--- a/python/ql/lib/semmle/python/security/dataflow/RegexInjectionQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/RegexInjectionQuery.qll
@@ -12,21 +12,6 @@ import semmle.python.dataflow.new.DataFlow
 import semmle.python.dataflow.new.TaintTracking
 import RegexInjectionCustomizations::RegexInjection
 
-/**
- * DEPRECATED: Use `RegexInjectionFlow` module instead.
- *
- * A taint-tracking configuration for detecting "reflected server-side cross-site scripting" vulnerabilities.
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "RegexInjection" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-}
-
 private module RegexInjectionConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/python/ql/lib/semmle/python/security/dataflow/ServerSideRequestForgeryQuery.qll b/python/ql/lib/semmle/python/security/dataflow/ServerSideRequestForgeryQuery.qll
index d0bfa24cf5e..4cae5a301b1 100644
--- a/python/ql/lib/semmle/python/security/dataflow/ServerSideRequestForgeryQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/ServerSideRequestForgeryQuery.qll
@@ -12,31 +12,6 @@ import semmle.python.dataflow.new.TaintTracking
 import semmle.python.Concepts
 import ServerSideRequestForgeryCustomizations::ServerSideRequestForgery
 
-/**
- * DEPRECATED: Use `FullServerSideRequestForgeryFlow` module instead.
- *
- * A taint-tracking configuration for detecting "Server-side request forgery" vulnerabilities.
- *
- * This configuration has a sanitizer to limit results to cases where attacker has full control of URL.
- * See `PartialServerSideRequestForgery` for a variant without this requirement.
- *
- * You should use the `fullyControlledRequest` to only select results where all
- * URL parts are fully controlled.
- */
-deprecated class FullServerSideRequestForgeryConfiguration extends TaintTracking::Configuration {
-  FullServerSideRequestForgeryConfiguration() { this = "FullServerSideRequestForgery" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) {
-    node instanceof Sanitizer
-    or
-    node instanceof FullUrlControlSanitizer
-  }
-}
-
 /**
  * This configuration has a sanitizer to limit results to cases where attacker has full control of URL.
  * See `PartialServerSideRequestForgery` for a variant without this requirement.
@@ -73,24 +48,6 @@ predicate fullyControlledRequest(Http::Client::Request request) {
   )
 }
 
-/**
- * DEPRECATED: Use `PartialServerSideRequestForgeryFlow` module instead.
- *
- * A taint-tracking configuration for detecting "Server-side request forgery" vulnerabilities.
- *
- * This configuration has results, even when the attacker does not have full control over the URL.
- * See `FullServerSideRequestForgeryConfiguration`, and the `fullyControlledRequest` predicate.
- */
-deprecated class PartialServerSideRequestForgeryConfiguration extends TaintTracking::Configuration {
-  PartialServerSideRequestForgeryConfiguration() { this = "PartialServerSideRequestForgery" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-}
-
 /**
  * This configuration has results, even when the attacker does not have full control over the URL.
  * See `FullServerSideRequestForgeryConfiguration`, and the `fullyControlledRequest` predicate.
diff --git a/python/ql/lib/semmle/python/security/dataflow/SqlInjectionQuery.qll b/python/ql/lib/semmle/python/security/dataflow/SqlInjectionQuery.qll
index 877e30f5090..a63590643f3 100644
--- a/python/ql/lib/semmle/python/security/dataflow/SqlInjectionQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/SqlInjectionQuery.qll
@@ -11,21 +11,6 @@ import semmle.python.dataflow.new.DataFlow
 import semmle.python.dataflow.new.TaintTracking
 import SqlInjectionCustomizations::SqlInjection
 
-/**
- * DEPRECATED: Use `SqlInjectionFlow` module instead.
- *
- * A taint-tracking configuration for detecting "SQL injection" vulnerabilities.
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "SqlInjection" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-}
-
 private module SqlInjectionConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/python/ql/lib/semmle/python/security/dataflow/StackTraceExposureQuery.qll b/python/ql/lib/semmle/python/security/dataflow/StackTraceExposureQuery.qll
index 9980aa76ea3..57ef6d7ebb2 100644
--- a/python/ql/lib/semmle/python/security/dataflow/StackTraceExposureQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/StackTraceExposureQuery.qll
@@ -11,30 +11,6 @@ import semmle.python.dataflow.new.DataFlow
 import semmle.python.dataflow.new.TaintTracking
 import StackTraceExposureCustomizations::StackTraceExposure
 
-/**
- * DEPRECATED: Use `StackTraceExposureFlow` module instead.
- *
- * A taint-tracking configuration for detecting "stack trace exposure" vulnerabilities.
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "StackTraceExposure" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-
-  // A stack trace is accessible as the `__traceback__` attribute of a caught exception.
-  //  see https://docs.python.org/3/reference/datamodel.html#traceback-objects
-  override predicate isAdditionalTaintStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
-    exists(DataFlow::AttrRead attr | attr.getAttributeName() = "__traceback__" |
-      nodeFrom = attr.getObject() and
-      nodeTo = attr
-    )
-  }
-}
-
 private module StackTraceExposureConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/python/ql/lib/semmle/python/security/dataflow/TarSlipQuery.qll b/python/ql/lib/semmle/python/security/dataflow/TarSlipQuery.qll
index 7bb008f1afb..162bfcd74cc 100644
--- a/python/ql/lib/semmle/python/security/dataflow/TarSlipQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/TarSlipQuery.qll
@@ -11,21 +11,6 @@ import semmle.python.dataflow.new.DataFlow
 import semmle.python.dataflow.new.TaintTracking
 import TarSlipCustomizations::TarSlip
 
-/**
- * DEPRECATED: Use `TarSlipFlow` module instead.
- *
- * A taint-tracking configuration for detecting "tar slip" vulnerabilities.
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "TarSlip" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-}
-
 private module TarSlipConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/python/ql/lib/semmle/python/security/dataflow/UnsafeDeserializationQuery.qll b/python/ql/lib/semmle/python/security/dataflow/UnsafeDeserializationQuery.qll
index bd067213fb5..dd6925b7998 100644
--- a/python/ql/lib/semmle/python/security/dataflow/UnsafeDeserializationQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/UnsafeDeserializationQuery.qll
@@ -11,21 +11,6 @@ import semmle.python.dataflow.new.DataFlow
 import semmle.python.dataflow.new.TaintTracking
 import UnsafeDeserializationCustomizations::UnsafeDeserialization
 
-/**
- * DEPRECATED: Use `UnsafeDeserializationFlow` module instead.
- *
- * A taint-tracking configuration for detecting "code execution from deserialization" vulnerabilities.
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "UnsafeDeserialization" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-}
-
 private module UnsafeDeserializationConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/python/ql/lib/semmle/python/security/dataflow/UnsafeShellCommandConstructionQuery.qll b/python/ql/lib/semmle/python/security/dataflow/UnsafeShellCommandConstructionQuery.qll
index 6d292a88b6c..51341cfe6cd 100644
--- a/python/ql/lib/semmle/python/security/dataflow/UnsafeShellCommandConstructionQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/UnsafeShellCommandConstructionQuery.qll
@@ -13,29 +13,6 @@ private import semmle.python.dataflow.new.TaintTracking
 private import CommandInjectionCustomizations::CommandInjection as CommandInjection
 private import semmle.python.dataflow.new.BarrierGuards
 
-/**
- * DEPRECATED: Use `UnsafeShellCommandConstructionFlow` module instead.
- *
- * A taint-tracking configuration for detecting shell command constructed from library input vulnerabilities.
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "UnsafeShellCommandConstruction" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) {
-    node instanceof Sanitizer or
-    node instanceof CommandInjection::Sanitizer // using all sanitizers from `py/command-injection`
-  }
-
-  // override to require the path doesn't have unmatched return steps
-  override DataFlow::FlowFeature getAFeature() {
-    result instanceof DataFlow::FeatureHasSourceCallContext
-  }
-}
-
 /**
  * A taint-tracking configuration for detecting "shell command constructed from library input" vulnerabilities.
  */
diff --git a/python/ql/lib/semmle/python/security/dataflow/UrlRedirectQuery.qll b/python/ql/lib/semmle/python/security/dataflow/UrlRedirectQuery.qll
index 5b44cd988ad..a9526f33ad3 100644
--- a/python/ql/lib/semmle/python/security/dataflow/UrlRedirectQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/UrlRedirectQuery.qll
@@ -11,34 +11,6 @@ import semmle.python.dataflow.new.DataFlow
 import semmle.python.dataflow.new.TaintTracking
 import UrlRedirectCustomizations::UrlRedirect as UrlRedirect
 
-/**
- * DEPRECATED: Use `UrlRedirectFlow` module instead.
- *
- * A taint-tracking configuration for detecting "URL redirection" vulnerabilities.
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "UrlRedirect" }
-
-  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) {
-    source instanceof UrlRedirect::Source and state instanceof UrlRedirect::MayContainBackslashes
-  }
-
-  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) {
-    sink instanceof UrlRedirect::Sink and state instanceof UrlRedirect::FlowState
-  }
-
-  override predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) {
-    node.(UrlRedirect::Sanitizer).sanitizes(state)
-  }
-
-  override predicate isAdditionalTaintStep(
-    DataFlow::Node nodeFrom, DataFlow::FlowState stateFrom, DataFlow::Node nodeTo,
-    DataFlow::FlowState stateTo
-  ) {
-    any(UrlRedirect::AdditionalFlowStep a).step(nodeFrom, stateFrom, nodeTo, stateTo)
-  }
-}
-
 private module UrlRedirectConfig implements DataFlow::StateConfigSig {
   class FlowState = UrlRedirect::FlowState;
 
diff --git a/python/ql/lib/semmle/python/security/dataflow/WeakSensitiveDataHashingQuery.qll b/python/ql/lib/semmle/python/security/dataflow/WeakSensitiveDataHashingQuery.qll
index 9e2803b3369..04d8846d7d0 100644
--- a/python/ql/lib/semmle/python/security/dataflow/WeakSensitiveDataHashingQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/WeakSensitiveDataHashingQuery.qll
@@ -23,30 +23,6 @@ private import semmle.python.dataflow.new.SensitiveDataSources
 module NormalHashFunction {
   import WeakSensitiveDataHashingCustomizations::NormalHashFunction
 
-  /**
-   * DEPRECATED: Use `Flow` module instead.
-   *
-   * A taint-tracking configuration for detecting use of a broken or weak
-   * cryptographic hashing algorithm on sensitive data.
-   */
-  deprecated class Configuration extends TaintTracking::Configuration {
-    Configuration() { this = "NormalHashFunction" }
-
-    override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-    override predicate isSanitizer(DataFlow::Node node) {
-      super.isSanitizer(node)
-      or
-      node instanceof Sanitizer
-    }
-
-    override predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) {
-      sensitiveDataExtraStepForCalls(node1, node2)
-    }
-  }
-
   private module Config implements DataFlow::ConfigSig {
     predicate isSource(DataFlow::Node source) { source instanceof Source }
 
@@ -73,33 +49,6 @@ module NormalHashFunction {
 module ComputationallyExpensiveHashFunction {
   import WeakSensitiveDataHashingCustomizations::ComputationallyExpensiveHashFunction
 
-  /**
-   * DEPRECATED: Use `Flow` module instead.
-   *
-   * A taint-tracking configuration for detecting use of a broken or weak
-   * cryptographic hashing algorithm on passwords.
-   *
-   * Passwords has stricter requirements on the hashing algorithm used (must be
-   * computationally expensive to prevent brute-force attacks).
-   */
-  deprecated class Configuration extends TaintTracking::Configuration {
-    Configuration() { this = "ComputationallyExpensiveHashFunction" }
-
-    override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-    override predicate isSanitizer(DataFlow::Node node) {
-      super.isSanitizer(node)
-      or
-      node instanceof Sanitizer
-    }
-
-    override predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) {
-      sensitiveDataExtraStepForCalls(node1, node2)
-    }
-  }
-
   /**
    * Passwords has stricter requirements on the hashing algorithm used (must be
    * computationally expensive to prevent brute-force attacks).
diff --git a/python/ql/lib/semmle/python/security/dataflow/XmlBombQuery.qll b/python/ql/lib/semmle/python/security/dataflow/XmlBombQuery.qll
index dcf3939bc78..e69e8ad63c6 100644
--- a/python/ql/lib/semmle/python/security/dataflow/XmlBombQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/XmlBombQuery.qll
@@ -11,24 +11,6 @@ import semmle.python.dataflow.new.DataFlow
 import semmle.python.dataflow.new.TaintTracking
 import XmlBombCustomizations::XmlBomb
 
-/**
- * DEPRECATED: Use `XmlBombFlow` module instead.
- *
- * A taint-tracking configuration for detecting "XML bomb" vulnerabilities.
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "XmlBomb" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) {
-    super.isSanitizer(node) or
-    node instanceof Sanitizer
-  }
-}
-
 private module XmlBombConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/python/ql/lib/semmle/python/security/dataflow/XpathInjectionQuery.qll b/python/ql/lib/semmle/python/security/dataflow/XpathInjectionQuery.qll
index f8a21aedba5..2a15669f6ff 100644
--- a/python/ql/lib/semmle/python/security/dataflow/XpathInjectionQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/XpathInjectionQuery.qll
@@ -11,21 +11,6 @@ import semmle.python.dataflow.new.DataFlow
 import semmle.python.dataflow.new.TaintTracking
 import XpathInjectionCustomizations::XpathInjection
 
-/**
- * DEPRECATED: Use `XpathInjectionFlow` module instead.
- *
- * A taint-tracking configuration for detecting "Xpath Injection" vulnerabilities.
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "Xpath Injection" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-}
-
 private module XpathInjectionConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/python/ql/lib/semmle/python/security/dataflow/XxeQuery.qll b/python/ql/lib/semmle/python/security/dataflow/XxeQuery.qll
index 8d85d275f1e..da7c34a5bac 100644
--- a/python/ql/lib/semmle/python/security/dataflow/XxeQuery.qll
+++ b/python/ql/lib/semmle/python/security/dataflow/XxeQuery.qll
@@ -11,24 +11,6 @@ import semmle.python.dataflow.new.DataFlow
 import semmle.python.dataflow.new.TaintTracking
 import XxeCustomizations::Xxe
 
-/**
- * DEPRECATED: Use `XxeFlow` module instead.
- *
- * A taint-tracking configuration for detecting "XML External Entity (XXE)" vulnerabilities.
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "Xxe" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) {
-    super.isSanitizer(node) or
-    node instanceof Sanitizer
-  }
-}
-
 private module XxeConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/python/ql/src/Security/CWE-020-ExternalAPIs/ExternalAPIs.qll b/python/ql/src/Security/CWE-020-ExternalAPIs/ExternalAPIs.qll
index a65569510df..d2b47c9a6a7 100644
--- a/python/ql/src/Security/CWE-020-ExternalAPIs/ExternalAPIs.qll
+++ b/python/ql/src/Security/CWE-020-ExternalAPIs/ExternalAPIs.qll
@@ -167,19 +167,6 @@ class ExternalApiDataNode extends DataFlow::Node {
   }
 }
 
-/**
- * DEPRECATED: Use `XmlBombFlow` module instead.
- *
- * A configuration for tracking flow from `RemoteFlowSource`s to `ExternalApiDataNode`s.
- */
-deprecated class UntrustedDataToExternalApiConfig extends TaintTracking::Configuration {
-  UntrustedDataToExternalApiConfig() { this = "UntrustedDataToExternalAPIConfig" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof ExternalApiDataNode }
-}
-
 private module UntrustedDataToExternalApiConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof RemoteFlowSource }
 
diff --git a/python/ql/src/semmle/python/functions/ModificationOfParameterWithDefault.qll b/python/ql/src/semmle/python/functions/ModificationOfParameterWithDefault.qll
index 68194309e1d..290087f6a71 100644
--- a/python/ql/src/semmle/python/functions/ModificationOfParameterWithDefault.qll
+++ b/python/ql/src/semmle/python/functions/ModificationOfParameterWithDefault.qll
@@ -16,37 +16,6 @@ private import semmle.python.ApiGraphs
 module ModificationOfParameterWithDefault {
   import ModificationOfParameterWithDefaultCustomizations::ModificationOfParameterWithDefault
 
-  /**
-   * DEPRECATED: Use `Flow` module instead.
-   *
-   * A data-flow configuration for detecting modifications of a parameters default value.
-   */
-  deprecated class Configuration extends DataFlow::Configuration {
-    /** Record whether the default value being tracked is non-empty. */
-    boolean nonEmptyDefault;
-
-    Configuration() {
-      nonEmptyDefault in [true, false] and
-      this = "ModificationOfParameterWithDefault:" + nonEmptyDefault.toString()
-    }
-
-    override predicate isSource(DataFlow::Node source) {
-      source.(Source).isNonEmpty() = nonEmptyDefault
-    }
-
-    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-    override predicate isBarrier(DataFlow::Node node) {
-      // if we are tracking a non-empty default, then it is ok to modify empty values,
-      // so our tracking ends at those.
-      nonEmptyDefault = true and node instanceof MustBeEmpty
-      or
-      // if we are tracking a empty default, then it is ok to modify non-empty values,
-      // so our tracking ends at those.
-      nonEmptyDefault = false and node instanceof MustBeNonEmpty
-    }
-  }
-
   private module Config implements DataFlow::StateConfigSig {
     class FlowState = boolean;
 
diff --git a/python/ql/test/TestUtilities/dataflow/DataflowQueryTest.qll b/python/ql/test/TestUtilities/dataflow/DataflowQueryTest.qll
index 19af6cbf807..e9f13aaaa47 100644
--- a/python/ql/test/TestUtilities/dataflow/DataflowQueryTest.qll
+++ b/python/ql/test/TestUtilities/dataflow/DataflowQueryTest.qll
@@ -103,15 +103,3 @@ module FromTaintTrackingStateConfig<DataFlow::StateConfigSig C> {
 
   import MakeQueryTest<Impl>
 }
-
-deprecated signature class LegacyConfiguration extends DataFlow::Configuration;
-
-deprecated module FromLegacyConfiguration<LegacyConfiguration C> {
-  module Impl implements QueryTestSig {
-    predicate isSink(DataFlow::Node sink) { any(C c).isSink(sink) or any(C c).isSink(sink, _) }
-
-    predicate flowTo(DataFlow::Node sink) { any(C c).hasFlowTo(sink) }
-  }
-
-  import MakeQueryTest<Impl>
-}
diff --git a/python/ql/test/experimental/import-resolution/importflow.expected b/python/ql/test/experimental/import-resolution/importflow.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/experimental/import-resolution/importflow.expected
+++ b/python/ql/test/experimental/import-resolution/importflow.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/experimental/import-resolution/imports.expected b/python/ql/test/experimental/import-resolution/imports.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/experimental/import-resolution/imports.expected
+++ b/python/ql/test/experimental/import-resolution/imports.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/experimental/library-tests/CallGraph-implicit-init/InlineCallGraphTest.expected b/python/ql/test/experimental/library-tests/CallGraph-implicit-init/InlineCallGraphTest.expected
index 802b8ff5d13..ff7202ce84d 100644
--- a/python/ql/test/experimental/library-tests/CallGraph-implicit-init/InlineCallGraphTest.expected
+++ b/python/ql/test/experimental/library-tests/CallGraph-implicit-init/InlineCallGraphTest.expected
@@ -1,5 +1,4 @@
 testFailures
-failures
 debug_callableNotUnique
 pointsTo_found_typeTracker_notFound
 typeTracker_found_pointsTo_notFound
diff --git a/python/ql/test/experimental/library-tests/CallGraph-imports/InlineCallGraphTest.expected b/python/ql/test/experimental/library-tests/CallGraph-imports/InlineCallGraphTest.expected
index 802b8ff5d13..ff7202ce84d 100644
--- a/python/ql/test/experimental/library-tests/CallGraph-imports/InlineCallGraphTest.expected
+++ b/python/ql/test/experimental/library-tests/CallGraph-imports/InlineCallGraphTest.expected
@@ -1,5 +1,4 @@
 testFailures
-failures
 debug_callableNotUnique
 pointsTo_found_typeTracker_notFound
 typeTracker_found_pointsTo_notFound
diff --git a/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.expected b/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.expected
index ef82a9ad20c..b353309e852 100644
--- a/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.expected
+++ b/python/ql/test/experimental/library-tests/CallGraph/InlineCallGraphTest.expected
@@ -1,5 +1,4 @@
 testFailures
-failures
 debug_callableNotUnique
 pointsTo_found_typeTracker_notFound
 | code/class_attr_assign.py:10:9:10:27 | ControlFlowNode for Attribute() | my_func |
diff --git a/python/ql/test/experimental/meta/inline-taint-test-demo/InlineTaintTest.expected b/python/ql/test/experimental/meta/inline-taint-test-demo/InlineTaintTest.expected
index e0ad49ff807..400399346d8 100644
--- a/python/ql/test/experimental/meta/inline-taint-test-demo/InlineTaintTest.expected
+++ b/python/ql/test/experimental/meta/inline-taint-test-demo/InlineTaintTest.expected
@@ -5,4 +5,3 @@ untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 | taint_test.py:37:24:37:40 | taint_test.py:37 | ERROR, you should add `# $ MISSING: tainted` annotation | should_be_tainted |
 testFailures
 | taint_test.py:41:20:41:21 | ts | Fixed missing result: tainted |
-failures
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/DataflowQueryTest.expected b/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/DataflowQueryTest.expected
index 9ce23b4c553..2fad7bb9a84 100644
--- a/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/DataflowQueryTest.expected
+++ b/python/ql/test/experimental/query-tests/Security/CWE-022-UnsafeUnpacking/DataflowQueryTest.expected
@@ -1,3 +1,2 @@
 missingAnnotationOnSink
 testFailures
-failures
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-074-RemoteCommandExecution/ConceptsTest.expected b/python/ql/test/experimental/query-tests/Security/CWE-074-RemoteCommandExecution/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/experimental/query-tests/Security/CWE-074-RemoteCommandExecution/ConceptsTest.expected
+++ b/python/ql/test/experimental/query-tests/Security/CWE-074-RemoteCommandExecution/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-074-RemoteCommandExecution/DataflowQueryTest.expected b/python/ql/test/experimental/query-tests/Security/CWE-074-RemoteCommandExecution/DataflowQueryTest.expected
index 9ce23b4c553..2fad7bb9a84 100644
--- a/python/ql/test/experimental/query-tests/Security/CWE-074-RemoteCommandExecution/DataflowQueryTest.expected
+++ b/python/ql/test/experimental/query-tests/Security/CWE-074-RemoteCommandExecution/DataflowQueryTest.expected
@@ -1,3 +1,2 @@
 missingAnnotationOnSink
 testFailures
-failures
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-409/DataflowQueryTest.expected b/python/ql/test/experimental/query-tests/Security/CWE-409/DataflowQueryTest.expected
index 9ce23b4c553..2fad7bb9a84 100644
--- a/python/ql/test/experimental/query-tests/Security/CWE-409/DataflowQueryTest.expected
+++ b/python/ql/test/experimental/query-tests/Security/CWE-409/DataflowQueryTest.expected
@@ -1,3 +1,2 @@
 missingAnnotationOnSink
 testFailures
-failures
diff --git a/python/ql/test/library-tests/ApiGraphs/py2/use.expected b/python/ql/test/library-tests/ApiGraphs/py2/use.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/ApiGraphs/py2/use.expected
+++ b/python/ql/test/library-tests/ApiGraphs/py2/use.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/InlineExpectationsTest/missing-relevant-tag/Test.expected b/python/ql/test/library-tests/InlineExpectationsTest/missing-relevant-tag/Test.expected
index 8dd0c425627..561ab92d635 100644
--- a/python/ql/test/library-tests/InlineExpectationsTest/missing-relevant-tag/Test.expected
+++ b/python/ql/test/library-tests/InlineExpectationsTest/missing-relevant-tag/Test.expected
@@ -1,4 +1,2 @@
-testFailures
 | test.py:1:1:1:3 | foo | Tag mismatch: Actual result with tag 'foo' that is not part of getARelevantTag() |
 | test.py:4:1:4:3 | foo | Tag mismatch: Actual result with tag 'foo' that is not part of getARelevantTag() |
-failures
diff --git a/python/ql/test/library-tests/dataflow/basic/localFlowStepTest.expected b/python/ql/test/library-tests/dataflow/basic/localFlowStepTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/dataflow/basic/localFlowStepTest.expected
+++ b/python/ql/test/library-tests/dataflow/basic/localFlowStepTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/dataflow/basic/maximalFlowTest.expected b/python/ql/test/library-tests/dataflow/basic/maximalFlowTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/dataflow/basic/maximalFlowTest.expected
+++ b/python/ql/test/library-tests/dataflow/basic/maximalFlowTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/dataflow/calls/DataFlowCallTest.expected b/python/ql/test/library-tests/dataflow/calls/DataFlowCallTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/dataflow/calls/DataFlowCallTest.expected
+++ b/python/ql/test/library-tests/dataflow/calls/DataFlowCallTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/dataflow/coverage-py2/argumentRoutingTest.expected b/python/ql/test/library-tests/dataflow/coverage-py2/argumentRoutingTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/dataflow/coverage-py2/argumentRoutingTest.expected
+++ b/python/ql/test/library-tests/dataflow/coverage-py2/argumentRoutingTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/dataflow/coverage-py3/argumentRoutingTest.expected b/python/ql/test/library-tests/dataflow/coverage-py3/argumentRoutingTest.expected
index f7763cc9c1e..a0001b7c55c 100644
--- a/python/ql/test/library-tests/dataflow/coverage-py3/argumentRoutingTest.expected
+++ b/python/ql/test/library-tests/dataflow/coverage-py3/argumentRoutingTest.expected
@@ -1,6 +1,4 @@
-testFailures
 | classes.py:54:44:54:107 | Comment #$ arg1="with_length_hint" func=With_length_hint.__length_hint__ | Missing result: arg1="with_length_hint" |
 | classes.py:54:44:54:107 | Comment #$ arg1="with_length_hint" func=With_length_hint.__length_hint__ | Missing result: func=With_length_hint.__length_hint__ |
 | classes.py:71:32:71:77 | Comment #$ arg1="with_index" func=With_index.__index__ | Missing result: arg1="with_index" |
 | classes.py:71:32:71:77 | Comment #$ arg1="with_index" func=With_index.__index__ | Missing result: func=With_index.__index__ |
-failures
diff --git a/python/ql/test/library-tests/dataflow/coverage/NormalDataflowTest.expected b/python/ql/test/library-tests/dataflow/coverage/NormalDataflowTest.expected
index 9ce23b4c553..2fad7bb9a84 100644
--- a/python/ql/test/library-tests/dataflow/coverage/NormalDataflowTest.expected
+++ b/python/ql/test/library-tests/dataflow/coverage/NormalDataflowTest.expected
@@ -1,3 +1,2 @@
 missingAnnotationOnSink
 testFailures
-failures
diff --git a/python/ql/test/library-tests/dataflow/coverage/argumentRoutingTest.expected b/python/ql/test/library-tests/dataflow/coverage/argumentRoutingTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/dataflow/coverage/argumentRoutingTest.expected
+++ b/python/ql/test/library-tests/dataflow/coverage/argumentRoutingTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/dataflow/exceptions/NormalDataflowTest.expected b/python/ql/test/library-tests/dataflow/exceptions/NormalDataflowTest.expected
index 9ce23b4c553..2fad7bb9a84 100644
--- a/python/ql/test/library-tests/dataflow/exceptions/NormalDataflowTest.expected
+++ b/python/ql/test/library-tests/dataflow/exceptions/NormalDataflowTest.expected
@@ -1,3 +1,2 @@
 missingAnnotationOnSink
 testFailures
-failures
diff --git a/python/ql/test/library-tests/dataflow/fieldflow/NormalDataflowTest.expected b/python/ql/test/library-tests/dataflow/fieldflow/NormalDataflowTest.expected
index 9ce23b4c553..2fad7bb9a84 100644
--- a/python/ql/test/library-tests/dataflow/fieldflow/NormalDataflowTest.expected
+++ b/python/ql/test/library-tests/dataflow/fieldflow/NormalDataflowTest.expected
@@ -1,3 +1,2 @@
 missingAnnotationOnSink
 testFailures
-failures
diff --git a/python/ql/test/library-tests/dataflow/fieldflow/UnresolvedCalls.expected b/python/ql/test/library-tests/dataflow/fieldflow/UnresolvedCalls.expected
index 96182702074..593b6e11887 100644
--- a/python/ql/test/library-tests/dataflow/fieldflow/UnresolvedCalls.expected
+++ b/python/ql/test/library-tests/dataflow/fieldflow/UnresolvedCalls.expected
@@ -1,6 +1,4 @@
-testFailures
 | test.py:4:17:4:60 | ControlFlowNode for Attribute() | Unexpected result: unresolved_call=os.path.dirname(..) |
 | test.py:4:33:4:59 | ControlFlowNode for Attribute() | Unexpected result: unresolved_call=os.path.dirname(..) |
 | test_dict.py:4:17:4:60 | ControlFlowNode for Attribute() | Unexpected result: unresolved_call=os.path.dirname(..) |
 | test_dict.py:4:33:4:59 | ControlFlowNode for Attribute() | Unexpected result: unresolved_call=os.path.dirname(..) |
-failures
diff --git a/python/ql/test/library-tests/dataflow/global-flow/accesses.expected b/python/ql/test/library-tests/dataflow/global-flow/accesses.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/dataflow/global-flow/accesses.expected
+++ b/python/ql/test/library-tests/dataflow/global-flow/accesses.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/dataflow/global-or-captured-vars/test.expected b/python/ql/test/library-tests/dataflow/global-or-captured-vars/test.expected
new file mode 100644
index 00000000000..020c338fd19
--- /dev/null
+++ b/python/ql/test/library-tests/dataflow/global-or-captured-vars/test.expected
@@ -0,0 +1,3 @@
+argumentToEnsureNotTaintedNotMarkedAsSpurious
+untaintedArgumentToEnsureTaintedNotMarkedAsMissing
+testFailures
diff --git a/python/ql/test/library-tests/dataflow/global-or-captured-vars/test.py b/python/ql/test/library-tests/dataflow/global-or-captured-vars/test.py
new file mode 100644
index 00000000000..7719021890f
--- /dev/null
+++ b/python/ql/test/library-tests/dataflow/global-or-captured-vars/test.py
@@ -0,0 +1,118 @@
+import threading 
+import time
+
+# Test 1
+# TP - Flow is tracked through a global variable
+foo1 = None
+
+def bar1():
+    time.sleep(1)
+    ensure_tainted(foo1) # $tainted
+
+# The intent of these tests is to test how dataflow is handled through shared state accessed by different threads; 
+# but the presense or absense of the actual call to start a thread does not affect the results (there is no special modelling for Thread)
+# threading.Thread(target=bar).start() 
+
+foo1 = TAINTED_STRING
+
+# Test 2
+# FN - Flow is *not* tracked through an access path on a global variable
+foo2 = []
+
+def bar2():
+    time.sleep(1)
+    ensure_tainted(foo2[0]) # $MISSING:tainted
+
+threading.Thread(target=bar2).start()
+
+foo2.append(TAINTED_STRING)
+
+# Test 3
+# FN - Flow is not found even when there is a direct call
+foo3 = []
+
+def bar3():
+    time.sleep(1)
+    ensure_tainted(foo2[0]) # $MISSING:tainted
+
+foo3.append(TAINTED_STRING)
+bar3()
+
+# Tast 4
+# TP - Sanity check: Flow is found through a ListElement directly without a call
+foo4 = []
+foo4.append(TAINTED_STRING)
+ensure_tainted(foo4[0]) # $tainted
+
+# Test 5
+# FN - Flow is *not* tracked through a shared captured but non-global variable
+def test5():
+    foo5 = None 
+
+    def bar5():
+        time.sleep(1)
+        ensure_tainted(foo5) # $MISSING:tainted
+
+    threading.Thread(target=bar5).start() # Only the presense of this thread call makes this an FN rather than a TN
+
+    foo5 = TAINTED_STRING
+
+ # Test 6
+ # TP - Flow is tracked through a shared captured but non-global variable with a direct call
+def test6():
+    foo6 = []
+
+    def bar6():
+        time.sleep(1)
+        ensure_tainted(foo6[0]) # $tainted
+
+    foo6.append(TAINTED_STRING)
+    bar6()
+
+
+# Test 7
+# FN - Flow is *not* found through an access path on a global variable that's also used as a parameter
+# We'd like to cover this case in order to be able to cover this CVE: https://github.com/github/codeql-python-CVE-coverage/issues/3176
+
+foo7 = []
+
+def bar7():
+    time.sleep(1)
+    ensure_tainted(foo7[0]) # $MISSING: tainted
+
+def baz7(loc_foo):
+    loc_foo.append(TAINTED_STRING)
+
+threading.Thread(target=bar7).start()
+
+baz7(foo7)
+
+# Test 8
+# FN - Flow is also *not* found in the above case through a direct call 
+
+foo8 = []
+
+def bar8():
+    time.sleep(1)
+    ensure_tainted(foo8[0]) # $MISSING: tainted
+
+def baz8(loc_foo):
+    loc_foo.append(TAINTED_STRING)
+
+baz8(foo8)
+bar8()
+
+# Test 9
+# TP - Flow is found in the above case when the variable is captured rather than global
+
+def test9():
+    foo9 = []
+    def bar9():
+        time.sleep(1)
+        ensure_tainted(foo9[0]) # $tainted
+
+    def baz9(loc_foo):
+        loc_foo.append(TAINTED_STRING)
+
+    baz9(foo9)
+    bar9()
\ No newline at end of file
diff --git a/python/ql/test/library-tests/dataflow/global-or-captured-vars/test.ql b/python/ql/test/library-tests/dataflow/global-or-captured-vars/test.ql
new file mode 100644
index 00000000000..dd01b5d3e34
--- /dev/null
+++ b/python/ql/test/library-tests/dataflow/global-or-captured-vars/test.ql
@@ -0,0 +1,3 @@
+import python
+import experimental.meta.InlineTaintTest
+import MakeInlineTaintTest<TestTaintTrackingConfig>
diff --git a/python/ql/test/library-tests/dataflow/match/NormalDataflowTest.expected b/python/ql/test/library-tests/dataflow/match/NormalDataflowTest.expected
index 9ce23b4c553..2fad7bb9a84 100644
--- a/python/ql/test/library-tests/dataflow/match/NormalDataflowTest.expected
+++ b/python/ql/test/library-tests/dataflow/match/NormalDataflowTest.expected
@@ -1,3 +1,2 @@
 missingAnnotationOnSink
 testFailures
-failures
diff --git a/python/ql/test/library-tests/dataflow/model-summaries/InlineTaintTest.expected b/python/ql/test/library-tests/dataflow/model-summaries/InlineTaintTest.expected
index 366de37b867..020c338fd19 100644
--- a/python/ql/test/library-tests/dataflow/model-summaries/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/dataflow/model-summaries/InlineTaintTest.expected
@@ -1,4 +1,3 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-failures
diff --git a/python/ql/test/library-tests/dataflow/model-summaries/NormalDataflowTest.expected b/python/ql/test/library-tests/dataflow/model-summaries/NormalDataflowTest.expected
index 9ce23b4c553..2fad7bb9a84 100644
--- a/python/ql/test/library-tests/dataflow/model-summaries/NormalDataflowTest.expected
+++ b/python/ql/test/library-tests/dataflow/model-summaries/NormalDataflowTest.expected
@@ -1,3 +1,2 @@
 missingAnnotationOnSink
 testFailures
-failures
diff --git a/python/ql/test/library-tests/dataflow/module-initialization/localFlow.expected b/python/ql/test/library-tests/dataflow/module-initialization/localFlow.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/dataflow/module-initialization/localFlow.expected
+++ b/python/ql/test/library-tests/dataflow/module-initialization/localFlow.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/dataflow/path-graph/PathNodes.expected b/python/ql/test/library-tests/dataflow/path-graph/PathNodes.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/dataflow/path-graph/PathNodes.expected
+++ b/python/ql/test/library-tests/dataflow/path-graph/PathNodes.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/dataflow/sensitive-data/TestSensitiveDataSources.expected b/python/ql/test/library-tests/dataflow/sensitive-data/TestSensitiveDataSources.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/dataflow/sensitive-data/TestSensitiveDataSources.expected
+++ b/python/ql/test/library-tests/dataflow/sensitive-data/TestSensitiveDataSources.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/dataflow/summaries/InlineTaintTest.expected b/python/ql/test/library-tests/dataflow/summaries/InlineTaintTest.expected
index 366de37b867..020c338fd19 100644
--- a/python/ql/test/library-tests/dataflow/summaries/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/dataflow/summaries/InlineTaintTest.expected
@@ -1,4 +1,3 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-failures
diff --git a/python/ql/test/library-tests/dataflow/summaries/NormalTaintTrackingTest.expected b/python/ql/test/library-tests/dataflow/summaries/NormalTaintTrackingTest.expected
index 9ce23b4c553..2fad7bb9a84 100644
--- a/python/ql/test/library-tests/dataflow/summaries/NormalTaintTrackingTest.expected
+++ b/python/ql/test/library-tests/dataflow/summaries/NormalTaintTrackingTest.expected
@@ -1,3 +1,2 @@
 missingAnnotationOnSink
 testFailures
-failures
diff --git a/python/ql/test/library-tests/dataflow/tainttracking/commonSanitizer/InlineTaintTest.expected b/python/ql/test/library-tests/dataflow/tainttracking/commonSanitizer/InlineTaintTest.expected
index 366de37b867..020c338fd19 100644
--- a/python/ql/test/library-tests/dataflow/tainttracking/commonSanitizer/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/dataflow/tainttracking/commonSanitizer/InlineTaintTest.expected
@@ -1,4 +1,3 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-failures
diff --git a/python/ql/test/library-tests/dataflow/tainttracking/customSanitizer/InlineTaintTest.expected b/python/ql/test/library-tests/dataflow/tainttracking/customSanitizer/InlineTaintTest.expected
index 5a7d215048d..86d49b2b249 100644
--- a/python/ql/test/library-tests/dataflow/tainttracking/customSanitizer/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/dataflow/tainttracking/customSanitizer/InlineTaintTest.expected
@@ -1,7 +1,6 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-failures
 isSanitizer
 | test.py:21:39:21:39 | ControlFlowNode for s |
 | test.py:34:39:34:39 | ControlFlowNode for s |
diff --git a/python/ql/test/library-tests/dataflow/tainttracking/defaultAdditionalTaintStep-py3/InlineTaintTest.expected b/python/ql/test/library-tests/dataflow/tainttracking/defaultAdditionalTaintStep-py3/InlineTaintTest.expected
index 366de37b867..020c338fd19 100644
--- a/python/ql/test/library-tests/dataflow/tainttracking/defaultAdditionalTaintStep-py3/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/dataflow/tainttracking/defaultAdditionalTaintStep-py3/InlineTaintTest.expected
@@ -1,4 +1,3 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-failures
diff --git a/python/ql/test/library-tests/dataflow/tainttracking/defaultAdditionalTaintStep/InlineTaintTest.expected b/python/ql/test/library-tests/dataflow/tainttracking/defaultAdditionalTaintStep/InlineTaintTest.expected
index 366de37b867..020c338fd19 100644
--- a/python/ql/test/library-tests/dataflow/tainttracking/defaultAdditionalTaintStep/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/dataflow/tainttracking/defaultAdditionalTaintStep/InlineTaintTest.expected
@@ -1,4 +1,3 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-failures
diff --git a/python/ql/test/library-tests/dataflow/tainttracking/generator-flow/InlineTaintTest.expected b/python/ql/test/library-tests/dataflow/tainttracking/generator-flow/InlineTaintTest.expected
index 366de37b867..020c338fd19 100644
--- a/python/ql/test/library-tests/dataflow/tainttracking/generator-flow/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/dataflow/tainttracking/generator-flow/InlineTaintTest.expected
@@ -1,4 +1,3 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-failures
diff --git a/python/ql/test/library-tests/dataflow/tainttracking/generator-flow/NormalDataflowTest.expected b/python/ql/test/library-tests/dataflow/tainttracking/generator-flow/NormalDataflowTest.expected
index 9ce23b4c553..2fad7bb9a84 100644
--- a/python/ql/test/library-tests/dataflow/tainttracking/generator-flow/NormalDataflowTest.expected
+++ b/python/ql/test/library-tests/dataflow/tainttracking/generator-flow/NormalDataflowTest.expected
@@ -1,3 +1,2 @@
 missingAnnotationOnSink
 testFailures
-failures
diff --git a/python/ql/test/library-tests/dataflow/tainttracking/isinstance/InlineTaintTest.expected b/python/ql/test/library-tests/dataflow/tainttracking/isinstance/InlineTaintTest.expected
index 366de37b867..020c338fd19 100644
--- a/python/ql/test/library-tests/dataflow/tainttracking/isinstance/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/dataflow/tainttracking/isinstance/InlineTaintTest.expected
@@ -1,4 +1,3 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-failures
diff --git a/python/ql/test/library-tests/dataflow/tainttracking/unwanted-global-flow/InlineTaintTest.expected b/python/ql/test/library-tests/dataflow/tainttracking/unwanted-global-flow/InlineTaintTest.expected
index 366de37b867..020c338fd19 100644
--- a/python/ql/test/library-tests/dataflow/tainttracking/unwanted-global-flow/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/dataflow/tainttracking/unwanted-global-flow/InlineTaintTest.expected
@@ -1,4 +1,3 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-failures
diff --git a/python/ql/test/library-tests/dataflow/typetracking-summaries/tracked.expected b/python/ql/test/library-tests/dataflow/typetracking-summaries/tracked.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/dataflow/typetracking-summaries/tracked.expected
+++ b/python/ql/test/library-tests/dataflow/typetracking-summaries/tracked.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/dataflow/typetracking/tracked.expected b/python/ql/test/library-tests/dataflow/typetracking/tracked.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/dataflow/typetracking/tracked.expected
+++ b/python/ql/test/library-tests/dataflow/typetracking/tracked.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/dataflow/typetracking_imports/tracked.expected b/python/ql/test/library-tests/dataflow/typetracking_imports/tracked.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/dataflow/typetracking_imports/tracked.expected
+++ b/python/ql/test/library-tests/dataflow/typetracking_imports/tracked.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/dataflow/variable-capture/CaptureTest.expected b/python/ql/test/library-tests/dataflow/variable-capture/CaptureTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/dataflow/variable-capture/CaptureTest.expected
+++ b/python/ql/test/library-tests/dataflow/variable-capture/CaptureTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/essa/ssa-compute/UseUse.expected b/python/ql/test/library-tests/essa/ssa-compute/UseUse.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/essa/ssa-compute/UseUse.expected
+++ b/python/ql/test/library-tests/essa/ssa-compute/UseUse.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/aioch/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/aioch/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/aioch/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/aioch/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/aiofile/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/aiofile/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/aiofile/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/aiofile/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/aiofiles/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/aiofiles/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/aiofiles/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/aiofiles/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/aiohttp/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/aiohttp/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/aiohttp/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/aiohttp/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/aiohttp/InlineTaintTest.expected b/python/ql/test/library-tests/frameworks/aiohttp/InlineTaintTest.expected
index 366de37b867..020c338fd19 100644
--- a/python/ql/test/library-tests/frameworks/aiohttp/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/frameworks/aiohttp/InlineTaintTest.expected
@@ -1,4 +1,3 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/aiomysql/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/aiomysql/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/aiomysql/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/aiomysql/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/aiopg/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/aiopg/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/aiopg/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/aiopg/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/aiosqlite/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/aiosqlite/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/aiosqlite/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/aiosqlite/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/anyio/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/anyio/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/anyio/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/anyio/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/asyncpg/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/asyncpg/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/asyncpg/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/asyncpg/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/asyncpg/MaDTest.expected b/python/ql/test/library-tests/frameworks/asyncpg/MaDTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/asyncpg/MaDTest.expected
+++ b/python/ql/test/library-tests/frameworks/asyncpg/MaDTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/baize/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/baize/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/baize/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/baize/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/bottle/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/bottle/ConceptsTest.expected
index a74f2c23cda..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/bottle/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/bottle/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
\ No newline at end of file
diff --git a/python/ql/test/library-tests/frameworks/bottle/InlineTaintTest.expected b/python/ql/test/library-tests/frameworks/bottle/InlineTaintTest.expected
index a1a78355397..020c338fd19 100644
--- a/python/ql/test/library-tests/frameworks/bottle/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/frameworks/bottle/InlineTaintTest.expected
@@ -1,4 +1,3 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-failures
\ No newline at end of file
diff --git a/python/ql/test/library-tests/frameworks/cassandra-driver/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/cassandra-driver/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/cassandra-driver/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/cassandra-driver/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/cherrypy/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/cherrypy/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/cherrypy/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/cherrypy/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/clickhouse_driver/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/clickhouse_driver/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/clickhouse_driver/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/clickhouse_driver/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/crypto/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/crypto/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/crypto/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/crypto/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/cryptodome/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/cryptodome/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/cryptodome/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/cryptodome/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/cryptography/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/cryptography/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/cryptography/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/cryptography/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/cx_Oracle/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/cx_Oracle/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/cx_Oracle/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/cx_Oracle/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/dill/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/dill/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/dill/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/dill/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/django-orm/NormalDataflowTest.expected b/python/ql/test/library-tests/frameworks/django-orm/NormalDataflowTest.expected
index 9ce23b4c553..2fad7bb9a84 100644
--- a/python/ql/test/library-tests/frameworks/django-orm/NormalDataflowTest.expected
+++ b/python/ql/test/library-tests/frameworks/django-orm/NormalDataflowTest.expected
@@ -1,3 +1,2 @@
 missingAnnotationOnSink
 testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/django-v1/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/django-v1/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/django-v1/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/django-v1/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/django-v2-v3/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/django-v2-v3/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/django-v2-v3/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/django-v2-v3/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/django-v2-v3/InlineTaintTest.expected b/python/ql/test/library-tests/frameworks/django-v2-v3/InlineTaintTest.expected
index 366de37b867..020c338fd19 100644
--- a/python/ql/test/library-tests/frameworks/django-v2-v3/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/frameworks/django-v2-v3/InlineTaintTest.expected
@@ -1,4 +1,3 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/django/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/django/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/django/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/django/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/fabric/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/fabric/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/fabric/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/fabric/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/fabric/InlineTaintTest.expected b/python/ql/test/library-tests/frameworks/fabric/InlineTaintTest.expected
index 366de37b867..020c338fd19 100644
--- a/python/ql/test/library-tests/frameworks/fabric/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/frameworks/fabric/InlineTaintTest.expected
@@ -1,4 +1,3 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/fastapi/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/fastapi/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/fastapi/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/fastapi/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/fastapi/InlineTaintTest.expected b/python/ql/test/library-tests/frameworks/fastapi/InlineTaintTest.expected
index 366de37b867..020c338fd19 100644
--- a/python/ql/test/library-tests/frameworks/fastapi/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/frameworks/fastapi/InlineTaintTest.expected
@@ -1,4 +1,3 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/flask/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/flask/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/flask/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/flask/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/flask/InlineTaintTest.expected b/python/ql/test/library-tests/frameworks/flask/InlineTaintTest.expected
index 366de37b867..020c338fd19 100644
--- a/python/ql/test/library-tests/frameworks/flask/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/frameworks/flask/InlineTaintTest.expected
@@ -1,4 +1,3 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/flask_admin/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/flask_admin/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/flask_admin/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/flask_admin/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/flask_admin/InlineTaintTest.expected b/python/ql/test/library-tests/frameworks/flask_admin/InlineTaintTest.expected
index 366de37b867..020c338fd19 100644
--- a/python/ql/test/library-tests/frameworks/flask_admin/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/frameworks/flask_admin/InlineTaintTest.expected
@@ -1,4 +1,3 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/flask_sqlalchemy/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/flask_sqlalchemy/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/flask_sqlalchemy/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/flask_sqlalchemy/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/flask_sqlalchemy/InlineTaintTest.expected b/python/ql/test/library-tests/frameworks/flask_sqlalchemy/InlineTaintTest.expected
index 366de37b867..020c338fd19 100644
--- a/python/ql/test/library-tests/frameworks/flask_sqlalchemy/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/frameworks/flask_sqlalchemy/InlineTaintTest.expected
@@ -1,4 +1,3 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/gradio/source_test.expected b/python/ql/test/library-tests/frameworks/gradio/source_test.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/gradio/source_test.expected
+++ b/python/ql/test/library-tests/frameworks/gradio/source_test.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/httpx/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/httpx/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/httpx/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/httpx/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/idna/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/idna/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/idna/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/idna/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/idna/InlineTaintTest.expected b/python/ql/test/library-tests/frameworks/idna/InlineTaintTest.expected
index 366de37b867..020c338fd19 100644
--- a/python/ql/test/library-tests/frameworks/idna/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/frameworks/idna/InlineTaintTest.expected
@@ -1,4 +1,3 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/internal-ql-helpers/PoorMansFunctionResolutionTest.expected b/python/ql/test/library-tests/frameworks/internal-ql-helpers/PoorMansFunctionResolutionTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/internal-ql-helpers/PoorMansFunctionResolutionTest.expected
+++ b/python/ql/test/library-tests/frameworks/internal-ql-helpers/PoorMansFunctionResolutionTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/invoke/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/invoke/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/invoke/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/invoke/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/jmespath/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/jmespath/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/jmespath/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/jmespath/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/jmespath/InlineTaintTest.expected b/python/ql/test/library-tests/frameworks/jmespath/InlineTaintTest.expected
index 366de37b867..020c338fd19 100644
--- a/python/ql/test/library-tests/frameworks/jmespath/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/frameworks/jmespath/InlineTaintTest.expected
@@ -1,4 +1,3 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/joblib/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/joblib/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/joblib/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/joblib/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/jsonpickle/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/jsonpickle/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/jsonpickle/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/jsonpickle/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/libtaxii/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/libtaxii/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/libtaxii/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/libtaxii/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/lxml/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/lxml/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/lxml/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/lxml/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/markupsafe/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/markupsafe/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/markupsafe/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/markupsafe/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/markupsafe/InlineTaintTest.expected b/python/ql/test/library-tests/frameworks/markupsafe/InlineTaintTest.expected
index 366de37b867..020c338fd19 100644
--- a/python/ql/test/library-tests/frameworks/markupsafe/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/frameworks/markupsafe/InlineTaintTest.expected
@@ -1,4 +1,3 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/multidict/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/multidict/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/multidict/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/multidict/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/multidict/InlineTaintTest.expected b/python/ql/test/library-tests/frameworks/multidict/InlineTaintTest.expected
index 366de37b867..020c338fd19 100644
--- a/python/ql/test/library-tests/frameworks/multidict/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/frameworks/multidict/InlineTaintTest.expected
@@ -1,4 +1,3 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/mysql-connector-python/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/mysql-connector-python/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/mysql-connector-python/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/mysql-connector-python/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/mysqldb/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/mysqldb/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/mysqldb/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/mysqldb/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/numpy/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/numpy/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/numpy/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/numpy/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/oracledb/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/oracledb/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/oracledb/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/oracledb/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/pandas/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/pandas/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/pandas/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/pandas/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/paramiko/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/paramiko/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/paramiko/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/paramiko/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/peewee/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/peewee/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/peewee/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/peewee/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/peewee/InlineTaintTest.expected b/python/ql/test/library-tests/frameworks/peewee/InlineTaintTest.expected
index 366de37b867..020c338fd19 100644
--- a/python/ql/test/library-tests/frameworks/peewee/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/frameworks/peewee/InlineTaintTest.expected
@@ -1,4 +1,3 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/pexpect/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/pexpect/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/pexpect/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/pexpect/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/phoenixdb/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/phoenixdb/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/phoenixdb/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/phoenixdb/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/psycopg/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/psycopg/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/psycopg/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/psycopg/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/pycurl/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/pycurl/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/pycurl/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/pycurl/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/pymssql/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/pymssql/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/pymssql/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/pymssql/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/pymysql/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/pymysql/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/pymysql/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/pymysql/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/pyodbc/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/pyodbc/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/pyodbc/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/pyodbc/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/pyramid/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/pyramid/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/pyramid/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/pyramid/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/pyramid/InlineTaintTest.expected b/python/ql/test/library-tests/frameworks/pyramid/InlineTaintTest.expected
index 366de37b867..020c338fd19 100644
--- a/python/ql/test/library-tests/frameworks/pyramid/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/frameworks/pyramid/InlineTaintTest.expected
@@ -1,4 +1,3 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/requests/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/requests/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/requests/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/requests/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/requests/InlineTaintTest.expected b/python/ql/test/library-tests/frameworks/requests/InlineTaintTest.expected
index 366de37b867..020c338fd19 100644
--- a/python/ql/test/library-tests/frameworks/requests/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/frameworks/requests/InlineTaintTest.expected
@@ -1,4 +1,3 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/rest_framework/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/rest_framework/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/rest_framework/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/rest_framework/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/rest_framework/InlineTaintTest.expected b/python/ql/test/library-tests/frameworks/rest_framework/InlineTaintTest.expected
index 366de37b867..020c338fd19 100644
--- a/python/ql/test/library-tests/frameworks/rest_framework/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/frameworks/rest_framework/InlineTaintTest.expected
@@ -1,4 +1,3 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/rsa/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/rsa/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/rsa/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/rsa/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/rsa/InlineTaintTest.expected b/python/ql/test/library-tests/frameworks/rsa/InlineTaintTest.expected
index 366de37b867..020c338fd19 100644
--- a/python/ql/test/library-tests/frameworks/rsa/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/frameworks/rsa/InlineTaintTest.expected
@@ -1,4 +1,3 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/ruamel.yaml/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/ruamel.yaml/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/ruamel.yaml/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/ruamel.yaml/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/sanic/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/sanic/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/sanic/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/sanic/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/serverless/InlineTaintTest.expected b/python/ql/test/library-tests/frameworks/serverless/InlineTaintTest.expected
index 366de37b867..020c338fd19 100644
--- a/python/ql/test/library-tests/frameworks/serverless/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/frameworks/serverless/InlineTaintTest.expected
@@ -1,4 +1,3 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/simplejson/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/simplejson/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/simplejson/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/simplejson/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/simplejson/InlineTaintTest.expected b/python/ql/test/library-tests/frameworks/simplejson/InlineTaintTest.expected
index 366de37b867..020c338fd19 100644
--- a/python/ql/test/library-tests/frameworks/simplejson/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/frameworks/simplejson/InlineTaintTest.expected
@@ -1,4 +1,3 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/sqlalchemy/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/sqlalchemy/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/sqlalchemy/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/sqlalchemy/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/sqlalchemy/InlineTaintTest.expected b/python/ql/test/library-tests/frameworks/sqlalchemy/InlineTaintTest.expected
index 366de37b867..020c338fd19 100644
--- a/python/ql/test/library-tests/frameworks/sqlalchemy/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/frameworks/sqlalchemy/InlineTaintTest.expected
@@ -1,4 +1,3 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/starlette/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/starlette/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/starlette/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/starlette/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/stdlib-py2/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/stdlib-py2/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/stdlib-py2/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/stdlib-py2/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/stdlib-py3/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/stdlib-py3/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/stdlib-py3/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/stdlib-py3/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/stdlib/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/stdlib/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/stdlib/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/stdlib/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/stdlib/InlineTaintTest.expected b/python/ql/test/library-tests/frameworks/stdlib/InlineTaintTest.expected
index 366de37b867..020c338fd19 100644
--- a/python/ql/test/library-tests/frameworks/stdlib/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/frameworks/stdlib/InlineTaintTest.expected
@@ -1,4 +1,3 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/streamlit/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/streamlit/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/streamlit/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/streamlit/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/streamlit/rfs-test.expected b/python/ql/test/library-tests/frameworks/streamlit/rfs-test.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/streamlit/rfs-test.expected
+++ b/python/ql/test/library-tests/frameworks/streamlit/rfs-test.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/toml/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/toml/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/toml/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/toml/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/torch/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/torch/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/torch/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/torch/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/tornado/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/tornado/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/tornado/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/tornado/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/tornado/InlineTaintTest.expected b/python/ql/test/library-tests/frameworks/tornado/InlineTaintTest.expected
index 366de37b867..020c338fd19 100644
--- a/python/ql/test/library-tests/frameworks/tornado/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/frameworks/tornado/InlineTaintTest.expected
@@ -1,4 +1,3 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/twisted/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/twisted/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/twisted/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/twisted/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/twisted/InlineTaintTest.expected b/python/ql/test/library-tests/frameworks/twisted/InlineTaintTest.expected
index 366de37b867..020c338fd19 100644
--- a/python/ql/test/library-tests/frameworks/twisted/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/frameworks/twisted/InlineTaintTest.expected
@@ -1,4 +1,3 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/ujson/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/ujson/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/ujson/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/ujson/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/ujson/InlineTaintTest.expected b/python/ql/test/library-tests/frameworks/ujson/InlineTaintTest.expected
index 366de37b867..020c338fd19 100644
--- a/python/ql/test/library-tests/frameworks/ujson/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/frameworks/ujson/InlineTaintTest.expected
@@ -1,4 +1,3 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/urllib/InlineTaintTest.expected b/python/ql/test/library-tests/frameworks/urllib/InlineTaintTest.expected
index 366de37b867..020c338fd19 100644
--- a/python/ql/test/library-tests/frameworks/urllib/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/frameworks/urllib/InlineTaintTest.expected
@@ -1,4 +1,3 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/urllib3/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/urllib3/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/urllib3/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/urllib3/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/xmltodict/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/xmltodict/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/xmltodict/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/xmltodict/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/yaml/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/yaml/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/yaml/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/yaml/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/yarl/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/yarl/ConceptsTest.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/frameworks/yarl/ConceptsTest.expected
+++ b/python/ql/test/library-tests/frameworks/yarl/ConceptsTest.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/frameworks/yarl/InlineTaintTest.expected b/python/ql/test/library-tests/frameworks/yarl/InlineTaintTest.expected
index 366de37b867..020c338fd19 100644
--- a/python/ql/test/library-tests/frameworks/yarl/InlineTaintTest.expected
+++ b/python/ql/test/library-tests/frameworks/yarl/InlineTaintTest.expected
@@ -1,4 +1,3 @@
 argumentToEnsureNotTaintedNotMarkedAsSpurious
 untaintedArgumentToEnsureTaintedNotMarkedAsMissing
 testFailures
-failures
diff --git a/python/ql/test/library-tests/regex/SubstructureTests.expected b/python/ql/test/library-tests/regex/SubstructureTests.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/regex/SubstructureTests.expected
+++ b/python/ql/test/library-tests/regex/SubstructureTests.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/library-tests/regexparser/Locations.expected b/python/ql/test/library-tests/regexparser/Locations.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/library-tests/regexparser/Locations.expected
+++ b/python/ql/test/library-tests/regexparser/Locations.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/query-tests/Functions/ModificationOfParameterWithDefault/test.expected b/python/ql/test/query-tests/Functions/ModificationOfParameterWithDefault/test.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/query-tests/Functions/ModificationOfParameterWithDefault/test.expected
+++ b/python/ql/test/query-tests/Functions/ModificationOfParameterWithDefault/test.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/query-tests/Security/CWE-022-PathInjection/DataflowQueryTest.expected b/python/ql/test/query-tests/Security/CWE-022-PathInjection/DataflowQueryTest.expected
index 9ce23b4c553..2fad7bb9a84 100644
--- a/python/ql/test/query-tests/Security/CWE-022-PathInjection/DataflowQueryTest.expected
+++ b/python/ql/test/query-tests/Security/CWE-022-PathInjection/DataflowQueryTest.expected
@@ -1,3 +1,2 @@
 missingAnnotationOnSink
 testFailures
-failures
diff --git a/python/ql/test/query-tests/Security/CWE-078-CommandInjection/DataflowQueryTest.expected b/python/ql/test/query-tests/Security/CWE-078-CommandInjection/DataflowQueryTest.expected
index 9ce23b4c553..2fad7bb9a84 100644
--- a/python/ql/test/query-tests/Security/CWE-078-CommandInjection/DataflowQueryTest.expected
+++ b/python/ql/test/query-tests/Security/CWE-078-CommandInjection/DataflowQueryTest.expected
@@ -1,3 +1,2 @@
 missingAnnotationOnSink
 testFailures
-failures
diff --git a/python/ql/test/query-tests/Security/CWE-078-UnsafeShellCommandConstruction/DataflowQueryTest.expected b/python/ql/test/query-tests/Security/CWE-078-UnsafeShellCommandConstruction/DataflowQueryTest.expected
index 9ce23b4c553..2fad7bb9a84 100644
--- a/python/ql/test/query-tests/Security/CWE-078-UnsafeShellCommandConstruction/DataflowQueryTest.expected
+++ b/python/ql/test/query-tests/Security/CWE-078-UnsafeShellCommandConstruction/DataflowQueryTest.expected
@@ -1,3 +1,2 @@
 missingAnnotationOnSink
 testFailures
-failures
diff --git a/python/ql/test/query-tests/Security/CWE-209-StackTraceExposure/ExceptionInfo.expected b/python/ql/test/query-tests/Security/CWE-209-StackTraceExposure/ExceptionInfo.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/python/ql/test/query-tests/Security/CWE-209-StackTraceExposure/ExceptionInfo.expected
+++ b/python/ql/test/query-tests/Security/CWE-209-StackTraceExposure/ExceptionInfo.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/DataflowQueryTest.expected b/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/DataflowQueryTest.expected
index 9ce23b4c553..2fad7bb9a84 100644
--- a/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/DataflowQueryTest.expected
+++ b/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/DataflowQueryTest.expected
@@ -1,3 +1,2 @@
 missingAnnotationOnSink
 testFailures
-failures
diff --git a/python/ql/test/query-tests/Statements/unreachable/UnreachableCode.expected b/python/ql/test/query-tests/Statements/unreachable/UnreachableCode.expected
index 013d7a0fe68..2417041f472 100644
--- a/python/ql/test/query-tests/Statements/unreachable/UnreachableCode.expected
+++ b/python/ql/test/query-tests/Statements/unreachable/UnreachableCode.expected
@@ -4,5 +4,3 @@
 | test.py:21:5:21:38 | For | This statement is unreachable. |
 | test.py:28:9:28:21 | ExprStmt | This statement is unreachable. |
 | test.py:84:5:84:21 | ExceptStmt | This statement is unreachable. |
-| test.py:144:13:144:16 | Pass | This statement is unreachable. |
-| test.py:147:9:148:16 | Case | This statement is unreachable. |
diff --git a/ql/ql/src/queries/style/ValidatePredicateGetReturns.ql b/ql/ql/src/queries/style/ValidatePredicateGetReturns.ql
new file mode 100644
index 00000000000..a79e4f69569
--- /dev/null
+++ b/ql/ql/src/queries/style/ValidatePredicateGetReturns.ql
@@ -0,0 +1,37 @@
+/**
+ * @name Predicates starting with "get" or "as" should return a value
+ * @description Checks if predicates that start with "get" or "as" actually return a value.
+ * @kind problem
+ * @problem.severity warning
+ * @id ql/predicates-get-should-return-value
+ * @tags correctness
+ *       maintainability
+ * @precision high
+ */
+
+import ql
+import codeql_ql.ast.Ast
+
+/**
+ * Identifies predicates whose names start with "get", "as" followed by an uppercase letter.
+ * This ensures that only predicates like "getValue" are matched, excluding names like "getter".
+ */
+predicate isGetPredicate(Predicate pred, string prefix) {
+  prefix = pred.getName().regexpCapture("(get|as)[A-Z].*", 1)
+}
+
+/**
+ * Checks if a predicate has a return type. This is phrased negatively to not flag unresolved aliases.
+ */
+predicate hasNoReturnType(Predicate pred) {
+  not exists(pred.getReturnTypeExpr()) and
+  not pred.(ClasslessPredicate).getAlias() instanceof PredicateExpr
+  or
+  hasNoReturnType(pred.(ClasslessPredicate).getAlias().(PredicateExpr).getResolvedPredicate())
+}
+
+from Predicate pred, string prefix
+where
+  isGetPredicate(pred, prefix) and
+  hasNoReturnType(pred)
+select pred, "This predicate starts with '" + prefix + "' but does not return a value."
diff --git a/ql/ql/test/queries/style/ValidatePredicateGetReturns/ValidatePredicateGetReturns.expected b/ql/ql/test/queries/style/ValidatePredicateGetReturns/ValidatePredicateGetReturns.expected
new file mode 100644
index 00000000000..4b36d2c5c32
--- /dev/null
+++ b/ql/ql/test/queries/style/ValidatePredicateGetReturns/ValidatePredicateGetReturns.expected
@@ -0,0 +1,6 @@
+| test.qll:4:11:4:18 | ClasslessPredicate getValue | This predicate starts with 'get' but does not return a value. |
+| test.qll:25:11:25:28 | ClasslessPredicate getImplementation2 | This predicate starts with 'get' but does not return a value. |
+| test.qll:28:11:28:19 | ClasslessPredicate getAlias2 | This predicate starts with 'get' but does not return a value. |
+| test.qll:31:11:31:17 | ClasslessPredicate asValue | This predicate starts with 'as' but does not return a value. |
+| test.qll:48:11:48:19 | ClasslessPredicate getAlias4 | This predicate starts with 'get' but does not return a value. |
+| test.qll:61:11:61:22 | ClasslessPredicate getDistance2 | This predicate starts with 'get' but does not return a value. |
diff --git a/ql/ql/test/queries/style/ValidatePredicateGetReturns/ValidatePredicateGetReturns.qlref b/ql/ql/test/queries/style/ValidatePredicateGetReturns/ValidatePredicateGetReturns.qlref
new file mode 100644
index 00000000000..e116f69d6b2
--- /dev/null
+++ b/ql/ql/test/queries/style/ValidatePredicateGetReturns/ValidatePredicateGetReturns.qlref
@@ -0,0 +1 @@
+queries/style/ValidatePredicateGetReturns.ql
diff --git a/ql/ql/test/queries/style/ValidatePredicateGetReturns/test.qll b/ql/ql/test/queries/style/ValidatePredicateGetReturns/test.qll
new file mode 100644
index 00000000000..2cc4dec64d2
--- /dev/null
+++ b/ql/ql/test/queries/style/ValidatePredicateGetReturns/test.qll
@@ -0,0 +1,67 @@
+import ql
+
+// NOT OK -- Predicate starts with "get" but does not return a value
+predicate getValue() { none() }
+
+// OK -- starts with get and returns a value
+string getData() { result = "data" }
+
+// OK -- starts with get but followed by a lowercase letter, probably should be ignored
+predicate getterFunction() { none() }
+
+// OK -- starts with get and returns a value
+string getImplementation() { result = "implementation" }
+
+// OK -- is an alias
+predicate getAlias = getImplementation/0;
+
+// OK -- Starts with "get" but followed by a lowercase letter, probably be ignored
+predicate getvalue() { none() }
+
+// OK -- Does not start with "get", should be ignored
+predicate retrieveValue() { none() }
+
+// NOT OK -- starts with get and does not return value
+predicate getImplementation2() { none() }
+
+// NOT OK -- is an alias for a predicate which does not have a return value
+predicate getAlias2 = getImplementation2/0;
+
+// NOT OK -- starts with as and does not return value
+predicate asValue() { none() }
+
+// OK -- starts with as but followed by a lowercase letter, probably should be ignored
+predicate assessment() { none() }
+
+// OK -- starts with as and returns a value
+string asString() { result = "string" }
+
+// OK -- starts with get and returns a value
+HiddenType getInjectableCompositeActionNode() {
+  exists(HiddenType hidden | result = hidden.toString())
+}
+
+// OK
+predicate implementation4() { none() }
+
+// NOT OK -- is an alias
+predicate getAlias4 = implementation4/0;
+
+// OK -- is an alias
+predicate alias5 = implementation4/0;
+
+int root() { none() }
+
+predicate edge(int x, int y) { none() }
+
+// OK -- Higher-order predicate
+int getDistance(int x) = shortestDistances(root/0, edge/2)(_, x, result)
+
+// NOT OK -- Higher-order predicate that does not return a value even though has 'get' in the name
+predicate getDistance2(int x, int y) = shortestDistances(root/0, edge/2)(_, x, y)
+
+// OK
+predicate unresolvedAlias = unresolved/0;
+
+// OK -- unresolved alias
+predicate getUnresolvedAlias = unresolved/0;
diff --git a/ruby/ql/lib/change-notes/2024-12-03-remove-dataflow-config-class-api.md b/ruby/ql/lib/change-notes/2024-12-03-remove-dataflow-config-class-api.md
new file mode 100644
index 00000000000..d09ec528c99
--- /dev/null
+++ b/ruby/ql/lib/change-notes/2024-12-03-remove-dataflow-config-class-api.md
@@ -0,0 +1,4 @@
+---
+category: breaking
+---
+* Deleted the old deprecated data flow API that was based on extending a configuration class. See https://github.blog/changelog/2023-08-14-new-dataflow-api-for-writing-custom-codeql-queries for instructions on migrating your queries to use the new API.
diff --git a/ruby/ql/lib/codeql/ruby/DataFlow.qll b/ruby/ql/lib/codeql/ruby/DataFlow.qll
index f17c85143f5..72fb8c880ec 100644
--- a/ruby/ql/lib/codeql/ruby/DataFlow.qll
+++ b/ruby/ql/lib/codeql/ruby/DataFlow.qll
@@ -13,5 +13,5 @@ module DataFlow {
   private import codeql.ruby.dataflow.internal.DataFlowImplSpecific
   private import codeql.dataflow.DataFlow
   import DataFlowMake<Location, RubyDataFlow>
-  import codeql.ruby.dataflow.internal.DataFlowImpl1
+  import Public
 }
diff --git a/ruby/ql/lib/codeql/ruby/DataFlow2.qll b/ruby/ql/lib/codeql/ruby/DataFlow2.qll
deleted file mode 100644
index 7486f52052d..00000000000
--- a/ruby/ql/lib/codeql/ruby/DataFlow2.qll
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Provides classes for performing local (intra-procedural) and
- * global (inter-procedural) data flow analyses.
- */
-module DataFlow2 {
-  import codeql.ruby.dataflow.internal.DataFlowImpl2
-}
diff --git a/ruby/ql/lib/codeql/ruby/TaintTracking.qll b/ruby/ql/lib/codeql/ruby/TaintTracking.qll
index 7534b28079a..45828c86dd2 100644
--- a/ruby/ql/lib/codeql/ruby/TaintTracking.qll
+++ b/ruby/ql/lib/codeql/ruby/TaintTracking.qll
@@ -3,11 +3,10 @@
  * global (inter-procedural) taint-tracking analyses.
  */
 module TaintTracking {
-  import codeql.ruby.dataflow.internal.tainttracking1.TaintTrackingParameter::Public
+  import codeql.ruby.dataflow.internal.TaintTrackingPublic
   private import codeql.ruby.dataflow.internal.DataFlowImplSpecific
   private import codeql.ruby.dataflow.internal.TaintTrackingImplSpecific
   private import codeql.dataflow.TaintTracking
   private import codeql.Locations
   import TaintFlowMake<Location, RubyDataFlow, RubyTaintTracking>
-  import codeql.ruby.dataflow.internal.tainttracking1.TaintTrackingImpl
 }
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl1.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl1.qll
deleted file mode 100644
index 17def0c431d..00000000000
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl1.qll
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides a `Configuration` class backwards-compatible interface to the data
- * flow library.
- */
-
-private import DataFlowImplCommon
-private import DataFlowImplSpecific::Private
-import DataFlowImplSpecific::Public
-private import DataFlowImpl
-import DataFlowImplCommonPublic
-deprecated import FlowStateString
-private import codeql.util.Unit
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural data flow analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the global data flow library must define its own unique extension
- * of this abstract class. To create a configuration, extend this class with
- * a subclass whose characteristic predicate is a unique singleton string.
- * For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends DataFlow::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isBarrier`.
- *   // Optionally override `isAdditionalFlowStep`.
- * }
- * ```
- * Conceptually, this defines a graph where the nodes are `DataFlow::Node`s and
- * the edges are those data-flow steps that preserve the value of the node
- * along with any additional edges defined by `isAdditionalFlowStep`.
- * Specifying nodes in `isBarrier` will remove those nodes from the graph, and
- * specifying nodes in `isBarrierIn` and/or `isBarrierOut` will remove in-going
- * and/or out-going edges from those nodes, respectively.
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but two classes extending
- * `DataFlow::Configuration` should never depend on each other. One of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`.
- */
-abstract deprecated class Configuration extends string {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant data flow source.
-   */
-  predicate isSource(Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant data flow source with the given initial
-   * `state`.
-   */
-  predicate isSource(Node source, FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink.
-   */
-  predicate isSink(Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink accepting `state`.
-   */
-  predicate isSink(Node sink, FlowState state) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited. This completely removes
-   * `node` from the data flow graph.
-   */
-  predicate isBarrier(Node node) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited when the flow state is
-   * `state`.
-   */
-  predicate isBarrier(Node node, FlowState state) { none() }
-
-  /** Holds if data flow into `node` is prohibited. */
-  predicate isBarrierIn(Node node) { none() }
-
-  /** Holds if data flow out of `node` is prohibited. */
-  predicate isBarrierOut(Node node) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   */
-  predicate isAdditionalFlowStep(Node node1, Node node2) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
-    none()
-  }
-
-  /**
-   * Holds if an arbitrary number of implicit read steps of content `c` may be
-   * taken at `node`.
-   */
-  predicate allowImplicitRead(Node node, ContentSet c) { none() }
-
-  /**
-   * Gets the virtual dispatch branching limit when calculating field flow.
-   * This can be overridden to a smaller value to improve performance (a
-   * value of 0 disables field flow), or a larger value to get more results.
-   */
-  int fieldFlowBranchLimit() { result = 2 }
-
-  /**
-   * Gets a data flow configuration feature to add restrictions to the set of
-   * valid flow paths.
-   *
-   * - `FeatureHasSourceCallContext`:
-   *    Assume that sources have some existing call context to disallow
-   *    conflicting return-flow directly following the source.
-   * - `FeatureHasSinkCallContext`:
-   *    Assume that sinks have some existing call context to disallow
-   *    conflicting argument-to-parameter flow directly preceding the sink.
-   * - `FeatureEqualSourceSinkCallContext`:
-   *    Implies both of the above and additionally ensures that the entire flow
-   *    path preserves the call context.
-   *
-   * These features are generally not relevant for typical end-to-end data flow
-   * queries, but should only be used for constructing paths that need to
-   * somehow be pluggable in another path context.
-   */
-  FlowFeature getAFeature() { none() }
-
-  /** Holds if sources should be grouped in the result of `hasFlowPath`. */
-  predicate sourceGrouping(Node source, string sourceGroup) { none() }
-
-  /** Holds if sinks should be grouped in the result of `hasFlowPath`. */
-  predicate sinkGrouping(Node sink, string sinkGroup) { none() }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   */
-  predicate hasFlow(Node source, Node sink) { hasFlow(source, sink, this) }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   *
-   * The corresponding paths are generated from the end-points and the graph
-   * included in the module `PathGraph`.
-   */
-  predicate hasFlowPath(PathNode source, PathNode sink) { hasFlowPath(source, sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowTo(Node sink) { hasFlowTo(sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowToExpr(DataFlowExpr sink) { this.hasFlowTo(exprNode(sink)) }
-
-  /**
-   * Holds if hidden nodes should be included in the data flow graph.
-   *
-   * This feature should only be used for debugging or when the data flow graph
-   * is not visualized (for example in a `path-problem` query).
-   */
-  predicate includeHiddenNodes() { none() }
-}
-
-/**
- * This class exists to prevent mutual recursion between the user-overridden
- * member predicates of `Configuration` and the rest of the data-flow library.
- * Good performance cannot be guaranteed in the presence of such recursion, so
- * it should be replaced by using more than one copy of the data flow library.
- */
-abstract deprecated private class ConfigurationRecursionPrevention extends Configuration {
-  bindingset[this]
-  ConfigurationRecursionPrevention() { any() }
-
-  override predicate hasFlow(Node source, Node sink) {
-    strictcount(Node n | this.isSource(n)) < 0
-    or
-    strictcount(Node n | this.isSource(n, _)) < 0
-    or
-    strictcount(Node n | this.isSink(n)) < 0
-    or
-    strictcount(Node n | this.isSink(n, _)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, _, n2, _)) < 0
-    or
-    super.hasFlow(source, sink)
-  }
-}
-
-deprecated private FlowState relevantState(Configuration config) {
-  config.isSource(_, result) or
-  config.isSink(_, result) or
-  config.isBarrier(_, result) or
-  config.isAdditionalFlowStep(_, result, _, _) or
-  config.isAdditionalFlowStep(_, _, _, result)
-}
-
-private newtype TConfigState =
-  deprecated TMkConfigState(Configuration config, FlowState state) {
-    state = relevantState(config) or state instanceof FlowStateEmpty
-  }
-
-deprecated private Configuration getConfig(TConfigState state) { state = TMkConfigState(result, _) }
-
-deprecated private FlowState getState(TConfigState state) { state = TMkConfigState(_, result) }
-
-deprecated private predicate singleConfiguration() { 1 = strictcount(Configuration c) }
-
-deprecated private module Config implements FullStateConfigSig {
-  class FlowState = TConfigState;
-
-  predicate isSource(Node source, FlowState state) {
-    getConfig(state).isSource(source, getState(state))
-    or
-    getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isSink(Node sink) { none() }
-
-  predicate isSink(Node sink, FlowState state) {
-    getConfig(state).isSink(sink, getState(state))
-    or
-    getConfig(state).isSink(sink) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isBarrier(Node node) { none() }
-
-  predicate isBarrier(Node node, FlowState state) {
-    getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node)
-  }
-
-  predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
-
-  predicate isBarrierOut(Node node) { any(Configuration config).isBarrierOut(node) }
-
-  predicate isBarrierIn(Node node, FlowState state) { none() }
-
-  predicate isBarrierOut(Node node, FlowState state) { none() }
-
-  predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
-    singleConfiguration() and
-    any(Configuration config).isAdditionalFlowStep(node1, node2) and
-    model = ""
-  }
-
-  predicate isAdditionalFlowStep(
-    Node node1, FlowState state1, Node node2, FlowState state2, string model
-  ) {
-    getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1) and
-    model = ""
-    or
-    not singleConfiguration() and
-    getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1 and
-    model = ""
-  }
-
-  predicate allowImplicitRead(Node node, ContentSet c) {
-    any(Configuration config).allowImplicitRead(node, c)
-  }
-
-  predicate neverSkip(Node node) { none() }
-
-  int fieldFlowBranchLimit() { result = min(any(Configuration config).fieldFlowBranchLimit()) }
-
-  int accessPathLimit() { result = 5 }
-
-  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
-
-  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
-
-  predicate observeDiffInformedIncrementalMode() { none() }
-}
-
-deprecated private import Impl<Config> as I
-
-/**
- * A `Node` augmented with a call context (except for sinks), an access path, and a configuration.
- * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
- */
-deprecated class PathNode instanceof I::PathNode {
-  /** Gets a textual representation of this element. */
-  final string toString() { result = super.toString() }
-
-  /**
-   * Gets a textual representation of this element, including a textual
-   * representation of the call context.
-   */
-  final string toStringWithContext() { result = super.toStringWithContext() }
-
-  /**
-   * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
-   * For more information, see
-   * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
-   */
-  final predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    super.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-
-  /** Gets the underlying `Node`. */
-  final Node getNode() { result = super.getNode() }
-
-  /** Gets the `FlowState` of this node. */
-  deprecated final FlowState getState() { result = getState(super.getState()) }
-
-  /** Gets the associated configuration. */
-  deprecated final Configuration getConfiguration() { result = getConfig(super.getState()) }
-
-  /** Gets a successor of this node, if any. */
-  final PathNode getASuccessor() { result = super.getASuccessor() }
-
-  /** Holds if this node is a source. */
-  final predicate isSource() { super.isSource() }
-
-  /** Holds if this node is a grouping of source nodes. */
-  final predicate isSourceGroup(string group) { super.isSourceGroup(group) }
-
-  /** Holds if this node is a grouping of sink nodes. */
-  final predicate isSinkGroup(string group) { super.isSinkGroup(group) }
-}
-
-deprecated module PathGraph = I::PathGraph;
-
-deprecated private predicate hasFlow(Node source, Node sink, Configuration config) {
-  exists(PathNode source0, PathNode sink0 |
-    hasFlowPath(source0, sink0, config) and
-    source0.getNode() = source and
-    sink0.getNode() = sink
-  )
-}
-
-deprecated private predicate hasFlowPath(PathNode source, PathNode sink, Configuration config) {
-  I::flowPath(source, sink) and source.getConfiguration() = config
-}
-
-deprecated private predicate hasFlowTo(Node sink, Configuration config) { hasFlow(_, sink, config) }
-
-deprecated predicate flowsTo = hasFlow/3;
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl2.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl2.qll
deleted file mode 100644
index 17def0c431d..00000000000
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl2.qll
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides a `Configuration` class backwards-compatible interface to the data
- * flow library.
- */
-
-private import DataFlowImplCommon
-private import DataFlowImplSpecific::Private
-import DataFlowImplSpecific::Public
-private import DataFlowImpl
-import DataFlowImplCommonPublic
-deprecated import FlowStateString
-private import codeql.util.Unit
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural data flow analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the global data flow library must define its own unique extension
- * of this abstract class. To create a configuration, extend this class with
- * a subclass whose characteristic predicate is a unique singleton string.
- * For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends DataFlow::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isBarrier`.
- *   // Optionally override `isAdditionalFlowStep`.
- * }
- * ```
- * Conceptually, this defines a graph where the nodes are `DataFlow::Node`s and
- * the edges are those data-flow steps that preserve the value of the node
- * along with any additional edges defined by `isAdditionalFlowStep`.
- * Specifying nodes in `isBarrier` will remove those nodes from the graph, and
- * specifying nodes in `isBarrierIn` and/or `isBarrierOut` will remove in-going
- * and/or out-going edges from those nodes, respectively.
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but two classes extending
- * `DataFlow::Configuration` should never depend on each other. One of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`.
- */
-abstract deprecated class Configuration extends string {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant data flow source.
-   */
-  predicate isSource(Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant data flow source with the given initial
-   * `state`.
-   */
-  predicate isSource(Node source, FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink.
-   */
-  predicate isSink(Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink accepting `state`.
-   */
-  predicate isSink(Node sink, FlowState state) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited. This completely removes
-   * `node` from the data flow graph.
-   */
-  predicate isBarrier(Node node) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited when the flow state is
-   * `state`.
-   */
-  predicate isBarrier(Node node, FlowState state) { none() }
-
-  /** Holds if data flow into `node` is prohibited. */
-  predicate isBarrierIn(Node node) { none() }
-
-  /** Holds if data flow out of `node` is prohibited. */
-  predicate isBarrierOut(Node node) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   */
-  predicate isAdditionalFlowStep(Node node1, Node node2) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
-    none()
-  }
-
-  /**
-   * Holds if an arbitrary number of implicit read steps of content `c` may be
-   * taken at `node`.
-   */
-  predicate allowImplicitRead(Node node, ContentSet c) { none() }
-
-  /**
-   * Gets the virtual dispatch branching limit when calculating field flow.
-   * This can be overridden to a smaller value to improve performance (a
-   * value of 0 disables field flow), or a larger value to get more results.
-   */
-  int fieldFlowBranchLimit() { result = 2 }
-
-  /**
-   * Gets a data flow configuration feature to add restrictions to the set of
-   * valid flow paths.
-   *
-   * - `FeatureHasSourceCallContext`:
-   *    Assume that sources have some existing call context to disallow
-   *    conflicting return-flow directly following the source.
-   * - `FeatureHasSinkCallContext`:
-   *    Assume that sinks have some existing call context to disallow
-   *    conflicting argument-to-parameter flow directly preceding the sink.
-   * - `FeatureEqualSourceSinkCallContext`:
-   *    Implies both of the above and additionally ensures that the entire flow
-   *    path preserves the call context.
-   *
-   * These features are generally not relevant for typical end-to-end data flow
-   * queries, but should only be used for constructing paths that need to
-   * somehow be pluggable in another path context.
-   */
-  FlowFeature getAFeature() { none() }
-
-  /** Holds if sources should be grouped in the result of `hasFlowPath`. */
-  predicate sourceGrouping(Node source, string sourceGroup) { none() }
-
-  /** Holds if sinks should be grouped in the result of `hasFlowPath`. */
-  predicate sinkGrouping(Node sink, string sinkGroup) { none() }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   */
-  predicate hasFlow(Node source, Node sink) { hasFlow(source, sink, this) }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   *
-   * The corresponding paths are generated from the end-points and the graph
-   * included in the module `PathGraph`.
-   */
-  predicate hasFlowPath(PathNode source, PathNode sink) { hasFlowPath(source, sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowTo(Node sink) { hasFlowTo(sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowToExpr(DataFlowExpr sink) { this.hasFlowTo(exprNode(sink)) }
-
-  /**
-   * Holds if hidden nodes should be included in the data flow graph.
-   *
-   * This feature should only be used for debugging or when the data flow graph
-   * is not visualized (for example in a `path-problem` query).
-   */
-  predicate includeHiddenNodes() { none() }
-}
-
-/**
- * This class exists to prevent mutual recursion between the user-overridden
- * member predicates of `Configuration` and the rest of the data-flow library.
- * Good performance cannot be guaranteed in the presence of such recursion, so
- * it should be replaced by using more than one copy of the data flow library.
- */
-abstract deprecated private class ConfigurationRecursionPrevention extends Configuration {
-  bindingset[this]
-  ConfigurationRecursionPrevention() { any() }
-
-  override predicate hasFlow(Node source, Node sink) {
-    strictcount(Node n | this.isSource(n)) < 0
-    or
-    strictcount(Node n | this.isSource(n, _)) < 0
-    or
-    strictcount(Node n | this.isSink(n)) < 0
-    or
-    strictcount(Node n | this.isSink(n, _)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, _, n2, _)) < 0
-    or
-    super.hasFlow(source, sink)
-  }
-}
-
-deprecated private FlowState relevantState(Configuration config) {
-  config.isSource(_, result) or
-  config.isSink(_, result) or
-  config.isBarrier(_, result) or
-  config.isAdditionalFlowStep(_, result, _, _) or
-  config.isAdditionalFlowStep(_, _, _, result)
-}
-
-private newtype TConfigState =
-  deprecated TMkConfigState(Configuration config, FlowState state) {
-    state = relevantState(config) or state instanceof FlowStateEmpty
-  }
-
-deprecated private Configuration getConfig(TConfigState state) { state = TMkConfigState(result, _) }
-
-deprecated private FlowState getState(TConfigState state) { state = TMkConfigState(_, result) }
-
-deprecated private predicate singleConfiguration() { 1 = strictcount(Configuration c) }
-
-deprecated private module Config implements FullStateConfigSig {
-  class FlowState = TConfigState;
-
-  predicate isSource(Node source, FlowState state) {
-    getConfig(state).isSource(source, getState(state))
-    or
-    getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isSink(Node sink) { none() }
-
-  predicate isSink(Node sink, FlowState state) {
-    getConfig(state).isSink(sink, getState(state))
-    or
-    getConfig(state).isSink(sink) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isBarrier(Node node) { none() }
-
-  predicate isBarrier(Node node, FlowState state) {
-    getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node)
-  }
-
-  predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
-
-  predicate isBarrierOut(Node node) { any(Configuration config).isBarrierOut(node) }
-
-  predicate isBarrierIn(Node node, FlowState state) { none() }
-
-  predicate isBarrierOut(Node node, FlowState state) { none() }
-
-  predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
-    singleConfiguration() and
-    any(Configuration config).isAdditionalFlowStep(node1, node2) and
-    model = ""
-  }
-
-  predicate isAdditionalFlowStep(
-    Node node1, FlowState state1, Node node2, FlowState state2, string model
-  ) {
-    getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1) and
-    model = ""
-    or
-    not singleConfiguration() and
-    getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1 and
-    model = ""
-  }
-
-  predicate allowImplicitRead(Node node, ContentSet c) {
-    any(Configuration config).allowImplicitRead(node, c)
-  }
-
-  predicate neverSkip(Node node) { none() }
-
-  int fieldFlowBranchLimit() { result = min(any(Configuration config).fieldFlowBranchLimit()) }
-
-  int accessPathLimit() { result = 5 }
-
-  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
-
-  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
-
-  predicate observeDiffInformedIncrementalMode() { none() }
-}
-
-deprecated private import Impl<Config> as I
-
-/**
- * A `Node` augmented with a call context (except for sinks), an access path, and a configuration.
- * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
- */
-deprecated class PathNode instanceof I::PathNode {
-  /** Gets a textual representation of this element. */
-  final string toString() { result = super.toString() }
-
-  /**
-   * Gets a textual representation of this element, including a textual
-   * representation of the call context.
-   */
-  final string toStringWithContext() { result = super.toStringWithContext() }
-
-  /**
-   * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
-   * For more information, see
-   * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
-   */
-  final predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    super.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-
-  /** Gets the underlying `Node`. */
-  final Node getNode() { result = super.getNode() }
-
-  /** Gets the `FlowState` of this node. */
-  deprecated final FlowState getState() { result = getState(super.getState()) }
-
-  /** Gets the associated configuration. */
-  deprecated final Configuration getConfiguration() { result = getConfig(super.getState()) }
-
-  /** Gets a successor of this node, if any. */
-  final PathNode getASuccessor() { result = super.getASuccessor() }
-
-  /** Holds if this node is a source. */
-  final predicate isSource() { super.isSource() }
-
-  /** Holds if this node is a grouping of source nodes. */
-  final predicate isSourceGroup(string group) { super.isSourceGroup(group) }
-
-  /** Holds if this node is a grouping of sink nodes. */
-  final predicate isSinkGroup(string group) { super.isSinkGroup(group) }
-}
-
-deprecated module PathGraph = I::PathGraph;
-
-deprecated private predicate hasFlow(Node source, Node sink, Configuration config) {
-  exists(PathNode source0, PathNode sink0 |
-    hasFlowPath(source0, sink0, config) and
-    source0.getNode() = source and
-    sink0.getNode() = sink
-  )
-}
-
-deprecated private predicate hasFlowPath(PathNode source, PathNode sink, Configuration config) {
-  I::flowPath(source, sink) and source.getConfiguration() = config
-}
-
-deprecated private predicate hasFlowTo(Node sink, Configuration config) { hasFlow(_, sink, config) }
-
-deprecated predicate flowsTo = hasFlow/3;
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll
index 36c71e04fef..260fb3cab6f 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll
@@ -175,11 +175,9 @@ module LocalFlow {
     or
     node1 = node2.(ImplicitBlockArgumentNode).getParameterNode(true)
     or
-    node1 =
-      unique(FlowSummaryNode n1 |
-        FlowSummaryImpl::Private::Steps::summaryLocalStep(n1.getSummaryNode(),
-          node2.(FlowSummaryNode).getSummaryNode(), true, _)
-      )
+    FlowSummaryImpl::Private::Steps::summaryLocalMustFlowStep(node1
+          .(FlowSummaryNode)
+          .getSummaryNode(), node2.(FlowSummaryNode).getSummaryNode())
   }
 }
 
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/tainttracking1/TaintTrackingImpl.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
deleted file mode 100644
index 75e7856fd26..00000000000
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides an implementation of global (interprocedural) taint tracking.
- * This file re-exports the local (intraprocedural) taint-tracking analysis
- * from `TaintTrackingParameter::Public` and adds a global analysis, mainly
- * exposed through the `Configuration` class. For some languages, this file
- * exists in several identical copies, allowing queries to use multiple
- * `Configuration` classes that depend on each other without introducing
- * mutual recursion among those configurations.
- */
-
-import TaintTrackingParameter::Public
-private import TaintTrackingParameter::Private
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural taint tracking analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the taint tracking library must define its own unique extension of
- * this abstract class.
- *
- * A taint-tracking configuration is a special data flow configuration
- * (`DataFlow::Configuration`) that allows for flow through nodes that do not
- * necessarily preserve values but are still relevant from a taint tracking
- * perspective. (For example, string concatenation, where one of the operands
- * is tainted.)
- *
- * To create a configuration, extend this class with a subclass whose
- * characteristic predicate is a unique singleton string. For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends TaintTracking::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isSanitizer`.
- *   // Optionally override `isSanitizerIn`.
- *   // Optionally override `isSanitizerOut`.
- *   // Optionally override `isSanitizerGuard`.
- *   // Optionally override `isAdditionalTaintStep`.
- * }
- * ```
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but it is unsupported to depend on
- * another `TaintTracking::Configuration` or a `DataFlow::Configuration` in the
- * overridden predicates that define sources, sinks, or additional steps.
- * Instead, the dependency should go to a `TaintTracking2::Configuration` or a
- * `DataFlow2::Configuration`, `DataFlow3::Configuration`, etc.
- */
-abstract deprecated class Configuration extends DataFlow::Configuration {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant taint source.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant taint source with the given initial
-   * `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink accepting `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
-
-  /** Holds if the node `node` is a taint sanitizer. */
-  predicate isSanitizer(DataFlow::Node node) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node) {
-    this.isSanitizer(node) or
-    defaultTaintSanitizer(node)
-  }
-
-  /**
-   * Holds if the node `node` is a taint sanitizer when the flow state is
-   * `state`.
-   */
-  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
-    this.isSanitizer(node, state)
-  }
-
-  /** Holds if taint propagation into `node` is prohibited. */
-  predicate isSanitizerIn(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierIn(DataFlow::Node node) { this.isSanitizerIn(node) }
-
-  /** Holds if taint propagation out of `node` is prohibited. */
-  predicate isSanitizerOut(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   */
-  predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) { none() }
-
-  final override predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
-    this.isAdditionalTaintStep(node1, node2) or
-    defaultAdditionalTaintStep(node1, node2, _)
-  }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalTaintStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    none()
-  }
-
-  final override predicate isAdditionalFlowStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    this.isAdditionalTaintStep(node1, state1, node2, state2)
-  }
-
-  override predicate allowImplicitRead(DataFlow::Node node, DataFlow::ContentSet c) {
-    (
-      this.isSink(node) or
-      this.isSink(node, _) or
-      this.isAdditionalTaintStep(node, _) or
-      this.isAdditionalTaintStep(node, _, _, _)
-    ) and
-    defaultImplicitTaintRead(node, c)
-  }
-
-  /**
-   * Holds if taint may flow from `source` to `sink` for this configuration.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate hasFlow(DataFlow::Node source, DataFlow::Node sink) {
-    super.hasFlow(source, sink)
-  }
-}
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/tainttracking1/TaintTrackingParameter.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/tainttracking1/TaintTrackingParameter.qll
deleted file mode 100644
index 0c87c8ac5e8..00000000000
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/tainttracking1/TaintTrackingParameter.qll
+++ /dev/null
@@ -1,7 +0,0 @@
-import codeql.ruby.dataflow.internal.TaintTrackingPublic as Public
-
-module Private {
-  import codeql.ruby.DataFlow::DataFlow as DataFlow
-  import codeql.ruby.dataflow.internal.DataFlowImpl as DataFlowInternal
-  import codeql.ruby.dataflow.internal.TaintTrackingPrivate
-}
diff --git a/ruby/ql/lib/codeql/ruby/experimental/UnicodeBypassValidationQuery.qll b/ruby/ql/lib/codeql/ruby/experimental/UnicodeBypassValidationQuery.qll
index 26011c8d918..7a5be05ac30 100644
--- a/ruby/ql/lib/codeql/ruby/experimental/UnicodeBypassValidationQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/experimental/UnicodeBypassValidationQuery.qll
@@ -9,22 +9,6 @@ private import codeql.ruby.TaintTracking
 private import codeql.ruby.ApiGraphs
 import UnicodeBypassValidationCustomizations::UnicodeBypassValidation
 
-/**
- * A state signifying that a logical validation has not been performed.
- * DEPRECATED: Use `PreValidationState()`
- */
-deprecated class PreValidation extends DataFlow::FlowState {
-  PreValidation() { this = "PreValidation" }
-}
-
-/**
- * A state signifying that a logical validation has been performed.
- * DEPRECATED: Use `PostValidationState()`
- */
-deprecated class PostValidation extends DataFlow::FlowState {
-  PostValidation() { this = "PostValidation" }
-}
-
 /**
  * A state signifying if a logical validation has been performed or not.
  */
@@ -34,40 +18,6 @@ private newtype ValidationState =
   // A state signifying that a logical validation has been performed.
   PostValidationState()
 
-/**
- * A taint-tracking configuration for detecting "Unicode transformation mishandling" vulnerabilities.
- *
- * This configuration uses two flow states, `PreValidation` and `PostValidation`,
- * to track the requirement that a logical validation has been performed before the Unicode Transformation.
- * DEPRECATED: Use `UnicodeBypassValidationFlow`
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "UnicodeBypassValidation" }
-
-  private ValidationState convertState(DataFlow::FlowState state) {
-    state instanceof PreValidation and result = PreValidationState()
-    or
-    state instanceof PostValidation and result = PostValidationState()
-  }
-
-  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) {
-    UnicodeBypassValidationConfig::isSource(source, this.convertState(state))
-  }
-
-  override predicate isAdditionalTaintStep(
-    DataFlow::Node nodeFrom, DataFlow::FlowState stateFrom, DataFlow::Node nodeTo,
-    DataFlow::FlowState stateTo
-  ) {
-    UnicodeBypassValidationConfig::isAdditionalFlowStep(nodeFrom, this.convertState(stateFrom),
-      nodeTo, this.convertState(stateTo))
-  }
-
-  /* A Unicode Tranformation (Unicode tranformation) is considered a sink when the algorithm used is either NFC or NFKC.  */
-  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) {
-    UnicodeBypassValidationConfig::isSink(sink, this.convertState(state))
-  }
-}
-
 /**
  * A taint-tracking configuration for detecting "Unicode transformation mishandling" vulnerabilities.
  *
diff --git a/ruby/ql/lib/codeql/ruby/experimental/ZipSlipQuery.qll b/ruby/ql/lib/codeql/ruby/experimental/ZipSlipQuery.qll
index f1a00b21d92..cb6dfc931bd 100644
--- a/ruby/ql/lib/codeql/ruby/experimental/ZipSlipQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/experimental/ZipSlipQuery.qll
@@ -9,35 +9,6 @@ private import codeql.ruby.DataFlow
 private import codeql.ruby.TaintTracking
 private import codeql.ruby.ApiGraphs
 
-/**
- * A taint-tracking configuration for reasoning about zip slip
- * vulnerabilities.
- * DEPRECATED: Use `ZipSlipFlow`
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "ZipSlip" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof ZipSlip::Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof ZipSlip::Sink }
-
-  /**
-   * This should actually be
-   * `and cn = API::getTopLevelMember("Gem").getMember("Package").getMember("TarReader").getMember("Entry").getAMethodCall("full_name")` and similar for other classes
-   * but I couldn't make it work so there's only check for the method name called on the entry. It is `full_name` for `Gem::Package::TarReader::Entry` and `Zlib`
-   * and `name` for `Zip::File`
-   */
-  override predicate isAdditionalTaintStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
-    exists(DataFlow::CallNode cn |
-      cn.getReceiver() = nodeFrom and
-      cn.getMethodName() in ["full_name", "name"] and
-      cn = nodeTo
-    )
-  }
-
-  override predicate isSanitizer(DataFlow::Node node) { node instanceof ZipSlip::Sanitizer }
-}
-
 private module ZipSlipConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof ZipSlip::Source }
 
diff --git a/ruby/ql/lib/codeql/ruby/security/CleartextLoggingQuery.qll b/ruby/ql/lib/codeql/ruby/security/CleartextLoggingQuery.qll
index 2f321939ec2..38dc08731f4 100644
--- a/ruby/ql/lib/codeql/ruby/security/CleartextLoggingQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/CleartextLoggingQuery.qll
@@ -12,28 +12,6 @@ private import codeql.ruby.TaintTracking
 import CleartextLoggingCustomizations::CleartextLogging
 private import CleartextLoggingCustomizations::CleartextLogging as CL
 
-/**
- * A taint-tracking configuration for detecting "Clear-text logging of sensitive information".
- * DEPRECATED: Use `CleartextLoggingFlow` instead
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "CleartextLogging" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof CL::Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof CL::Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) {
-    super.isSanitizer(node)
-    or
-    node instanceof CL::Sanitizer
-  }
-
-  override predicate isAdditionalTaintStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
-    CL::isAdditionalTaintStep(nodeFrom, nodeTo)
-  }
-}
-
 private module Config implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof CL::Source }
 
diff --git a/ruby/ql/lib/codeql/ruby/security/CleartextStorageQuery.qll b/ruby/ql/lib/codeql/ruby/security/CleartextStorageQuery.qll
index 2a1a45bfb0b..60dfd216609 100644
--- a/ruby/ql/lib/codeql/ruby/security/CleartextStorageQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/CleartextStorageQuery.qll
@@ -11,28 +11,6 @@ private import codeql.ruby.DataFlow
 private import codeql.ruby.TaintTracking
 private import CleartextStorageCustomizations::CleartextStorage as CS
 
-/**
- * A taint-tracking configuration for detecting "Clear-text storage of sensitive information".
- * DEPRECATED: Use `CleartextStorageFlow` instead
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "CleartextStorage" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof CS::Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof CS::Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) {
-    super.isSanitizer(node)
-    or
-    node instanceof CS::Sanitizer
-  }
-
-  override predicate isAdditionalTaintStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
-    CS::isAdditionalTaintStep(nodeFrom, nodeTo)
-  }
-}
-
 private module Config implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof CS::Source }
 
diff --git a/ruby/ql/lib/codeql/ruby/security/CodeInjectionCustomizations.qll b/ruby/ql/lib/codeql/ruby/security/CodeInjectionCustomizations.qll
index 8103ddf0c64..fe08d83d6fb 100644
--- a/ruby/ql/lib/codeql/ruby/security/CodeInjectionCustomizations.qll
+++ b/ruby/ql/lib/codeql/ruby/security/CodeInjectionCustomizations.qll
@@ -14,18 +14,6 @@ private import codeql.ruby.frameworks.data.internal.ApiGraphModels
 module CodeInjection {
   /** Flow states used to distinguish whether an attacker controls the entire string. */
   module FlowState {
-    /**
-     * Flow state used for normal tainted data, where an attacker might only control a substring.
-     * DEPRECATED: Use `SubString()`
-     */
-    deprecated DataFlow::FlowState substring() { result = "substring" }
-
-    /**
-     * Flow state used for data that is entirely controlled by the attacker.
-     * DEPRECATED: Use `Full()`
-     */
-    deprecated DataFlow::FlowState full() { result = "full" }
-
     private newtype TState =
       TFull() or
       TSubString()
@@ -62,14 +50,6 @@ module CodeInjection {
    * A data flow source for "Code injection" vulnerabilities.
    */
   abstract class Source extends DataFlow::Node {
-    /**
-     * Gets a flow state for which this is a source.
-     * DEPRECATED: Use `getAState()`
-     */
-    deprecated DataFlow::FlowState getAFlowState() {
-      result = [FlowState::substring(), FlowState::full()]
-    }
-
     /** Gets a flow state for which this is a source. */
     FlowState::State getAState() {
       result instanceof FlowState::SubString or result instanceof FlowState::Full
@@ -80,14 +60,6 @@ module CodeInjection {
    * A data flow sink for "Code injection" vulnerabilities.
    */
   abstract class Sink extends DataFlow::Node {
-    /**
-     * Holds if this sink is safe for an attacker that only controls a substring.
-     * DEPRECATED: Use `getAState()`
-     */
-    deprecated DataFlow::FlowState getAFlowState() {
-      result = [FlowState::substring(), FlowState::full()]
-    }
-
     /** Holds if this sink is safe for an attacker that only controls a substring. */
     FlowState::State getAState() { any() }
   }
@@ -96,13 +68,6 @@ module CodeInjection {
    * A sanitizer for "Code injection" vulnerabilities.
    */
   abstract class Sanitizer extends DataFlow::Node {
-    /**
-     * Gets a flow state for which this is a sanitizer.
-     * Sanitizes all states if the result is empty.
-     * DEPRECATED: Use `getAState()`
-     */
-    deprecated DataFlow::FlowState getAFlowState() { none() }
-
     /**
      * Gets a flow state for which this is a sanitizer.
      * Sanitizes all states if the result is empty.
@@ -123,12 +88,6 @@ module CodeInjection {
 
     CodeExecutionAsSink() { this = c.getCode() }
 
-    deprecated override DataFlow::FlowState getAFlowState() {
-      if c.runsArbitraryCode()
-      then result = [FlowState::substring(), FlowState::full()] // If it runs arbitrary code then it's always vulnerable.
-      else result = FlowState::full() // If it "just" loads something, then it's only vulnerable if the attacker controls the entire string.
-    }
-
     override FlowState::State getAState() {
       if c.runsArbitraryCode()
       then any() // If it runs arbitrary code then it's always vulnerable.
@@ -153,8 +112,6 @@ module CodeInjection {
       )
     }
 
-    deprecated override DataFlow::FlowState getAFlowState() { result = FlowState::full() }
-
     override FlowState::State getAState() { result instanceof FlowState::Full }
   }
 
diff --git a/ruby/ql/lib/codeql/ruby/security/CodeInjectionQuery.qll b/ruby/ql/lib/codeql/ruby/security/CodeInjectionQuery.qll
index 6641bbe2c34..9394601c5ed 100644
--- a/ruby/ql/lib/codeql/ruby/security/CodeInjectionQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/CodeInjectionQuery.qll
@@ -11,34 +11,6 @@ import codeql.ruby.TaintTracking
 import CodeInjectionCustomizations::CodeInjection
 import codeql.ruby.dataflow.BarrierGuards
 
-/**
- * A taint-tracking configuration for detecting "Code injection" vulnerabilities.
- * DEPRECATED: Use `CodeInjectionFlow` instead
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "CodeInjection" }
-
-  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) {
-    state = source.(Source).getAFlowState()
-  }
-
-  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) {
-    state = sink.(Sink).getAFlowState()
-  }
-
-  override predicate isSanitizer(DataFlow::Node node) {
-    node instanceof Sanitizer and not exists(node.(Sanitizer).getAFlowState())
-    or
-    node instanceof StringConstCompareBarrier
-    or
-    node instanceof StringConstArrayInclusionCallBarrier
-  }
-
-  override predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) {
-    node.(Sanitizer).getAFlowState() = state
-  }
-}
-
 private module Config implements DataFlow::StateConfigSig {
   class FlowState = FlowState::State;
 
diff --git a/ruby/ql/lib/codeql/ruby/security/CommandInjectionQuery.qll b/ruby/ql/lib/codeql/ruby/security/CommandInjectionQuery.qll
index 4111d6c5d4a..74d00b25479 100644
--- a/ruby/ql/lib/codeql/ruby/security/CommandInjectionQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/CommandInjectionQuery.qll
@@ -13,24 +13,6 @@ import CommandInjectionCustomizations::CommandInjection
 import codeql.ruby.DataFlow
 import codeql.ruby.dataflow.BarrierGuards
 
-/**
- * A taint-tracking configuration for reasoning about command-injection vulnerabilities.
- * DEPRECATED: Use `CommandInjectionFlow` instead
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "CommandInjection" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) {
-    node instanceof Sanitizer or
-    node instanceof StringConstCompareBarrier or
-    node instanceof StringConstArrayInclusionCallBarrier
-  }
-}
-
 private module Config implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/ruby/ql/lib/codeql/ruby/security/ConditionalBypassQuery.qll b/ruby/ql/lib/codeql/ruby/security/ConditionalBypassQuery.qll
index 2c4d3ede0f5..fa7e829d684 100644
--- a/ruby/ql/lib/codeql/ruby/security/ConditionalBypassQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/ConditionalBypassQuery.qll
@@ -11,23 +11,6 @@ private import codeql.ruby.TaintTracking
 private import codeql.ruby.security.SensitiveActions
 import ConditionalBypassCustomizations::ConditionalBypass
 
-/**
- * A taint tracking configuration for bypass of sensitive action guards.
- * DEPRECATED: Use `ConditionalBypassFlow` instead
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "ConditionalBypass" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) {
-    super.isSanitizer(node) or
-    node instanceof Sanitizer
-  }
-}
-
 private module Config implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/ruby/ql/lib/codeql/ruby/security/HardcodedDataInterpretedAsCodeCustomizations.qll b/ruby/ql/lib/codeql/ruby/security/HardcodedDataInterpretedAsCodeCustomizations.qll
index daba69f6ca2..6d4d411baa1 100644
--- a/ruby/ql/lib/codeql/ruby/security/HardcodedDataInterpretedAsCodeCustomizations.qll
+++ b/ruby/ql/lib/codeql/ruby/security/HardcodedDataInterpretedAsCodeCustomizations.qll
@@ -19,18 +19,6 @@ module HardcodedDataInterpretedAsCode {
    * Flow states used to distinguish value-preserving flow from taint flow.
    */
   module FlowState {
-    /**
-     * Flow state used to track value-preserving flow.
-     * DEPRECATED: Use `Data()`
-     */
-    deprecated DataFlow::FlowState data() { result = "data" }
-
-    /**
-     * Flow state used to tainted data (non-value preserving flow).
-     * DEPRECATED: Use `Taint()`
-     */
-    deprecated DataFlow::FlowState taint() { result = "taint" }
-
     /**
      * Flow states used to distinguish value-preserving flow from taint flow.
      */
@@ -45,12 +33,6 @@ module HardcodedDataInterpretedAsCode {
    * A data flow source for hard-coded data.
    */
   abstract class Source extends DataFlow::Node {
-    /**
-     * Gets a flow label for which this is a source.
-     * DEPRECATED: Use `getALabel()`
-     */
-    deprecated DataFlow::FlowState getLabel() { result = FlowState::data() }
-
     /**
      * Gets a flow label for which this is a source.
      */
@@ -64,17 +46,6 @@ module HardcodedDataInterpretedAsCode {
     /** Gets a description of what kind of sink this is. */
     abstract string getKind();
 
-    /**
-     * Gets a flow label for which this is a sink.
-     * DEPRECATED: Use `getALabel()`
-     */
-    deprecated DataFlow::FlowState getLabel() {
-      // We want to ignore value-flow and only consider taint-flow, since the
-      // source is just a hex string, and evaluating that directly will just
-      // cause a syntax error.
-      result = FlowState::taint()
-    }
-
     /**
      * Gets a flow label for which this is a sink.
      */
diff --git a/ruby/ql/lib/codeql/ruby/security/HardcodedDataInterpretedAsCodeQuery.qll b/ruby/ql/lib/codeql/ruby/security/HardcodedDataInterpretedAsCodeQuery.qll
index a3e58f43e43..3fdd6ffc2a4 100644
--- a/ruby/ql/lib/codeql/ruby/security/HardcodedDataInterpretedAsCodeQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/HardcodedDataInterpretedAsCodeQuery.qll
@@ -12,39 +12,6 @@ private import codeql.ruby.TaintTracking
 private import codeql.ruby.dataflow.internal.TaintTrackingPrivate
 import HardcodedDataInterpretedAsCodeCustomizations::HardcodedDataInterpretedAsCode
 
-/**
- * A taint-tracking configuration for reasoning about hard-coded data
- * being interpreted as code.
- *
- * DEPRECATED: Use `HardcodedDataInterpretedAsCodeFlow` instead
- */
-deprecated class Configuration extends DataFlow::Configuration {
-  Configuration() { this = "HardcodedDataInterpretedAsCode" }
-
-  override predicate isSource(DataFlow::Node source, DataFlow::FlowState label) {
-    source.(Source).getLabel() = label
-  }
-
-  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState label) {
-    sink.(Sink).getLabel() = label
-  }
-
-  override predicate isBarrier(DataFlow::Node node) {
-    super.isBarrier(node) or
-    node instanceof Sanitizer
-  }
-
-  override predicate isAdditionalFlowStep(
-    DataFlow::Node nodeFrom, DataFlow::FlowState stateFrom, DataFlow::Node nodeTo,
-    DataFlow::FlowState stateTo
-  ) {
-    defaultAdditionalTaintStep(nodeFrom, nodeTo, _) and
-    // This is a taint step, so the flow state becomes `taint`.
-    stateFrom = [FlowState::data(), FlowState::taint()] and
-    stateTo = FlowState::taint()
-  }
-}
-
 private module Config implements DataFlow::StateConfigSig {
   class FlowState = FlowState::State;
 
diff --git a/ruby/ql/lib/codeql/ruby/security/HttpToFileAccessQuery.qll b/ruby/ql/lib/codeql/ruby/security/HttpToFileAccessQuery.qll
index 9b3d7635c87..6a2eb63198a 100644
--- a/ruby/ql/lib/codeql/ruby/security/HttpToFileAccessQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/HttpToFileAccessQuery.qll
@@ -23,19 +23,3 @@ module HttpToFileAccessConfig implements DataFlow::ConfigSig {
  * Taint tracking for writing user-controlled data to files.
  */
 module HttpToFileAccessFlow = TaintTracking::Global<HttpToFileAccessConfig>;
-
-/**
- * DEPRECATED. Use the `HttpToFileAccessFlow` module instead.
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "HttpToFileAccess" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) {
-    super.isSanitizer(node) or
-    node instanceof Sanitizer
-  }
-}
diff --git a/ruby/ql/lib/codeql/ruby/security/ImproperLdapAuthQuery.qll b/ruby/ql/lib/codeql/ruby/security/ImproperLdapAuthQuery.qll
index 81a85f596c9..bddc6d2c3c4 100644
--- a/ruby/ql/lib/codeql/ruby/security/ImproperLdapAuthQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/ImproperLdapAuthQuery.qll
@@ -7,20 +7,6 @@ private import codeql.ruby.DataFlow
 private import codeql.ruby.TaintTracking
 private import ImproperLdapAuthCustomizations::ImproperLdapAuth
 
-/**
- * A taint-tracking configuration for detecting improper LDAP authentication vulnerabilities.
- * DEPRECATED: Use `ImproperLdapAuthFlow` instead
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "ImproperLdapAuth" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-}
-
 private module ImproperLdapAuthConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/ruby/ql/lib/codeql/ruby/security/InsecureDownloadCustomizations.qll b/ruby/ql/lib/codeql/ruby/security/InsecureDownloadCustomizations.qll
index 0ac51d38ed6..59fb2391c7e 100644
--- a/ruby/ql/lib/codeql/ruby/security/InsecureDownloadCustomizations.qll
+++ b/ruby/ql/lib/codeql/ruby/security/InsecureDownloadCustomizations.qll
@@ -19,12 +19,6 @@ module InsecureDownload {
    * A data flow source for download of sensitive file through insecure connection.
    */
   abstract class Source extends DataFlow::Node {
-    /**
-     * Gets a flow-label for this source.
-     * DEPRECATED: Use `getAFlowLabel()`
-     */
-    abstract deprecated DataFlow::FlowState getALabel();
-
     /**
      * Gets a flow-label for this source.
      */
@@ -40,12 +34,6 @@ module InsecureDownload {
      */
     abstract DataFlow::Node getDownloadCall();
 
-    /**
-     * Gets a flow-label where this sink is vulnerable.
-     * DEPRECATED: Use `getAFlowLabel()`
-     */
-    abstract deprecated DataFlow::FlowState getALabel();
-
     /**
      * Gets a flow-label where this sink is vulnerable.
      */
@@ -61,30 +49,6 @@ module InsecureDownload {
    * Flow-labels for reasoning about download of sensitive file through insecure connection.
    */
   module Label {
-    /**
-     * A flow-label for a URL that is downloaded over an insecure connection.
-     * DEPRECATED: Use `InsecureState()`
-     */
-    deprecated class Insecure extends DataFlow::FlowState {
-      Insecure() { this = "insecure" }
-    }
-
-    /**
-     * A flow-label for a URL that is sensitive.
-     * DEPRECATED: Use `SensitiveState()`
-     */
-    deprecated class Sensitive extends DataFlow::FlowState {
-      Sensitive() { this = "sensitive" }
-    }
-
-    /**
-     * A flow-label for file URLs that are both sensitive and downloaded over an insecure connection.
-     * DEPRECATED: Use `SensitiveInsecureState()`
-     */
-    deprecated class SensitiveInsecure extends DataFlow::FlowState {
-      SensitiveInsecure() { this = "sensitiveInsecure" }
-    }
-
     /**
      * Flow-labels for reasoning about download of sensitive file through insecure connection.
      */
@@ -114,13 +78,6 @@ module InsecureDownload {
    * seen as a source for downloads of sensitive files through an insecure connection.
    */
   class InsecureFileUrl extends Source, InsecureUrl {
-    deprecated override DataFlow::FlowState getALabel() {
-      result instanceof Label::Insecure
-      or
-      hasUnsafeExtension(str) and
-      result instanceof Label::SensitiveInsecure
-    }
-
     override Label::State getAFlowLabel() {
       result = Label::InsecureState()
       or
@@ -136,8 +93,6 @@ module InsecureDownload {
   class SensitiveFileName extends Source {
     SensitiveFileName() { hasUnsafeExtension(this.asExpr().getConstantValue().getString()) }
 
-    deprecated override DataFlow::FlowState getALabel() { result instanceof Label::Sensitive }
-
     override Label::State getAFlowLabel() { result = Label::SensitiveState() }
   }
 
@@ -180,12 +135,6 @@ module InsecureDownload {
 
     override DataFlow::Node getDownloadCall() { result = req }
 
-    deprecated override DataFlow::FlowState getALabel() {
-      result instanceof Label::SensitiveInsecure
-      or
-      any(req.getAUrlPart()) instanceof InsecureUrl and result instanceof Label::Sensitive
-    }
-
     override Label::State getAFlowLabel() {
       result = Label::SensitiveInsecureState()
       or
@@ -232,8 +181,6 @@ module InsecureDownload {
       )
     }
 
-    deprecated override DataFlow::FlowState getALabel() { result instanceof Label::Insecure }
-
     override Label::State getAFlowLabel() { result = Label::InsecureState() }
 
     override DataFlow::Node getDownloadCall() { result = request }
diff --git a/ruby/ql/lib/codeql/ruby/security/LogInjectionQuery.qll b/ruby/ql/lib/codeql/ruby/security/LogInjectionQuery.qll
index a2fce6ae06b..648f9496ea1 100644
--- a/ruby/ql/lib/codeql/ruby/security/LogInjectionQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/LogInjectionQuery.qll
@@ -25,20 +25,6 @@ abstract class Sink extends DataFlow::Node { }
  */
 abstract class Sanitizer extends DataFlow::Node { }
 
-/**
- * A taint-tracking configuration for untrusted user input used in log entries.
- * DEPRECATED: Use `LogInjectionFlow`
- */
-deprecated class LogInjectionConfiguration extends TaintTracking::Configuration {
-  LogInjectionConfiguration() { this = "LogInjection" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-}
-
 /**
  * A source of remote user controlled input.
  */
diff --git a/ruby/ql/lib/codeql/ruby/security/PathInjectionQuery.qll b/ruby/ql/lib/codeql/ruby/security/PathInjectionQuery.qll
index 1c48d54e424..55329c50717 100644
--- a/ruby/ql/lib/codeql/ruby/security/PathInjectionQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/PathInjectionQuery.qll
@@ -12,23 +12,6 @@ private import codeql.ruby.Concepts
 private import codeql.ruby.DataFlow
 private import codeql.ruby.TaintTracking
 
-/**
- * A taint-tracking configuration for reasoning about path injection
- * vulnerabilities.
- * DEPRECATED: Use `PathInjectionFlow`
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "PathInjection" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof PathInjection::Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof PathInjection::Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) {
-    node instanceof Path::PathSanitization or node instanceof PathInjection::Sanitizer
-  }
-}
-
 private module PathInjectionConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof PathInjection::Source }
 
diff --git a/ruby/ql/lib/codeql/ruby/security/ReflectedXSSQuery.qll b/ruby/ql/lib/codeql/ruby/security/ReflectedXSSQuery.qll
index 964e75d39dc..d1618a94904 100644
--- a/ruby/ql/lib/codeql/ruby/security/ReflectedXSSQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/ReflectedXSSQuery.qll
@@ -10,32 +10,6 @@ private import codeql.ruby.AST
 import codeql.ruby.DataFlow
 import codeql.ruby.TaintTracking
 
-/**
- * Provides a taint-tracking configuration for detecting "reflected server-side cross-site scripting" vulnerabilities.
- * DEPRECATED: Use `ReflectedXssFlow`
- */
-deprecated module ReflectedXss {
-  import XSS::ReflectedXss
-
-  /**
-   * A taint-tracking configuration for detecting "reflected server-side cross-site scripting" vulnerabilities.
-   * DEPRECATED: Use `ReflectedXssFlow`
-   */
-  deprecated class Configuration extends TaintTracking::Configuration {
-    Configuration() { this = "ReflectedXSS" }
-
-    override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-    override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-
-    override predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) {
-      isAdditionalXssTaintStep(node1, node2)
-    }
-  }
-}
-
 private module ReflectedXssConfig implements DataFlow::ConfigSig {
   private import XSS::ReflectedXss as RX
 
diff --git a/ruby/ql/lib/codeql/ruby/security/SensitiveGetQueryQuery.qll b/ruby/ql/lib/codeql/ruby/security/SensitiveGetQueryQuery.qll
index d18b6949f10..d3fe93fa764 100644
--- a/ruby/ql/lib/codeql/ruby/security/SensitiveGetQueryQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/SensitiveGetQueryQuery.qll
@@ -10,27 +10,6 @@
 private import ruby
 private import codeql.ruby.TaintTracking
 
-/**
- * Provides a taint-tracking configuration for detecting flow of query string
- * data to sensitive actions in GET query request handlers.
- * DEPRECATED: Use `SensitiveGetQueryFlow`
- */
-deprecated module SensitiveGetQuery {
-  import SensitiveGetQueryCustomizations::SensitiveGetQuery
-
-  /**
-   * A taint-tracking configuration for reasoning about use of sensitive data
-   * from a GET request query string.
-   */
-  deprecated class Configuration extends TaintTracking::Configuration {
-    Configuration() { this = "SensitiveGetQuery" }
-
-    override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-  }
-}
-
 private module SensitiveGetQueryConfig implements DataFlow::ConfigSig {
   import SensitiveGetQueryCustomizations::SensitiveGetQuery
 
diff --git a/ruby/ql/lib/codeql/ruby/security/ServerSideRequestForgeryQuery.qll b/ruby/ql/lib/codeql/ruby/security/ServerSideRequestForgeryQuery.qll
index 319bbc30d5d..2e8aed1c0b8 100644
--- a/ruby/ql/lib/codeql/ruby/security/ServerSideRequestForgeryQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/ServerSideRequestForgeryQuery.qll
@@ -12,25 +12,6 @@ import codeql.ruby.TaintTracking
 import ServerSideRequestForgeryCustomizations::ServerSideRequestForgery
 import codeql.ruby.dataflow.BarrierGuards
 
-/**
- * A taint-tracking configuration for detecting
- * "Server side request forgery" vulnerabilities.
- * DEPRECATED: Use `ServerSideRequestForgeryFlow`
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "ServerSideRequestForgery" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) {
-    node instanceof Sanitizer or
-    node instanceof StringConstCompareBarrier or
-    node instanceof StringConstArrayInclusionCallBarrier
-  }
-}
-
 private module ServerSideRequestForgeryConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/ruby/ql/lib/codeql/ruby/security/SqlInjectionQuery.qll b/ruby/ql/lib/codeql/ruby/security/SqlInjectionQuery.qll
index 9225552a840..40a9b603bf4 100644
--- a/ruby/ql/lib/codeql/ruby/security/SqlInjectionQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/SqlInjectionQuery.qll
@@ -7,20 +7,6 @@ private import codeql.ruby.DataFlow
 private import codeql.ruby.TaintTracking
 import SqlInjectionCustomizations::SqlInjection
 
-/**
- * A taint-tracking configuration for detecting SQL injection vulnerabilities.
- * DEPRECATED: Use `SqlInjectionFlow`
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "SqlInjectionConfiguration" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-}
-
 private module SqlInjectionConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/ruby/ql/lib/codeql/ruby/security/StackTraceExposureQuery.qll b/ruby/ql/lib/codeql/ruby/security/StackTraceExposureQuery.qll
index b07c3d584da..8342c382cdb 100644
--- a/ruby/ql/lib/codeql/ruby/security/StackTraceExposureQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/StackTraceExposureQuery.qll
@@ -11,20 +11,6 @@ private import codeql.ruby.DataFlow
 private import codeql.ruby.TaintTracking
 private import StackTraceExposureCustomizations::StackTraceExposure
 
-/**
- * A taint-tracking configuration for detecting "stack trace exposure" vulnerabilities.
- * DEPRECATED: Use `StackTraceExposureFlow`
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "StackTraceExposure" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-}
-
 private module StackTraceExposureConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/ruby/ql/lib/codeql/ruby/security/TaintedFormatStringQuery.qll b/ruby/ql/lib/codeql/ruby/security/TaintedFormatStringQuery.qll
index b10088af82e..1231921649e 100644
--- a/ruby/ql/lib/codeql/ruby/security/TaintedFormatStringQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/TaintedFormatStringQuery.qll
@@ -25,19 +25,3 @@ module TaintedFormatStringConfig implements DataFlow::ConfigSig {
  * Taint-tracking for format injections.
  */
 module TaintedFormatStringFlow = TaintTracking::Global<TaintedFormatStringConfig>;
-
-/**
- * DEPRECATED. Use the `TaintedFormatStringFlow` module instead.
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "TaintedFormatString" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) {
-    super.isSanitizer(node) or
-    node instanceof Sanitizer
-  }
-}
diff --git a/ruby/ql/lib/codeql/ruby/security/TemplateInjectionQuery.qll b/ruby/ql/lib/codeql/ruby/security/TemplateInjectionQuery.qll
index 8cc26e189aa..3e361091549 100644
--- a/ruby/ql/lib/codeql/ruby/security/TemplateInjectionQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/TemplateInjectionQuery.qll
@@ -7,20 +7,6 @@ private import codeql.ruby.DataFlow
 private import codeql.ruby.TaintTracking
 import TemplateInjectionCustomizations::TemplateInjection
 
-/**
- * A taint-tracking configuration for detecting Server Side Template Injections vulnerabilities.
- * DEPRECATED: Use `TemplateInjectionFlow`
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "TemplateInjection" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-}
-
 private module TemplateInjectionConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/ruby/ql/lib/codeql/ruby/security/UnsafeCodeConstructionQuery.qll b/ruby/ql/lib/codeql/ruby/security/UnsafeCodeConstructionQuery.qll
index 32cc9a4f821..06dc8797832 100644
--- a/ruby/ql/lib/codeql/ruby/security/UnsafeCodeConstructionQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/UnsafeCodeConstructionQuery.qll
@@ -12,28 +12,6 @@ import UnsafeCodeConstructionCustomizations::UnsafeCodeConstruction
 private import codeql.ruby.TaintTracking
 private import codeql.ruby.dataflow.BarrierGuards
 
-/**
- * A taint-tracking configuration for detecting code constructed from library input vulnerabilities.
- * DEPRECATED: Use `UnsafeCodeConstructionFlow`
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "UnsafeShellCommandConstruction" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) {
-    node instanceof StringConstCompareBarrier or
-    node instanceof StringConstArrayInclusionCallBarrier
-  }
-
-  // override to require the path doesn't have unmatched return steps
-  override DataFlow::FlowFeature getAFeature() {
-    result instanceof DataFlow::FeatureHasSourceCallContext
-  }
-}
-
 private module UnsafeCodeConstructionConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/ruby/ql/lib/codeql/ruby/security/UnsafeDeserializationQuery.qll b/ruby/ql/lib/codeql/ruby/security/UnsafeDeserializationQuery.qll
index 0c6e97f1fa0..ad7749d68aa 100644
--- a/ruby/ql/lib/codeql/ruby/security/UnsafeDeserializationQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/UnsafeDeserializationQuery.qll
@@ -11,25 +11,6 @@ private import codeql.ruby.DataFlow
 private import codeql.ruby.TaintTracking
 import UnsafeDeserializationCustomizations
 
-/**
- * A taint-tracking configuration for reasoning about unsafe deserialization.
- * DEPRECATED: Use `UnsafeDeserializationFlow`
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "UnsafeDeserialization" }
-
-  override predicate isSource(DataFlow::Node source) {
-    source instanceof UnsafeDeserialization::Source
-  }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof UnsafeDeserialization::Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) {
-    super.isSanitizer(node) or
-    node instanceof UnsafeDeserialization::Sanitizer
-  }
-}
-
 private module UnsafeDeserializationConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof UnsafeDeserialization::Source }
 
diff --git a/ruby/ql/lib/codeql/ruby/security/UnsafeHtmlConstructionQuery.qll b/ruby/ql/lib/codeql/ruby/security/UnsafeHtmlConstructionQuery.qll
index 9d655a6d16a..44e008cfa8b 100644
--- a/ruby/ql/lib/codeql/ruby/security/UnsafeHtmlConstructionQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/UnsafeHtmlConstructionQuery.qll
@@ -12,25 +12,6 @@ import UnsafeHtmlConstructionCustomizations::UnsafeHtmlConstruction
 private import codeql.ruby.TaintTracking
 private import codeql.ruby.dataflow.BarrierGuards
 
-/**
- * A taint-tracking configuration for detecting unsafe HTML construction.
- * DEPRECATED: Use `UnsafeHtmlConstructionFlow`
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "UnsafeHtmlConstruction" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-
-  // override to require the path doesn't have unmatched return steps
-  override DataFlow::FlowFeature getAFeature() {
-    result instanceof DataFlow::FeatureHasSourceCallContext
-  }
-}
-
 private module UnsafeHtmlConstructionConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/ruby/ql/lib/codeql/ruby/security/UnsafeShellCommandConstructionQuery.qll b/ruby/ql/lib/codeql/ruby/security/UnsafeShellCommandConstructionQuery.qll
index b4e0b8b6bb5..6e3ac947a51 100644
--- a/ruby/ql/lib/codeql/ruby/security/UnsafeShellCommandConstructionQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/UnsafeShellCommandConstructionQuery.qll
@@ -13,29 +13,6 @@ private import codeql.ruby.TaintTracking
 private import CommandInjectionCustomizations::CommandInjection as CommandInjection
 private import codeql.ruby.dataflow.BarrierGuards
 
-/**
- * A taint-tracking configuration for detecting shell command constructed from library input vulnerabilities.
- * DEPRECATED: Use `UnsafeShellCommandConstructionFlow`
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "UnsafeShellCommandConstruction" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) {
-    node instanceof CommandInjection::Sanitizer or // using all sanitizers from `rb/command-injection`
-    node instanceof StringConstCompareBarrier or
-    node instanceof StringConstArrayInclusionCallBarrier
-  }
-
-  // override to require the path doesn't have unmatched return steps
-  override DataFlow::FlowFeature getAFeature() {
-    result instanceof DataFlow::FeatureHasSourceCallContext
-  }
-}
-
 private module UnsafeShellCommandConstructionConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/ruby/ql/lib/codeql/ruby/security/UrlRedirectQuery.qll b/ruby/ql/lib/codeql/ruby/security/UrlRedirectQuery.qll
index 37334445aa7..6169de81269 100644
--- a/ruby/ql/lib/codeql/ruby/security/UrlRedirectQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/UrlRedirectQuery.qll
@@ -12,24 +12,6 @@ import codeql.ruby.TaintTracking
 import UrlRedirectCustomizations
 import UrlRedirectCustomizations::UrlRedirect
 
-/**
- * A taint-tracking configuration for detecting "URL redirection" vulnerabilities.
- * DEPRECATED: Use `UrlRedirectFlow`
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "UrlRedirect" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-
-  override predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) {
-    UrlRedirect::isAdditionalTaintStep(node1, node2)
-  }
-}
-
 private module UrlRedirectConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/ruby/ql/lib/codeql/ruby/security/regexp/MissingFullAnchorQuery.qll b/ruby/ql/lib/codeql/ruby/security/regexp/MissingFullAnchorQuery.qll
index 19ac3600fa1..febfa0712d9 100644
--- a/ruby/ql/lib/codeql/ruby/security/regexp/MissingFullAnchorQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/regexp/MissingFullAnchorQuery.qll
@@ -11,21 +11,6 @@ import ruby
 import codeql.ruby.TaintTracking
 import MissingFullAnchorCustomizations::MissingFullAnchor
 
-/**
- * A taint tracking configuration for reasoning about
- * missing full-anchored regular expressions.
- * DEPRECATED: Use `MissingFullAnchorFlow`
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "MissingFullAnchor" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-}
-
 private module MissingFullAnchorConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof Source }
 
diff --git a/ruby/ql/lib/codeql/ruby/security/regexp/PolynomialReDoSQuery.qll b/ruby/ql/lib/codeql/ruby/security/regexp/PolynomialReDoSQuery.qll
index 934f8812019..98a42fcf5e7 100644
--- a/ruby/ql/lib/codeql/ruby/security/regexp/PolynomialReDoSQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/regexp/PolynomialReDoSQuery.qll
@@ -10,30 +10,6 @@
 private import codeql.ruby.DataFlow
 private import codeql.ruby.TaintTracking
 
-/**
- * Provides a taint-tracking configuration for detecting polynomial regular
- * expression denial of service vulnerabilities.
- * DEPRECATED: Use `PolynomialReDoSFlow`
- */
-deprecated module PolynomialReDoS {
-  import PolynomialReDoSCustomizations::PolynomialReDoS
-
-  /**
-   * A taint-tracking configuration for detecting polynomial regular expression
-   * denial of service vulnerabilities.
-   * DEPRECATED: Use `PolynomialReDoSFlow`
-   */
-  deprecated class Configuration extends TaintTracking::Configuration {
-    Configuration() { this = "PolynomialReDoS" }
-
-    override predicate isSource(DataFlow::Node source) { source instanceof Source }
-
-    override predicate isSink(DataFlow::Node sink) { sink instanceof Sink }
-
-    override predicate isSanitizer(DataFlow::Node node) { node instanceof Sanitizer }
-  }
-}
-
 private module PolynomialReDoSConfig implements DataFlow::ConfigSig {
   private import PolynomialReDoSCustomizations::PolynomialReDoS
 
diff --git a/ruby/ql/lib/codeql/ruby/security/regexp/RegExpInjectionQuery.qll b/ruby/ql/lib/codeql/ruby/security/regexp/RegExpInjectionQuery.qll
index 353c13a3c2d..3e6f6f83ef8 100644
--- a/ruby/ql/lib/codeql/ruby/security/regexp/RegExpInjectionQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/regexp/RegExpInjectionQuery.qll
@@ -11,20 +11,6 @@ import codeql.ruby.TaintTracking
 import RegExpInjectionCustomizations
 import codeql.ruby.dataflow.BarrierGuards
 
-/**
- * A taint-tracking configuration for detecting regexp injection vulnerabilities.
- * DEPRECATED: Use `RegExpInjectionFlow`
- */
-deprecated class Configuration extends TaintTracking::Configuration {
-  Configuration() { this = "RegExpInjection" }
-
-  override predicate isSource(DataFlow::Node source) { source instanceof RegExpInjection::Source }
-
-  override predicate isSink(DataFlow::Node sink) { sink instanceof RegExpInjection::Sink }
-
-  override predicate isSanitizer(DataFlow::Node node) { node instanceof RegExpInjection::Sanitizer }
-}
-
 private module RegExpInjectionConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof RegExpInjection::Source }
 
diff --git a/ruby/ql/test/library-tests/concepts/CryptographicOperation.expected b/ruby/ql/test/library-tests/concepts/CryptographicOperation.expected
index 48de9172b36..e69de29bb2d 100644
--- a/ruby/ql/test/library-tests/concepts/CryptographicOperation.expected
+++ b/ruby/ql/test/library-tests/concepts/CryptographicOperation.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/ruby/ql/test/library-tests/dataflow/api-graphs/VerifyApiGraphExpectations.expected b/ruby/ql/test/library-tests/dataflow/api-graphs/VerifyApiGraphExpectations.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/ruby/ql/test/library-tests/dataflow/api-graphs/VerifyApiGraphExpectations.expected
+++ b/ruby/ql/test/library-tests/dataflow/api-graphs/VerifyApiGraphExpectations.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/ruby/ql/test/library-tests/dataflow/array-flow/type-tracking-array-flow.expected b/ruby/ql/test/library-tests/dataflow/array-flow/type-tracking-array-flow.expected
index 08bd543b2cd..af0a1e7ef11 100644
--- a/ruby/ql/test/library-tests/dataflow/array-flow/type-tracking-array-flow.expected
+++ b/ruby/ql/test/library-tests/dataflow/array-flow/type-tracking-array-flow.expected
@@ -1,4 +1,3 @@
-testFailures
 | array_flow.rb:107:10:107:13 | ...[...] | Unexpected result: hasValueFlow=11.2 |
 | array_flow.rb:179:28:179:46 | # $ hasValueFlow=19 | Missing result: hasValueFlow=19 |
 | array_flow.rb:180:28:180:46 | # $ hasValueFlow=19 | Missing result: hasValueFlow=19 |
@@ -65,4 +64,3 @@ testFailures
 | array_flow.rb:1626:19:1626:70 | # $ hasValueFlow=136.2 $ SPURIOUS hasValueFlow=136.1 | Missing result: hasValueFlow=136.2 |
 | array_flow.rb:1627:19:1627:40 | # $ hasValueFlow=136.1 | Missing result: hasValueFlow=136.1 |
 | array_flow.rb:1699:13:1699:32 | # $ hasValueFlow=143 | Missing result: hasValueFlow=143 |
-failures
diff --git a/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-guards.expected b/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-guards.expected
index 21d697c86e9..919dcb71c2f 100644
--- a/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-guards.expected
+++ b/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-guards.expected
@@ -1,5 +1,4 @@
 testFailures
-failures
 newStyleBarrierGuards
 | barrier-guards.rb:3:16:4:19 | [input] SSA phi read(foo) |
 | barrier-guards.rb:4:5:4:7 | foo |
diff --git a/ruby/ql/test/library-tests/dataflow/global/TypeTrackingInlineTest.expected b/ruby/ql/test/library-tests/dataflow/global/TypeTrackingInlineTest.expected
index 0f65c470b9c..413b5d6748f 100644
--- a/ruby/ql/test/library-tests/dataflow/global/TypeTrackingInlineTest.expected
+++ b/ruby/ql/test/library-tests/dataflow/global/TypeTrackingInlineTest.expected
@@ -1,4 +1,3 @@
-testFailures
 | blocks.rb:4:10:4:10 | r | Fixed missing result: hasValueFlow=1 |
 | captured_variables.rb:50:10:50:10 | x | Fixed missing result: hasValueFlow=2 |
 | captured_variables.rb:68:25:68:68 | # $ hasValueFlow=3 $ MISSING: hasValueFlow=4 | Missing result: hasValueFlow=3 |
@@ -30,4 +29,3 @@ testFailures
 | instance_variables.rb:114:23:114:41 | # $ hasValueFlow=28 | Missing result: hasValueFlow=28 |
 | instance_variables.rb:117:23:117:41 | # $ hasValueFlow=29 | Missing result: hasValueFlow=29 |
 | instance_variables.rb:120:23:120:41 | # $ hasValueFlow=30 | Missing result: hasValueFlow=30 |
-failures
diff --git a/ruby/ql/test/library-tests/dataflow/hash-flow/type-tracking-hash-flow.expected b/ruby/ql/test/library-tests/dataflow/hash-flow/type-tracking-hash-flow.expected
index c3d0d531ffa..e812393899e 100644
--- a/ruby/ql/test/library-tests/dataflow/hash-flow/type-tracking-hash-flow.expected
+++ b/ruby/ql/test/library-tests/dataflow/hash-flow/type-tracking-hash-flow.expected
@@ -1,4 +1,3 @@
-testFailures
 | hash_flow.rb:65:21:65:40 | # $ hasValueFlow=3.3 | Missing result: hasValueFlow=3.3 |
 | hash_flow.rb:66:21:66:49 | # $ SPURIOUS hasValueFlow=3.3 | Missing result: hasValueFlow=3.3 |
 | hash_flow.rb:117:10:117:17 | ...[...] | Unexpected result: hasValueFlow=7.1 |
@@ -21,4 +20,3 @@ testFailures
 | hash_flow.rb:779:10:779:14 | ...[...] | Unexpected result: hasValueFlow=46.3 |
 | hash_flow.rb:781:10:781:17 | ...[...] | Unexpected result: hasValueFlow=46.1 |
 | hash_flow.rb:784:10:784:17 | ...[...] | Unexpected result: hasValueFlow=46.3 |
-failures
diff --git a/ruby/ql/test/query-tests/experimental/improper-memoization/ImproperMemoization.expected b/ruby/ql/test/query-tests/experimental/improper-memoization/ImproperMemoization.expected
index 86c29d64b6e..36c07e3e105 100644
--- a/ruby/ql/test/query-tests/experimental/improper-memoization/ImproperMemoization.expected
+++ b/ruby/ql/test/query-tests/experimental/improper-memoization/ImproperMemoization.expected
@@ -1,4 +1,3 @@
-failures
 testFailures
 | improper_memoization.rb:100:1:104:3 | m14 | Unexpected result: result=BAD |
 #select
diff --git a/ruby/ql/test/query-tests/security/cwe-116/IncompleteMultiCharacterSanitization/IncompleteMultiCharacterSanitization.expected b/ruby/ql/test/query-tests/security/cwe-116/IncompleteMultiCharacterSanitization/IncompleteMultiCharacterSanitization.expected
index 48de9172b36..e69de29bb2d 100644
--- a/ruby/ql/test/query-tests/security/cwe-116/IncompleteMultiCharacterSanitization/IncompleteMultiCharacterSanitization.expected
+++ b/ruby/ql/test/query-tests/security/cwe-116/IncompleteMultiCharacterSanitization/IncompleteMultiCharacterSanitization.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/ruby/ql/test/query-tests/security/cwe-300/InsecureDependency.expected b/ruby/ql/test/query-tests/security/cwe-300/InsecureDependency.expected
index d123230e55d..c27dc45b686 100644
--- a/ruby/ql/test/query-tests/security/cwe-300/InsecureDependency.expected
+++ b/ruby/ql/test/query-tests/security/cwe-300/InsecureDependency.expected
@@ -1,4 +1,3 @@
-failures
 testFailures
 #select
 | Gemfile:2:8:2:28 | "http://rubygems.org" | Dependency source URL uses the unencrypted protocol HTTP. Use HTTPS instead. |
diff --git a/ruby/ql/test/query-tests/security/cwe-829/InsecureDownload.expected b/ruby/ql/test/query-tests/security/cwe-829/InsecureDownload.expected
index c025499f2e8..2ea527a3fc6 100644
--- a/ruby/ql/test/query-tests/security/cwe-829/InsecureDownload.expected
+++ b/ruby/ql/test/query-tests/security/cwe-829/InsecureDownload.expected
@@ -1,5 +1,4 @@
 testFailures
-failures
 edges
 | insecure_download.rb:31:5:31:7 | url | insecure_download.rb:33:15:33:17 | url | provenance |  |
 | insecure_download.rb:31:5:31:7 | url | insecure_download.rb:33:15:33:17 | url | provenance |  |
diff --git a/rust/ast-generator/src/main.rs b/rust/ast-generator/src/main.rs
index 665ffbac6c7..3fe918a4c3e 100644
--- a/rust/ast-generator/src/main.rs
+++ b/rust/ast-generator/src/main.rs
@@ -14,24 +14,31 @@ fn project_root() -> PathBuf {
     PathBuf::from(dir).parent().unwrap().to_owned()
 }
 
-fn class_name(type_name: &String) -> String {
-    match type_name.as_str() {
+fn class_name(type_name: &str) -> String {
+    match type_name {
         "BinExpr" => "BinaryExpr".to_owned(),
         "ElseBranch" => "Expr".to_owned(),
         "Fn" => "Function".to_owned(),
         "Literal" => "LiteralExpr".to_owned(),
-        "Type" => "TypeRef".to_owned(),
+        "ArrayExpr" => "ArrayExprInternal".to_owned(),
+        _ if type_name.ends_with("Type") => format!("{}Repr", type_name),
         _ => type_name.to_owned(),
     }
 }
 
-fn property_name(type_name: &String, field_name: &String) -> String {
-    match (type_name.as_str(), field_name.as_str()) {
-        ("Path", "segment") => "part".to_owned(),
-        (_, "then_branch") => "then".to_owned(),
-        (_, "else_branch") => "else_".to_owned(),
-        _ => field_name.to_owned(),
-    }
+fn property_name(type_name: &str, field_name: &str) -> String {
+    let name = match (type_name, field_name) {
+        ("CallExpr", "expr") => "function",
+        ("LetExpr", "expr") => "scrutinee",
+        ("MatchExpr", "expr") => "scrutinee",
+        ("Path", "segment") => "part",
+        (_, "then_branch") => "then",
+        (_, "else_branch") => "else_",
+        ("ArrayType", "ty") => "element_type_repr",
+        (_, "ty") => "type_repr",
+        _ => field_name,
+    };
+    name.to_owned()
 }
 
 fn to_lower_snake_case(s: &str) -> String {
@@ -61,7 +68,7 @@ fn write_schema(
 
     for node in &grammar.enums {
         let super_classses = if let Some(cls) = super_types.get(&node.name) {
-            let super_classes: Vec<String> = cls.iter().map(class_name).collect();
+            let super_classes: Vec<String> = cls.iter().map(|s| class_name(s)).collect();
             super_classes.join(",")
         } else {
             "AstNode".to_owned()
@@ -76,7 +83,7 @@ fn write_schema(
     }
     for node in &grammar.nodes {
         let super_classses = if let Some(cls) = super_types.get(&node.name) {
-            let super_classes: Vec<String> = cls.iter().map(class_name).collect();
+            let super_classes: Vec<String> = cls.iter().map(|s| class_name(s)).collect();
             super_classes.join(",")
         } else {
             "AstNode".to_owned()
@@ -349,6 +356,13 @@ fn get_fields(node: &AstNodeSrc) -> Vec<FieldInfo> {
                 is_many: false,
             });
         }
+        "ArrayExpr" => {
+            result.push(FieldInfo {
+                name: "is_semicolon".to_string(),
+                tp: "predicate".to_string(),
+                is_many: false,
+            });
+        }
         _ => {}
     }
 
diff --git a/rust/codegen.conf b/rust/codegen.conf
index 29b6edc8985..d40fada446b 100644
--- a/rust/codegen.conf
+++ b/rust/codegen.conf
@@ -4,6 +4,7 @@
 --dbscheme=ql/lib/rust.dbscheme
 --ql-output=ql/lib/codeql/rust/elements/internal/generated
 --ql-stub-output=ql/lib/codeql/rust/elements
+--ql-cfg-output=ql/lib/codeql/rust/controlflow/internal/generated
 --ql-test-output=ql/test/extractor-tests/generated
 --rust-output=extractor/src/generated
 --script-name=codegen
diff --git a/rust/extractor/Cargo.toml b/rust/extractor/Cargo.toml
index 8b58898d3cf..97d348f4119 100644
--- a/rust/extractor/Cargo.toml
+++ b/rust/extractor/Cargo.toml
@@ -33,3 +33,6 @@ codeql-extractor = { path = "../../shared/tree-sitter-extractor" }
 rust-extractor-macros = { path = "macros" }
 itertools = "0.13.0"
 glob = "0.3.1"
+chrono = { version = "0.4.38", features = ["serde"] }
+serde_json = "1.0.133"
+dunce = "1.0.5"
diff --git a/rust/extractor/src/config.rs b/rust/extractor/src/config.rs
index 70c390b9949..0e92e82a58c 100644
--- a/rust/extractor/src/config.rs
+++ b/rust/extractor/src/config.rs
@@ -45,6 +45,7 @@ pub struct Config {
     pub scratch_dir: PathBuf,
     pub trap_dir: PathBuf,
     pub source_archive_dir: PathBuf,
+    pub diagnostic_dir: PathBuf,
     pub cargo_target_dir: Option<PathBuf>,
     pub cargo_target: Option<String>,
     pub cargo_features: Vec<String>,
diff --git a/rust/extractor/src/diagnostics.rs b/rust/extractor/src/diagnostics.rs
new file mode 100644
index 00000000000..92743a923d4
--- /dev/null
+++ b/rust/extractor/src/diagnostics.rs
@@ -0,0 +1,255 @@
+use crate::config::Config;
+use anyhow::Context;
+use chrono::{DateTime, Utc};
+use log::{debug, info};
+use ra_ap_project_model::ProjectManifest;
+use serde::ser::SerializeMap;
+use serde::Serialize;
+use std::collections::HashMap;
+use std::fmt::Display;
+use std::fs::File;
+use std::path::{Path, PathBuf};
+use std::time::Instant;
+
+#[derive(Default, Debug, Clone, Copy, Serialize)]
+#[serde(rename_all = "camelCase")]
+#[allow(dead_code)]
+enum Severity {
+    #[default]
+    Note,
+    Warning,
+    Error,
+}
+
+#[derive(Default, Debug, Clone, Copy, Serialize)]
+#[serde(rename_all = "camelCase")]
+struct Visibility {
+    status_page: bool,
+    cli_summary_table: bool,
+    telemetry: bool,
+}
+
+#[derive(Debug, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+#[allow(dead_code)]
+enum Message {
+    TextMessage(String),
+    MarkdownMessage(String),
+}
+
+impl Default for Message {
+    fn default() -> Self {
+        Message::TextMessage("".to_string())
+    }
+}
+
+#[derive(Default, Debug, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+struct Source {
+    id: String,
+    name: String,
+    extractor_name: String,
+}
+
+#[derive(Default, Debug, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+struct Location {
+    file: PathBuf,
+    start_line: u32,
+    start_column: u32,
+    end_line: u32,
+    end_column: u32,
+}
+
+#[derive(Default, Debug, Clone, Serialize)]
+pub struct Diagnostics<T> {
+    source: Source,
+    visibility: Visibility,
+    severity: Severity,
+    #[serde(flatten)]
+    message: Message,
+    timestamp: DateTime<Utc>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    location: Option<Location>,
+    attributes: T,
+}
+
+#[derive(Default, Debug, Clone, Copy, Serialize, PartialEq, Eq, Hash)]
+#[serde(rename_all = "camelCase")]
+pub enum ExtractionStepKind {
+    #[default]
+    LoadManifest,
+    LoadSource,
+    Parse,
+    Extract,
+}
+
+#[derive(Debug, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ExtractionStep {
+    pub action: ExtractionStepKind,
+    pub file: PathBuf,
+    pub ms: u128,
+}
+
+impl ExtractionStep {
+    fn new(start: Instant, action: ExtractionStepKind, file: PathBuf) -> Self {
+        let ret = ExtractionStep {
+            action,
+            file,
+            ms: start.elapsed().as_millis(),
+        };
+        debug!("{ret:?}");
+        ret
+    }
+
+    pub fn load_manifest(start: Instant, target: &ProjectManifest) -> Self {
+        Self::new(
+            start,
+            ExtractionStepKind::LoadManifest,
+            PathBuf::from(target.manifest_path()),
+        )
+    }
+
+    pub fn parse(start: Instant, target: &Path) -> Self {
+        Self::new(start, ExtractionStepKind::Parse, PathBuf::from(target))
+    }
+
+    pub fn extract(start: Instant, target: &Path) -> Self {
+        Self::new(start, ExtractionStepKind::Extract, PathBuf::from(target))
+    }
+
+    pub fn load_source(start: Instant, target: &Path) -> Self {
+        Self::new(start, ExtractionStepKind::LoadSource, PathBuf::from(target))
+    }
+}
+
+#[derive(Debug, Default, Clone)]
+struct HumanReadableDuration(u128);
+
+impl Serialize for HumanReadableDuration {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        let mut map = serializer.serialize_map(Some(2))?;
+        map.serialize_entry("ms", &self.0)?;
+        map.serialize_entry("pretty", &self.pretty())?;
+        map.end()
+    }
+}
+
+impl HumanReadableDuration {
+    pub fn add(&mut self, other: u128) {
+        self.0 += other;
+    }
+
+    pub fn pretty(&self) -> String {
+        let milliseconds = self.0 % 1000;
+        let mut seconds = self.0 / 1000;
+        if seconds < 60 {
+            return format!("{seconds}.{milliseconds:03}s");
+        }
+        let mut minutes = seconds / 60;
+        seconds %= 60;
+        if minutes < 60 {
+            return format!("{minutes}min{seconds:02}.{milliseconds:03}s");
+        }
+        let hours = minutes / 60;
+        minutes %= 60;
+        format!("{hours}h{minutes:02}min{seconds:02}.{milliseconds:03}s")
+    }
+}
+
+impl From<u128> for HumanReadableDuration {
+    fn from(val: u128) -> Self {
+        HumanReadableDuration(val)
+    }
+}
+
+impl Display for HumanReadableDuration {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        f.write_str(&self.pretty())
+    }
+}
+
+#[derive(Debug, Default, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+struct DurationsSummary {
+    #[serde(flatten)]
+    durations: HashMap<ExtractionStepKind, HumanReadableDuration>,
+    total: HumanReadableDuration,
+}
+
+#[derive(Debug, Default, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
+struct ExtractionSummary {
+    number_of_manifests: usize,
+    number_of_files: usize,
+    durations: DurationsSummary,
+}
+
+type ExtractionDiagnostics = Diagnostics<ExtractionSummary>;
+
+fn summary(start: Instant, steps: &[ExtractionStep]) -> ExtractionSummary {
+    let mut number_of_manifests = 0;
+    let mut number_of_files = 0;
+    let mut durations = HashMap::new();
+    for step in steps {
+        match &step.action {
+            ExtractionStepKind::LoadManifest => {
+                number_of_manifests += 1;
+            }
+            ExtractionStepKind::Parse => {
+                number_of_files += 1;
+            }
+            _ => {}
+        }
+        durations
+            .entry(step.action)
+            .or_insert(HumanReadableDuration(0))
+            .add(step.ms);
+    }
+    let total = start.elapsed().as_millis().into();
+    for (key, value) in &durations {
+        info!("total duration ({key:?}): {value}");
+    }
+    info!("total duration: {total}");
+    ExtractionSummary {
+        number_of_manifests,
+        number_of_files,
+        durations: DurationsSummary { durations, total },
+    }
+}
+
+pub fn emit_extraction_diagnostics(
+    start: Instant,
+    config: &Config,
+    steps: &[ExtractionStep],
+) -> anyhow::Result<()> {
+    let summary = summary(start, steps);
+    let diagnostics = ExtractionDiagnostics {
+        source: Source {
+            id: "rust/extractor/telemetry".to_owned(),
+            name: "telemetry".to_string(),
+            extractor_name: "rust".to_string(),
+        },
+        visibility: Visibility {
+            telemetry: true,
+            ..Default::default()
+        },
+        timestamp: Utc::now(),
+        attributes: summary,
+        ..Default::default()
+    };
+
+    std::fs::create_dir_all(&config.diagnostic_dir).with_context(|| {
+        format!(
+            "creating diagnostics directory {}",
+            config.diagnostic_dir.display()
+        )
+    })?;
+    let target = config.diagnostic_dir.join("extraction.jsonc");
+    let mut output = File::create(&target)
+        .with_context(|| format!("creating diagnostics file {}", target.display()))?;
+    serde_json::to_writer_pretty(&mut output, &diagnostics)
+        .with_context(|| format!("writing to diagnostics file {}", target.display()))?;
+    Ok(())
+}
diff --git a/rust/extractor/src/generated/.generated.list b/rust/extractor/src/generated/.generated.list
index 7335c95f7b8..d50633c020b 100644
--- a/rust/extractor/src/generated/.generated.list
+++ b/rust/extractor/src/generated/.generated.list
@@ -1,2 +1,2 @@
 mod.rs 4bcb9def847469aae9d8649461546b7c21ec97cf6e63d3cf394e339915ce65d7 4bcb9def847469aae9d8649461546b7c21ec97cf6e63d3cf394e339915ce65d7
-top.rs cdfb9890318d847e6db320abd8b9e9939524ecc47bcdc8491b9c8253bd3178c2 cdfb9890318d847e6db320abd8b9e9939524ecc47bcdc8491b9c8253bd3178c2
+top.rs c77ccf1e73a5b139f768e80580a261f7f3ab76823a1c9095b06f704a4912e8f1 c77ccf1e73a5b139f768e80580a261f7f3ab76823a1c9095b06f704a4912e8f1
diff --git a/rust/extractor/src/generated/top.rs b/rust/extractor/src/generated/top.rs
index 13a0adecbca..d74cf3c9749 100644
--- a/rust/extractor/src/generated/top.rs
+++ b/rust/extractor/src/generated/top.rs
@@ -4,6 +4,15 @@
 
 use crate::trap;
 
+#[derive(Debug)]
+pub struct File {
+    _unused: ()
+}
+
+impl trap::TrapClass for File {
+    fn class_name() -> &'static str { "File" }
+}
+
 #[derive(Debug)]
 pub struct Element {
     _unused: ()
@@ -13,6 +22,37 @@ impl trap::TrapClass for Element {
     fn class_name() -> &'static str { "Element" }
 }
 
+#[derive(Debug)]
+pub struct ExtractorStep {
+    pub id: trap::TrapId<ExtractorStep>,
+    pub action: String,
+    pub file: trap::Label<File>,
+    pub duration_ms: usize,
+}
+
+impl trap::TrapEntry for ExtractorStep {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("extractor_steps", vec![id.into(), self.action.into(), self.file.into(), self.duration_ms.into()]);
+    }
+}
+
+impl trap::TrapClass for ExtractorStep {
+    fn class_name() -> &'static str { "ExtractorStep" }
+}
+
+impl From<trap::Label<ExtractorStep>> for trap::Label<Element> {
+    fn from(value: trap::Label<ExtractorStep>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExtractorStep is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct Locatable {
     _unused: ()
@@ -200,6 +240,51 @@ impl From<trap::Label<Abi>> for trap::Label<Locatable> {
     }
 }
 
+#[derive(Debug)]
+pub struct Addressable {
+    _unused: ()
+}
+
+impl Addressable {
+    pub fn emit_extended_canonical_path(id: trap::Label<Self>, value: String, out: &mut trap::Writer) {
+        out.add_tuple("addressable_extended_canonical_paths", vec![id.into(), value.into()]);
+    }
+    pub fn emit_crate_origin(id: trap::Label<Self>, value: String, out: &mut trap::Writer) {
+        out.add_tuple("addressable_crate_origins", vec![id.into(), value.into()]);
+    }
+}
+
+impl trap::TrapClass for Addressable {
+    fn class_name() -> &'static str { "Addressable" }
+}
+
+impl From<trap::Label<Addressable>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Addressable>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Addressable is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Addressable>> for trap::Label<Element> {
+    fn from(value: trap::Label<Addressable>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Addressable is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Addressable>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Addressable>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Addressable is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct ArgList {
     pub id: trap::TrapId<ArgList>,
@@ -1501,57 +1586,35 @@ impl From<trap::Label<NameRef>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct Param {
-    pub id: trap::TrapId<Param>,
-    pub attrs: Vec<trap::Label<Attr>>,
-    pub pat: Option<trap::Label<Pat>>,
-    pub ty: Option<trap::Label<TypeRef>>,
+pub struct ParamBase {
+    _unused: ()
 }
 
-impl trap::TrapEntry for Param {
-    fn extract_id(&mut self) -> trap::TrapId<Self> {
-        std::mem::replace(&mut self.id, trap::TrapId::Star)
-    }
-
-    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("params", vec![id.into()]);
-        for (i, v) in self.attrs.into_iter().enumerate() {
-            out.add_tuple("param_attrs", vec![id.into(), i.into(), v.into()]);
-        }
-        if let Some(v) = self.pat {
-            out.add_tuple("param_pats", vec![id.into(), v.into()]);
-        }
-        if let Some(v) = self.ty {
-            out.add_tuple("param_ties", vec![id.into(), v.into()]);
-        }
-    }
+impl trap::TrapClass for ParamBase {
+    fn class_name() -> &'static str { "ParamBase" }
 }
 
-impl trap::TrapClass for Param {
-    fn class_name() -> &'static str { "Param" }
-}
-
-impl From<trap::Label<Param>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<Param>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Param is a subclass of AstNode
+impl From<trap::Label<ParamBase>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ParamBase>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParamBase is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Param>> for trap::Label<Element> {
-    fn from(value: trap::Label<Param>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Param is a subclass of Element
+impl From<trap::Label<ParamBase>> for trap::Label<Element> {
+    fn from(value: trap::Label<ParamBase>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParamBase is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<Param>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<Param>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Param is a subclass of Locatable
+impl From<trap::Label<ParamBase>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ParamBase>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParamBase is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -1654,10 +1717,10 @@ pub struct PathSegment {
     pub generic_arg_list: Option<trap::Label<GenericArgList>>,
     pub name_ref: Option<trap::Label<NameRef>>,
     pub param_list: Option<trap::Label<ParamList>>,
-    pub path_type: Option<trap::Label<PathType>>,
-    pub ret_type: Option<trap::Label<RetType>>,
+    pub path_type: Option<trap::Label<PathTypeRepr>>,
+    pub ret_type: Option<trap::Label<RetTypeRepr>>,
     pub return_type_syntax: Option<trap::Label<ReturnTypeSyntax>>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
 }
 
 impl trap::TrapEntry for PathSegment {
@@ -1685,8 +1748,8 @@ impl trap::TrapEntry for PathSegment {
         if let Some(v) = self.return_type_syntax {
             out.add_tuple("path_segment_return_type_syntaxes", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("path_segment_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("path_segment_type_reprs", vec![id.into(), v.into()]);
         }
     }
 }
@@ -1843,7 +1906,7 @@ pub struct RecordField {
     pub id: trap::TrapId<RecordField>,
     pub attrs: Vec<trap::Label<Attr>>,
     pub name: Option<trap::Label<Name>>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
     pub visibility: Option<trap::Label<Visibility>>,
 }
 
@@ -1860,8 +1923,8 @@ impl trap::TrapEntry for RecordField {
         if let Some(v) = self.name {
             out.add_tuple("record_field_names", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("record_field_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("record_field_type_reprs", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.visibility {
             out.add_tuple("record_field_visibilities", vec![id.into(), v.into()]);
@@ -2108,49 +2171,49 @@ impl From<trap::Label<Resolvable>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct RetType {
-    pub id: trap::TrapId<RetType>,
-    pub ty: Option<trap::Label<TypeRef>>,
+pub struct RetTypeRepr {
+    pub id: trap::TrapId<RetTypeRepr>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
 }
 
-impl trap::TrapEntry for RetType {
+impl trap::TrapEntry for RetTypeRepr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("ret_types", vec![id.into()]);
-        if let Some(v) = self.ty {
-            out.add_tuple("ret_type_ties", vec![id.into(), v.into()]);
+        out.add_tuple("ret_type_reprs", vec![id.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("ret_type_repr_type_reprs", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for RetType {
-    fn class_name() -> &'static str { "RetType" }
+impl trap::TrapClass for RetTypeRepr {
+    fn class_name() -> &'static str { "RetTypeRepr" }
 }
 
-impl From<trap::Label<RetType>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<RetType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RetType is a subclass of AstNode
+impl From<trap::Label<RetTypeRepr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<RetTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RetTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RetType>> for trap::Label<Element> {
-    fn from(value: trap::Label<RetType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RetType is a subclass of Element
+impl From<trap::Label<RetTypeRepr>> for trap::Label<Element> {
+    fn from(value: trap::Label<RetTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RetTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RetType>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<RetType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RetType is a subclass of Locatable
+impl From<trap::Label<RetTypeRepr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<RetTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RetTypeRepr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2203,72 +2266,6 @@ impl From<trap::Label<ReturnTypeSyntax>> for trap::Label<Locatable> {
     }
 }
 
-#[derive(Debug)]
-pub struct SelfParam {
-    pub id: trap::TrapId<SelfParam>,
-    pub attrs: Vec<trap::Label<Attr>>,
-    pub is_mut: bool,
-    pub lifetime: Option<trap::Label<Lifetime>>,
-    pub name: Option<trap::Label<Name>>,
-    pub ty: Option<trap::Label<TypeRef>>,
-}
-
-impl trap::TrapEntry for SelfParam {
-    fn extract_id(&mut self) -> trap::TrapId<Self> {
-        std::mem::replace(&mut self.id, trap::TrapId::Star)
-    }
-
-    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("self_params", vec![id.into()]);
-        for (i, v) in self.attrs.into_iter().enumerate() {
-            out.add_tuple("self_param_attrs", vec![id.into(), i.into(), v.into()]);
-        }
-        if self.is_mut {
-            out.add_tuple("self_param_is_mut", vec![id.into()]);
-        }
-        if let Some(v) = self.lifetime {
-            out.add_tuple("self_param_lifetimes", vec![id.into(), v.into()]);
-        }
-        if let Some(v) = self.name {
-            out.add_tuple("self_param_names", vec![id.into(), v.into()]);
-        }
-        if let Some(v) = self.ty {
-            out.add_tuple("self_param_ties", vec![id.into(), v.into()]);
-        }
-    }
-}
-
-impl trap::TrapClass for SelfParam {
-    fn class_name() -> &'static str { "SelfParam" }
-}
-
-impl From<trap::Label<SelfParam>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<SelfParam>) -> Self {
-        // SAFETY: this is safe because in the dbscheme SelfParam is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<SelfParam>> for trap::Label<Element> {
-    fn from(value: trap::Label<SelfParam>) -> Self {
-        // SAFETY: this is safe because in the dbscheme SelfParam is a subclass of Element
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<SelfParam>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<SelfParam>) -> Self {
-        // SAFETY: this is safe because in the dbscheme SelfParam is a subclass of Locatable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct SourceFile {
     pub id: trap::TrapId<SourceFile>,
@@ -2503,7 +2500,7 @@ impl From<trap::Label<TokenTree>> for trap::Label<Locatable> {
 pub struct TupleField {
     pub id: trap::TrapId<TupleField>,
     pub attrs: Vec<trap::Label<Attr>>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
     pub visibility: Option<trap::Label<Visibility>>,
 }
 
@@ -2517,8 +2514,8 @@ impl trap::TrapEntry for TupleField {
         for (i, v) in self.attrs.into_iter().enumerate() {
             out.add_tuple("tuple_field_attrs", vec![id.into(), i.into(), v.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("tuple_field_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("tuple_field_type_reprs", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.visibility {
             out.add_tuple("tuple_field_visibilities", vec![id.into(), v.into()]);
@@ -2564,7 +2561,7 @@ pub struct TypeBound {
     pub is_async: bool,
     pub is_const: bool,
     pub lifetime: Option<trap::Label<Lifetime>>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
 }
 
 impl trap::TrapEntry for TypeBound {
@@ -2586,8 +2583,8 @@ impl trap::TrapEntry for TypeBound {
         if let Some(v) = self.lifetime {
             out.add_tuple("type_bound_lifetimes", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("type_bound_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("type_bound_type_reprs", vec![id.into(), v.into()]);
         }
     }
 }
@@ -2674,35 +2671,35 @@ impl From<trap::Label<TypeBoundList>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct TypeRef {
+pub struct TypeRepr {
     _unused: ()
 }
 
-impl trap::TrapClass for TypeRef {
-    fn class_name() -> &'static str { "TypeRef" }
+impl trap::TrapClass for TypeRepr {
+    fn class_name() -> &'static str { "TypeRepr" }
 }
 
-impl From<trap::Label<TypeRef>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<TypeRef>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TypeRef is a subclass of AstNode
+impl From<trap::Label<TypeRepr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<TypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TypeRef>> for trap::Label<Element> {
-    fn from(value: trap::Label<TypeRef>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TypeRef is a subclass of Element
+impl From<trap::Label<TypeRepr>> for trap::Label<Element> {
+    fn from(value: trap::Label<TypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TypeRef>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<TypeRef>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TypeRef is a subclass of Locatable
+impl From<trap::Label<TypeRepr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<TypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeRepr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -2817,72 +2814,6 @@ impl From<trap::Label<UseTreeList>> for trap::Label<Locatable> {
     }
 }
 
-#[derive(Debug)]
-pub struct Variant {
-    pub id: trap::TrapId<Variant>,
-    pub attrs: Vec<trap::Label<Attr>>,
-    pub expr: Option<trap::Label<Expr>>,
-    pub field_list: Option<trap::Label<FieldList>>,
-    pub name: Option<trap::Label<Name>>,
-    pub visibility: Option<trap::Label<Visibility>>,
-}
-
-impl trap::TrapEntry for Variant {
-    fn extract_id(&mut self) -> trap::TrapId<Self> {
-        std::mem::replace(&mut self.id, trap::TrapId::Star)
-    }
-
-    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("variants", vec![id.into()]);
-        for (i, v) in self.attrs.into_iter().enumerate() {
-            out.add_tuple("variant_attrs", vec![id.into(), i.into(), v.into()]);
-        }
-        if let Some(v) = self.expr {
-            out.add_tuple("variant_exprs", vec![id.into(), v.into()]);
-        }
-        if let Some(v) = self.field_list {
-            out.add_tuple("variant_field_lists", vec![id.into(), v.into()]);
-        }
-        if let Some(v) = self.name {
-            out.add_tuple("variant_names", vec![id.into(), v.into()]);
-        }
-        if let Some(v) = self.visibility {
-            out.add_tuple("variant_visibilities", vec![id.into(), v.into()]);
-        }
-    }
-}
-
-impl trap::TrapClass for Variant {
-    fn class_name() -> &'static str { "Variant" }
-}
-
-impl From<trap::Label<Variant>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<Variant>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Variant is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<Variant>> for trap::Label<Element> {
-    fn from(value: trap::Label<Variant>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Variant is a subclass of Element
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<Variant>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<Variant>) -> Self {
-        // SAFETY: this is safe because in the dbscheme Variant is a subclass of Locatable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct VariantList {
     pub id: trap::TrapId<VariantList>,
@@ -3038,7 +2969,7 @@ pub struct WherePred {
     pub id: trap::TrapId<WherePred>,
     pub generic_param_list: Option<trap::Label<GenericParamList>>,
     pub lifetime: Option<trap::Label<Lifetime>>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
     pub type_bound_list: Option<trap::Label<TypeBoundList>>,
 }
 
@@ -3055,8 +2986,8 @@ impl trap::TrapEntry for WherePred {
         if let Some(v) = self.lifetime {
             out.add_tuple("where_pred_lifetimes", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("where_pred_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("where_pred_type_reprs", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.type_bound_list {
             out.add_tuple("where_pred_type_bound_lists", vec![id.into(), v.into()]);
@@ -3096,62 +3027,66 @@ impl From<trap::Label<WherePred>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct ArrayExpr {
-    pub id: trap::TrapId<ArrayExpr>,
+pub struct ArrayExprInternal {
+    pub id: trap::TrapId<ArrayExprInternal>,
     pub attrs: Vec<trap::Label<Attr>>,
     pub exprs: Vec<trap::Label<Expr>>,
+    pub is_semicolon: bool,
 }
 
-impl trap::TrapEntry for ArrayExpr {
+impl trap::TrapEntry for ArrayExprInternal {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("array_exprs", vec![id.into()]);
+        out.add_tuple("array_expr_internals", vec![id.into()]);
         for (i, v) in self.attrs.into_iter().enumerate() {
-            out.add_tuple("array_expr_attrs", vec![id.into(), i.into(), v.into()]);
+            out.add_tuple("array_expr_internal_attrs", vec![id.into(), i.into(), v.into()]);
         }
         for (i, v) in self.exprs.into_iter().enumerate() {
-            out.add_tuple("array_expr_exprs", vec![id.into(), i.into(), v.into()]);
+            out.add_tuple("array_expr_internal_exprs", vec![id.into(), i.into(), v.into()]);
+        }
+        if self.is_semicolon {
+            out.add_tuple("array_expr_internal_is_semicolon", vec![id.into()]);
         }
     }
 }
 
-impl trap::TrapClass for ArrayExpr {
-    fn class_name() -> &'static str { "ArrayExpr" }
+impl trap::TrapClass for ArrayExprInternal {
+    fn class_name() -> &'static str { "ArrayExprInternal" }
 }
 
-impl From<trap::Label<ArrayExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<ArrayExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ArrayExpr is a subclass of AstNode
+impl From<trap::Label<ArrayExprInternal>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ArrayExprInternal>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ArrayExprInternal is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ArrayExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<ArrayExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ArrayExpr is a subclass of Element
+impl From<trap::Label<ArrayExprInternal>> for trap::Label<Element> {
+    fn from(value: trap::Label<ArrayExprInternal>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ArrayExprInternal is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ArrayExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<ArrayExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ArrayExpr is a subclass of Expr
+impl From<trap::Label<ArrayExprInternal>> for trap::Label<Expr> {
+    fn from(value: trap::Label<ArrayExprInternal>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ArrayExprInternal is a subclass of Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ArrayExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<ArrayExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ArrayExpr is a subclass of Locatable
+impl From<trap::Label<ArrayExprInternal>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ArrayExprInternal>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ArrayExprInternal is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3159,62 +3094,62 @@ impl From<trap::Label<ArrayExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct ArrayType {
-    pub id: trap::TrapId<ArrayType>,
+pub struct ArrayTypeRepr {
+    pub id: trap::TrapId<ArrayTypeRepr>,
     pub const_arg: Option<trap::Label<ConstArg>>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub element_type_repr: Option<trap::Label<TypeRepr>>,
 }
 
-impl trap::TrapEntry for ArrayType {
+impl trap::TrapEntry for ArrayTypeRepr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("array_types", vec![id.into()]);
+        out.add_tuple("array_type_reprs", vec![id.into()]);
         if let Some(v) = self.const_arg {
-            out.add_tuple("array_type_const_args", vec![id.into(), v.into()]);
+            out.add_tuple("array_type_repr_const_args", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("array_type_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.element_type_repr {
+            out.add_tuple("array_type_repr_element_type_reprs", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for ArrayType {
-    fn class_name() -> &'static str { "ArrayType" }
+impl trap::TrapClass for ArrayTypeRepr {
+    fn class_name() -> &'static str { "ArrayTypeRepr" }
 }
 
-impl From<trap::Label<ArrayType>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<ArrayType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ArrayType is a subclass of AstNode
+impl From<trap::Label<ArrayTypeRepr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ArrayTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ArrayTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ArrayType>> for trap::Label<Element> {
-    fn from(value: trap::Label<ArrayType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ArrayType is a subclass of Element
+impl From<trap::Label<ArrayTypeRepr>> for trap::Label<Element> {
+    fn from(value: trap::Label<ArrayTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ArrayTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ArrayType>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<ArrayType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ArrayType is a subclass of Locatable
+impl From<trap::Label<ArrayTypeRepr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ArrayTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ArrayTypeRepr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ArrayType>> for trap::Label<TypeRef> {
-    fn from(value: trap::Label<ArrayType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ArrayType is a subclass of TypeRef
+impl From<trap::Label<ArrayTypeRepr>> for trap::Label<TypeRepr> {
+    fn from(value: trap::Label<ArrayTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ArrayTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -3291,9 +3226,9 @@ pub struct AssocTypeArg {
     pub generic_arg_list: Option<trap::Label<GenericArgList>>,
     pub name_ref: Option<trap::Label<NameRef>>,
     pub param_list: Option<trap::Label<ParamList>>,
-    pub ret_type: Option<trap::Label<RetType>>,
+    pub ret_type: Option<trap::Label<RetTypeRepr>>,
     pub return_type_syntax: Option<trap::Label<ReturnTypeSyntax>>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
     pub type_bound_list: Option<trap::Label<TypeBoundList>>,
 }
 
@@ -3322,8 +3257,8 @@ impl trap::TrapEntry for AssocTypeArg {
         if let Some(v) = self.return_type_syntax {
             out.add_tuple("assoc_type_arg_return_type_syntaxes", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("assoc_type_arg_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("assoc_type_arg_type_reprs", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.type_bound_list {
             out.add_tuple("assoc_type_arg_type_bound_lists", vec![id.into(), v.into()]);
@@ -3568,97 +3503,6 @@ impl From<trap::Label<BinaryExpr>> for trap::Label<Locatable> {
     }
 }
 
-#[derive(Debug)]
-pub struct BlockExpr {
-    pub id: trap::TrapId<BlockExpr>,
-    pub attrs: Vec<trap::Label<Attr>>,
-    pub is_async: bool,
-    pub is_const: bool,
-    pub is_gen: bool,
-    pub is_move: bool,
-    pub is_try: bool,
-    pub is_unsafe: bool,
-    pub label: Option<trap::Label<Label>>,
-    pub stmt_list: Option<trap::Label<StmtList>>,
-}
-
-impl trap::TrapEntry for BlockExpr {
-    fn extract_id(&mut self) -> trap::TrapId<Self> {
-        std::mem::replace(&mut self.id, trap::TrapId::Star)
-    }
-
-    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("block_exprs", vec![id.into()]);
-        for (i, v) in self.attrs.into_iter().enumerate() {
-            out.add_tuple("block_expr_attrs", vec![id.into(), i.into(), v.into()]);
-        }
-        if self.is_async {
-            out.add_tuple("block_expr_is_async", vec![id.into()]);
-        }
-        if self.is_const {
-            out.add_tuple("block_expr_is_const", vec![id.into()]);
-        }
-        if self.is_gen {
-            out.add_tuple("block_expr_is_gen", vec![id.into()]);
-        }
-        if self.is_move {
-            out.add_tuple("block_expr_is_move", vec![id.into()]);
-        }
-        if self.is_try {
-            out.add_tuple("block_expr_is_try", vec![id.into()]);
-        }
-        if self.is_unsafe {
-            out.add_tuple("block_expr_is_unsafe", vec![id.into()]);
-        }
-        if let Some(v) = self.label {
-            out.add_tuple("block_expr_labels", vec![id.into(), v.into()]);
-        }
-        if let Some(v) = self.stmt_list {
-            out.add_tuple("block_expr_stmt_lists", vec![id.into(), v.into()]);
-        }
-    }
-}
-
-impl trap::TrapClass for BlockExpr {
-    fn class_name() -> &'static str { "BlockExpr" }
-}
-
-impl From<trap::Label<BlockExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<BlockExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BlockExpr is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<BlockExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<BlockExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BlockExpr is a subclass of Element
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<BlockExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<BlockExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BlockExpr is a subclass of Expr
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<BlockExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<BlockExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme BlockExpr is a subclass of Locatable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct BoxPat {
     pub id: trap::TrapId<BoxPat>,
@@ -3835,7 +3679,7 @@ pub struct CastExpr {
     pub id: trap::TrapId<CastExpr>,
     pub attrs: Vec<trap::Label<Attr>>,
     pub expr: Option<trap::Label<Expr>>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
 }
 
 impl trap::TrapEntry for CastExpr {
@@ -3851,8 +3695,8 @@ impl trap::TrapEntry for CastExpr {
         if let Some(v) = self.expr {
             out.add_tuple("cast_expr_exprs", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("cast_expr_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("cast_expr_type_reprs", vec![id.into(), v.into()]);
         }
     }
 }
@@ -3909,7 +3753,7 @@ pub struct ClosureExpr {
     pub is_gen: bool,
     pub is_move: bool,
     pub is_static: bool,
-    pub ret_type: Option<trap::Label<RetType>>,
+    pub ret_type: Option<trap::Label<RetTypeRepr>>,
 }
 
 impl trap::TrapEntry for ClosureExpr {
@@ -4187,7 +4031,7 @@ pub struct ConstParam {
     pub default_val: Option<trap::Label<ConstArg>>,
     pub is_const: bool,
     pub name: Option<trap::Label<Name>>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
 }
 
 impl trap::TrapEntry for ConstParam {
@@ -4209,8 +4053,8 @@ impl trap::TrapEntry for ConstParam {
         if let Some(v) = self.name {
             out.add_tuple("const_param_names", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("const_param_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("const_param_type_reprs", vec![id.into(), v.into()]);
         }
     }
 }
@@ -4319,58 +4163,58 @@ impl From<trap::Label<ContinueExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct DynTraitType {
-    pub id: trap::TrapId<DynTraitType>,
+pub struct DynTraitTypeRepr {
+    pub id: trap::TrapId<DynTraitTypeRepr>,
     pub type_bound_list: Option<trap::Label<TypeBoundList>>,
 }
 
-impl trap::TrapEntry for DynTraitType {
+impl trap::TrapEntry for DynTraitTypeRepr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("dyn_trait_types", vec![id.into()]);
+        out.add_tuple("dyn_trait_type_reprs", vec![id.into()]);
         if let Some(v) = self.type_bound_list {
-            out.add_tuple("dyn_trait_type_type_bound_lists", vec![id.into(), v.into()]);
+            out.add_tuple("dyn_trait_type_repr_type_bound_lists", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for DynTraitType {
-    fn class_name() -> &'static str { "DynTraitType" }
+impl trap::TrapClass for DynTraitTypeRepr {
+    fn class_name() -> &'static str { "DynTraitTypeRepr" }
 }
 
-impl From<trap::Label<DynTraitType>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<DynTraitType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme DynTraitType is a subclass of AstNode
+impl From<trap::Label<DynTraitTypeRepr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<DynTraitTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme DynTraitTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<DynTraitType>> for trap::Label<Element> {
-    fn from(value: trap::Label<DynTraitType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme DynTraitType is a subclass of Element
+impl From<trap::Label<DynTraitTypeRepr>> for trap::Label<Element> {
+    fn from(value: trap::Label<DynTraitTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme DynTraitTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<DynTraitType>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<DynTraitType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme DynTraitType is a subclass of Locatable
+impl From<trap::Label<DynTraitTypeRepr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<DynTraitTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme DynTraitTypeRepr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<DynTraitType>> for trap::Label<TypeRef> {
-    fn from(value: trap::Label<DynTraitType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme DynTraitType is a subclass of TypeRef
+impl From<trap::Label<DynTraitTypeRepr>> for trap::Label<TypeRepr> {
+    fn from(value: trap::Label<DynTraitTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme DynTraitTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -4504,78 +4348,78 @@ impl From<trap::Label<FieldExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct FnPtrType {
-    pub id: trap::TrapId<FnPtrType>,
+pub struct FnPtrTypeRepr {
+    pub id: trap::TrapId<FnPtrTypeRepr>,
     pub abi: Option<trap::Label<Abi>>,
     pub is_async: bool,
     pub is_const: bool,
     pub is_unsafe: bool,
     pub param_list: Option<trap::Label<ParamList>>,
-    pub ret_type: Option<trap::Label<RetType>>,
+    pub ret_type: Option<trap::Label<RetTypeRepr>>,
 }
 
-impl trap::TrapEntry for FnPtrType {
+impl trap::TrapEntry for FnPtrTypeRepr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("fn_ptr_types", vec![id.into()]);
+        out.add_tuple("fn_ptr_type_reprs", vec![id.into()]);
         if let Some(v) = self.abi {
-            out.add_tuple("fn_ptr_type_abis", vec![id.into(), v.into()]);
+            out.add_tuple("fn_ptr_type_repr_abis", vec![id.into(), v.into()]);
         }
         if self.is_async {
-            out.add_tuple("fn_ptr_type_is_async", vec![id.into()]);
+            out.add_tuple("fn_ptr_type_repr_is_async", vec![id.into()]);
         }
         if self.is_const {
-            out.add_tuple("fn_ptr_type_is_const", vec![id.into()]);
+            out.add_tuple("fn_ptr_type_repr_is_const", vec![id.into()]);
         }
         if self.is_unsafe {
-            out.add_tuple("fn_ptr_type_is_unsafe", vec![id.into()]);
+            out.add_tuple("fn_ptr_type_repr_is_unsafe", vec![id.into()]);
         }
         if let Some(v) = self.param_list {
-            out.add_tuple("fn_ptr_type_param_lists", vec![id.into(), v.into()]);
+            out.add_tuple("fn_ptr_type_repr_param_lists", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.ret_type {
-            out.add_tuple("fn_ptr_type_ret_types", vec![id.into(), v.into()]);
+            out.add_tuple("fn_ptr_type_repr_ret_types", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for FnPtrType {
-    fn class_name() -> &'static str { "FnPtrType" }
+impl trap::TrapClass for FnPtrTypeRepr {
+    fn class_name() -> &'static str { "FnPtrTypeRepr" }
 }
 
-impl From<trap::Label<FnPtrType>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<FnPtrType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme FnPtrType is a subclass of AstNode
+impl From<trap::Label<FnPtrTypeRepr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<FnPtrTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FnPtrTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<FnPtrType>> for trap::Label<Element> {
-    fn from(value: trap::Label<FnPtrType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme FnPtrType is a subclass of Element
+impl From<trap::Label<FnPtrTypeRepr>> for trap::Label<Element> {
+    fn from(value: trap::Label<FnPtrTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FnPtrTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<FnPtrType>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<FnPtrType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme FnPtrType is a subclass of Locatable
+impl From<trap::Label<FnPtrTypeRepr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<FnPtrTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FnPtrTypeRepr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<FnPtrType>> for trap::Label<TypeRef> {
-    fn from(value: trap::Label<FnPtrType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme FnPtrType is a subclass of TypeRef
+impl From<trap::Label<FnPtrTypeRepr>> for trap::Label<TypeRepr> {
+    fn from(value: trap::Label<FnPtrTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme FnPtrTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -4583,137 +4427,62 @@ impl From<trap::Label<FnPtrType>> for trap::Label<TypeRef> {
 }
 
 #[derive(Debug)]
-pub struct ForExpr {
-    pub id: trap::TrapId<ForExpr>,
-    pub attrs: Vec<trap::Label<Attr>>,
-    pub iterable: Option<trap::Label<Expr>>,
-    pub label: Option<trap::Label<Label>>,
-    pub loop_body: Option<trap::Label<BlockExpr>>,
-    pub pat: Option<trap::Label<Pat>>,
-}
-
-impl trap::TrapEntry for ForExpr {
-    fn extract_id(&mut self) -> trap::TrapId<Self> {
-        std::mem::replace(&mut self.id, trap::TrapId::Star)
-    }
-
-    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("for_exprs", vec![id.into()]);
-        for (i, v) in self.attrs.into_iter().enumerate() {
-            out.add_tuple("for_expr_attrs", vec![id.into(), i.into(), v.into()]);
-        }
-        if let Some(v) = self.iterable {
-            out.add_tuple("for_expr_iterables", vec![id.into(), v.into()]);
-        }
-        if let Some(v) = self.label {
-            out.add_tuple("for_expr_labels", vec![id.into(), v.into()]);
-        }
-        if let Some(v) = self.loop_body {
-            out.add_tuple("for_expr_loop_bodies", vec![id.into(), v.into()]);
-        }
-        if let Some(v) = self.pat {
-            out.add_tuple("for_expr_pats", vec![id.into(), v.into()]);
-        }
-    }
-}
-
-impl trap::TrapClass for ForExpr {
-    fn class_name() -> &'static str { "ForExpr" }
-}
-
-impl From<trap::Label<ForExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<ForExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ForExpr is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<ForExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<ForExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ForExpr is a subclass of Element
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<ForExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<ForExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ForExpr is a subclass of Expr
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<ForExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<ForExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ForExpr is a subclass of Locatable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct ForType {
-    pub id: trap::TrapId<ForType>,
+pub struct ForTypeRepr {
+    pub id: trap::TrapId<ForTypeRepr>,
     pub generic_param_list: Option<trap::Label<GenericParamList>>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
 }
 
-impl trap::TrapEntry for ForType {
+impl trap::TrapEntry for ForTypeRepr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("for_types", vec![id.into()]);
+        out.add_tuple("for_type_reprs", vec![id.into()]);
         if let Some(v) = self.generic_param_list {
-            out.add_tuple("for_type_generic_param_lists", vec![id.into(), v.into()]);
+            out.add_tuple("for_type_repr_generic_param_lists", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("for_type_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("for_type_repr_type_reprs", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for ForType {
-    fn class_name() -> &'static str { "ForType" }
+impl trap::TrapClass for ForTypeRepr {
+    fn class_name() -> &'static str { "ForTypeRepr" }
 }
 
-impl From<trap::Label<ForType>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<ForType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ForType is a subclass of AstNode
+impl From<trap::Label<ForTypeRepr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ForTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ForType>> for trap::Label<Element> {
-    fn from(value: trap::Label<ForType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ForType is a subclass of Element
+impl From<trap::Label<ForTypeRepr>> for trap::Label<Element> {
+    fn from(value: trap::Label<ForTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ForType>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<ForType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ForType is a subclass of Locatable
+impl From<trap::Label<ForTypeRepr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ForTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForTypeRepr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ForType>> for trap::Label<TypeRef> {
-    fn from(value: trap::Label<ForType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ForType is a subclass of TypeRef
+impl From<trap::Label<ForTypeRepr>> for trap::Label<TypeRepr> {
+    fn from(value: trap::Label<ForTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -4934,58 +4703,58 @@ impl From<trap::Label<IfExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct ImplTraitType {
-    pub id: trap::TrapId<ImplTraitType>,
+pub struct ImplTraitTypeRepr {
+    pub id: trap::TrapId<ImplTraitTypeRepr>,
     pub type_bound_list: Option<trap::Label<TypeBoundList>>,
 }
 
-impl trap::TrapEntry for ImplTraitType {
+impl trap::TrapEntry for ImplTraitTypeRepr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("impl_trait_types", vec![id.into()]);
+        out.add_tuple("impl_trait_type_reprs", vec![id.into()]);
         if let Some(v) = self.type_bound_list {
-            out.add_tuple("impl_trait_type_type_bound_lists", vec![id.into(), v.into()]);
+            out.add_tuple("impl_trait_type_repr_type_bound_lists", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for ImplTraitType {
-    fn class_name() -> &'static str { "ImplTraitType" }
+impl trap::TrapClass for ImplTraitTypeRepr {
+    fn class_name() -> &'static str { "ImplTraitTypeRepr" }
 }
 
-impl From<trap::Label<ImplTraitType>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<ImplTraitType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ImplTraitType is a subclass of AstNode
+impl From<trap::Label<ImplTraitTypeRepr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ImplTraitTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ImplTraitTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ImplTraitType>> for trap::Label<Element> {
-    fn from(value: trap::Label<ImplTraitType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ImplTraitType is a subclass of Element
+impl From<trap::Label<ImplTraitTypeRepr>> for trap::Label<Element> {
+    fn from(value: trap::Label<ImplTraitTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ImplTraitTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ImplTraitType>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<ImplTraitType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ImplTraitType is a subclass of Locatable
+impl From<trap::Label<ImplTraitTypeRepr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ImplTraitTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ImplTraitTypeRepr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ImplTraitType>> for trap::Label<TypeRef> {
-    fn from(value: trap::Label<ImplTraitType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ImplTraitType is a subclass of TypeRef
+impl From<trap::Label<ImplTraitTypeRepr>> for trap::Label<TypeRepr> {
+    fn from(value: trap::Label<ImplTraitTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ImplTraitTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -5060,54 +4829,54 @@ impl From<trap::Label<IndexExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct InferType {
-    pub id: trap::TrapId<InferType>,
+pub struct InferTypeRepr {
+    pub id: trap::TrapId<InferTypeRepr>,
 }
 
-impl trap::TrapEntry for InferType {
+impl trap::TrapEntry for InferTypeRepr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("infer_types", vec![id.into()]);
+        out.add_tuple("infer_type_reprs", vec![id.into()]);
     }
 }
 
-impl trap::TrapClass for InferType {
-    fn class_name() -> &'static str { "InferType" }
+impl trap::TrapClass for InferTypeRepr {
+    fn class_name() -> &'static str { "InferTypeRepr" }
 }
 
-impl From<trap::Label<InferType>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<InferType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme InferType is a subclass of AstNode
+impl From<trap::Label<InferTypeRepr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<InferTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme InferTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<InferType>> for trap::Label<Element> {
-    fn from(value: trap::Label<InferType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme InferType is a subclass of Element
+impl From<trap::Label<InferTypeRepr>> for trap::Label<Element> {
+    fn from(value: trap::Label<InferTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme InferTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<InferType>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<InferType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme InferType is a subclass of Locatable
+impl From<trap::Label<InferTypeRepr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<InferTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme InferTypeRepr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<InferType>> for trap::Label<TypeRef> {
-    fn from(value: trap::Label<InferType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme InferType is a subclass of TypeRef
+impl From<trap::Label<InferTypeRepr>> for trap::Label<TypeRepr> {
+    fn from(value: trap::Label<InferTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme InferTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -5119,19 +4888,19 @@ pub struct Item {
     _unused: ()
 }
 
-impl Item {
-    pub fn emit_extended_canonical_path(id: trap::Label<Self>, value: String, out: &mut trap::Writer) {
-        out.add_tuple("item_extended_canonical_paths", vec![id.into(), value.into()]);
-    }
-    pub fn emit_crate_origin(id: trap::Label<Self>, value: String, out: &mut trap::Writer) {
-        out.add_tuple("item_crate_origins", vec![id.into(), value.into()]);
-    }
-}
-
 impl trap::TrapClass for Item {
     fn class_name() -> &'static str { "Item" }
 }
 
+impl From<trap::Label<Item>> for trap::Label<Addressable> {
+    fn from(value: trap::Label<Item>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Item is a subclass of Addressable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 impl From<trap::Label<Item>> for trap::Label<AstNode> {
     fn from(value: trap::Label<Item>) -> Self {
         // SAFETY: this is safe because in the dbscheme Item is a subclass of AstNode
@@ -5168,11 +4937,56 @@ impl From<trap::Label<Item>> for trap::Label<Stmt> {
     }
 }
 
+#[derive(Debug)]
+pub struct LabelableExpr {
+    _unused: ()
+}
+
+impl trap::TrapClass for LabelableExpr {
+    fn class_name() -> &'static str { "LabelableExpr" }
+}
+
+impl From<trap::Label<LabelableExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<LabelableExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LabelableExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LabelableExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<LabelableExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LabelableExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LabelableExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<LabelableExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LabelableExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LabelableExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<LabelableExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LabelableExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct LetExpr {
     pub id: trap::TrapId<LetExpr>,
     pub attrs: Vec<trap::Label<Attr>>,
-    pub expr: Option<trap::Label<Expr>>,
+    pub scrutinee: Option<trap::Label<Expr>>,
     pub pat: Option<trap::Label<Pat>>,
 }
 
@@ -5186,8 +5000,8 @@ impl trap::TrapEntry for LetExpr {
         for (i, v) in self.attrs.into_iter().enumerate() {
             out.add_tuple("let_expr_attrs", vec![id.into(), i.into(), v.into()]);
         }
-        if let Some(v) = self.expr {
-            out.add_tuple("let_expr_exprs", vec![id.into(), v.into()]);
+        if let Some(v) = self.scrutinee {
+            out.add_tuple("let_expr_scrutinees", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.pat {
             out.add_tuple("let_expr_pats", vec![id.into(), v.into()]);
@@ -5242,7 +5056,7 @@ pub struct LetStmt {
     pub initializer: Option<trap::Label<Expr>>,
     pub let_else: Option<trap::Label<LetElse>>,
     pub pat: Option<trap::Label<Pat>>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
 }
 
 impl trap::TrapEntry for LetStmt {
@@ -5264,8 +5078,8 @@ impl trap::TrapEntry for LetStmt {
         if let Some(v) = self.pat {
             out.add_tuple("let_stmt_pats", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("let_stmt_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("let_stmt_type_reprs", vec![id.into(), v.into()]);
         }
     }
 }
@@ -5558,73 +5372,6 @@ impl From<trap::Label<LiteralPat>> for trap::Label<Pat> {
     }
 }
 
-#[derive(Debug)]
-pub struct LoopExpr {
-    pub id: trap::TrapId<LoopExpr>,
-    pub attrs: Vec<trap::Label<Attr>>,
-    pub label: Option<trap::Label<Label>>,
-    pub loop_body: Option<trap::Label<BlockExpr>>,
-}
-
-impl trap::TrapEntry for LoopExpr {
-    fn extract_id(&mut self) -> trap::TrapId<Self> {
-        std::mem::replace(&mut self.id, trap::TrapId::Star)
-    }
-
-    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("loop_exprs", vec![id.into()]);
-        for (i, v) in self.attrs.into_iter().enumerate() {
-            out.add_tuple("loop_expr_attrs", vec![id.into(), i.into(), v.into()]);
-        }
-        if let Some(v) = self.label {
-            out.add_tuple("loop_expr_labels", vec![id.into(), v.into()]);
-        }
-        if let Some(v) = self.loop_body {
-            out.add_tuple("loop_expr_loop_bodies", vec![id.into(), v.into()]);
-        }
-    }
-}
-
-impl trap::TrapClass for LoopExpr {
-    fn class_name() -> &'static str { "LoopExpr" }
-}
-
-impl From<trap::Label<LoopExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<LoopExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LoopExpr is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<LoopExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<LoopExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LoopExpr is a subclass of Element
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<LoopExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<LoopExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LoopExpr is a subclass of Expr
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<LoopExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<LoopExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme LoopExpr is a subclass of Locatable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct MacroExpr {
     pub id: trap::TrapId<MacroExpr>,
@@ -5744,58 +5491,58 @@ impl From<trap::Label<MacroPat>> for trap::Label<Pat> {
 }
 
 #[derive(Debug)]
-pub struct MacroType {
-    pub id: trap::TrapId<MacroType>,
+pub struct MacroTypeRepr {
+    pub id: trap::TrapId<MacroTypeRepr>,
     pub macro_call: Option<trap::Label<MacroCall>>,
 }
 
-impl trap::TrapEntry for MacroType {
+impl trap::TrapEntry for MacroTypeRepr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("macro_types", vec![id.into()]);
+        out.add_tuple("macro_type_reprs", vec![id.into()]);
         if let Some(v) = self.macro_call {
-            out.add_tuple("macro_type_macro_calls", vec![id.into(), v.into()]);
+            out.add_tuple("macro_type_repr_macro_calls", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for MacroType {
-    fn class_name() -> &'static str { "MacroType" }
+impl trap::TrapClass for MacroTypeRepr {
+    fn class_name() -> &'static str { "MacroTypeRepr" }
 }
 
-impl From<trap::Label<MacroType>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<MacroType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MacroType is a subclass of AstNode
+impl From<trap::Label<MacroTypeRepr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<MacroTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MacroType>> for trap::Label<Element> {
-    fn from(value: trap::Label<MacroType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MacroType is a subclass of Element
+impl From<trap::Label<MacroTypeRepr>> for trap::Label<Element> {
+    fn from(value: trap::Label<MacroTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MacroType>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<MacroType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MacroType is a subclass of Locatable
+impl From<trap::Label<MacroTypeRepr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<MacroTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroTypeRepr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<MacroType>> for trap::Label<TypeRef> {
-    fn from(value: trap::Label<MacroType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MacroType is a subclass of TypeRef
+impl From<trap::Label<MacroTypeRepr>> for trap::Label<TypeRepr> {
+    fn from(value: trap::Label<MacroTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -5806,7 +5553,7 @@ impl From<trap::Label<MacroType>> for trap::Label<TypeRef> {
 pub struct MatchExpr {
     pub id: trap::TrapId<MatchExpr>,
     pub attrs: Vec<trap::Label<Attr>>,
-    pub expr: Option<trap::Label<Expr>>,
+    pub scrutinee: Option<trap::Label<Expr>>,
     pub match_arm_list: Option<trap::Label<MatchArmList>>,
 }
 
@@ -5820,8 +5567,8 @@ impl trap::TrapEntry for MatchExpr {
         for (i, v) in self.attrs.into_iter().enumerate() {
             out.add_tuple("match_expr_attrs", vec![id.into(), i.into(), v.into()]);
         }
-        if let Some(v) = self.expr {
-            out.add_tuple("match_expr_exprs", vec![id.into(), v.into()]);
+        if let Some(v) = self.scrutinee {
+            out.add_tuple("match_expr_scrutinees", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.match_arm_list {
             out.add_tuple("match_expr_match_arm_lists", vec![id.into(), v.into()]);
@@ -5870,54 +5617,54 @@ impl From<trap::Label<MatchExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct NeverType {
-    pub id: trap::TrapId<NeverType>,
+pub struct NeverTypeRepr {
+    pub id: trap::TrapId<NeverTypeRepr>,
 }
 
-impl trap::TrapEntry for NeverType {
+impl trap::TrapEntry for NeverTypeRepr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("never_types", vec![id.into()]);
+        out.add_tuple("never_type_reprs", vec![id.into()]);
     }
 }
 
-impl trap::TrapClass for NeverType {
-    fn class_name() -> &'static str { "NeverType" }
+impl trap::TrapClass for NeverTypeRepr {
+    fn class_name() -> &'static str { "NeverTypeRepr" }
 }
 
-impl From<trap::Label<NeverType>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<NeverType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme NeverType is a subclass of AstNode
+impl From<trap::Label<NeverTypeRepr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<NeverTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme NeverTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<NeverType>> for trap::Label<Element> {
-    fn from(value: trap::Label<NeverType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme NeverType is a subclass of Element
+impl From<trap::Label<NeverTypeRepr>> for trap::Label<Element> {
+    fn from(value: trap::Label<NeverTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme NeverTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<NeverType>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<NeverType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme NeverType is a subclass of Locatable
+impl From<trap::Label<NeverTypeRepr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<NeverTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme NeverTypeRepr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<NeverType>> for trap::Label<TypeRef> {
-    fn from(value: trap::Label<NeverType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme NeverType is a subclass of TypeRef
+impl From<trap::Label<NeverTypeRepr>> for trap::Label<TypeRepr> {
+    fn from(value: trap::Label<NeverTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme NeverTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -5929,7 +5676,7 @@ pub struct OffsetOfExpr {
     pub id: trap::TrapId<OffsetOfExpr>,
     pub attrs: Vec<trap::Label<Attr>>,
     pub fields: Vec<trap::Label<NameRef>>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
 }
 
 impl trap::TrapEntry for OffsetOfExpr {
@@ -5945,8 +5692,8 @@ impl trap::TrapEntry for OffsetOfExpr {
         for (i, v) in self.fields.into_iter().enumerate() {
             out.add_tuple("offset_of_expr_fields", vec![id.into(), i.into(), v.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("offset_of_expr_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("offset_of_expr_type_reprs", vec![id.into(), v.into()]);
         }
     }
 }
@@ -6050,6 +5797,73 @@ impl From<trap::Label<OrPat>> for trap::Label<Pat> {
     }
 }
 
+#[derive(Debug)]
+pub struct Param {
+    pub id: trap::TrapId<Param>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
+    pub pat: Option<trap::Label<Pat>>,
+}
+
+impl trap::TrapEntry for Param {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("params", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("param_base_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.type_repr {
+            out.add_tuple("param_base_type_reprs", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.pat {
+            out.add_tuple("param_pats", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for Param {
+    fn class_name() -> &'static str { "Param" }
+}
+
+impl From<trap::Label<Param>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Param>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Param is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Param>> for trap::Label<Element> {
+    fn from(value: trap::Label<Param>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Param is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Param>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Param>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Param is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<Param>> for trap::Label<ParamBase> {
+    fn from(value: trap::Label<Param>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Param is a subclass of ParamBase
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct ParenExpr {
     pub id: trap::TrapId<ParenExpr>,
@@ -6173,58 +5987,58 @@ impl From<trap::Label<ParenPat>> for trap::Label<Pat> {
 }
 
 #[derive(Debug)]
-pub struct ParenType {
-    pub id: trap::TrapId<ParenType>,
-    pub ty: Option<trap::Label<TypeRef>>,
+pub struct ParenTypeRepr {
+    pub id: trap::TrapId<ParenTypeRepr>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
 }
 
-impl trap::TrapEntry for ParenType {
+impl trap::TrapEntry for ParenTypeRepr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("paren_types", vec![id.into()]);
-        if let Some(v) = self.ty {
-            out.add_tuple("paren_type_ties", vec![id.into(), v.into()]);
+        out.add_tuple("paren_type_reprs", vec![id.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("paren_type_repr_type_reprs", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for ParenType {
-    fn class_name() -> &'static str { "ParenType" }
+impl trap::TrapClass for ParenTypeRepr {
+    fn class_name() -> &'static str { "ParenTypeRepr" }
 }
 
-impl From<trap::Label<ParenType>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<ParenType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ParenType is a subclass of AstNode
+impl From<trap::Label<ParenTypeRepr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ParenTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParenTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ParenType>> for trap::Label<Element> {
-    fn from(value: trap::Label<ParenType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ParenType is a subclass of Element
+impl From<trap::Label<ParenTypeRepr>> for trap::Label<Element> {
+    fn from(value: trap::Label<ParenTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParenTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ParenType>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<ParenType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ParenType is a subclass of Locatable
+impl From<trap::Label<ParenTypeRepr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ParenTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParenTypeRepr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<ParenType>> for trap::Label<TypeRef> {
-    fn from(value: trap::Label<ParenType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ParenType is a subclass of TypeRef
+impl From<trap::Label<ParenTypeRepr>> for trap::Label<TypeRepr> {
+    fn from(value: trap::Label<ParenTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ParenTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -6399,58 +6213,58 @@ impl From<trap::Label<PathPat>> for trap::Label<Pat> {
 }
 
 #[derive(Debug)]
-pub struct PathType {
-    pub id: trap::TrapId<PathType>,
+pub struct PathTypeRepr {
+    pub id: trap::TrapId<PathTypeRepr>,
     pub path: Option<trap::Label<Path>>,
 }
 
-impl trap::TrapEntry for PathType {
+impl trap::TrapEntry for PathTypeRepr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("path_types", vec![id.into()]);
+        out.add_tuple("path_type_reprs", vec![id.into()]);
         if let Some(v) = self.path {
-            out.add_tuple("path_type_paths", vec![id.into(), v.into()]);
+            out.add_tuple("path_type_repr_paths", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for PathType {
-    fn class_name() -> &'static str { "PathType" }
+impl trap::TrapClass for PathTypeRepr {
+    fn class_name() -> &'static str { "PathTypeRepr" }
 }
 
-impl From<trap::Label<PathType>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<PathType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathType is a subclass of AstNode
+impl From<trap::Label<PathTypeRepr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<PathTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PathType>> for trap::Label<Element> {
-    fn from(value: trap::Label<PathType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathType is a subclass of Element
+impl From<trap::Label<PathTypeRepr>> for trap::Label<Element> {
+    fn from(value: trap::Label<PathTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PathType>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<PathType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathType is a subclass of Locatable
+impl From<trap::Label<PathTypeRepr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<PathTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathTypeRepr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PathType>> for trap::Label<TypeRef> {
-    fn from(value: trap::Label<PathType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathType is a subclass of TypeRef
+impl From<trap::Label<PathTypeRepr>> for trap::Label<TypeRepr> {
+    fn from(value: trap::Label<PathTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -6525,66 +6339,66 @@ impl From<trap::Label<PrefixExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct PtrType {
-    pub id: trap::TrapId<PtrType>,
+pub struct PtrTypeRepr {
+    pub id: trap::TrapId<PtrTypeRepr>,
     pub is_const: bool,
     pub is_mut: bool,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
 }
 
-impl trap::TrapEntry for PtrType {
+impl trap::TrapEntry for PtrTypeRepr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("ptr_types", vec![id.into()]);
+        out.add_tuple("ptr_type_reprs", vec![id.into()]);
         if self.is_const {
-            out.add_tuple("ptr_type_is_const", vec![id.into()]);
+            out.add_tuple("ptr_type_repr_is_const", vec![id.into()]);
         }
         if self.is_mut {
-            out.add_tuple("ptr_type_is_mut", vec![id.into()]);
+            out.add_tuple("ptr_type_repr_is_mut", vec![id.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("ptr_type_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("ptr_type_repr_type_reprs", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for PtrType {
-    fn class_name() -> &'static str { "PtrType" }
+impl trap::TrapClass for PtrTypeRepr {
+    fn class_name() -> &'static str { "PtrTypeRepr" }
 }
 
-impl From<trap::Label<PtrType>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<PtrType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PtrType is a subclass of AstNode
+impl From<trap::Label<PtrTypeRepr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<PtrTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PtrTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PtrType>> for trap::Label<Element> {
-    fn from(value: trap::Label<PtrType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PtrType is a subclass of Element
+impl From<trap::Label<PtrTypeRepr>> for trap::Label<Element> {
+    fn from(value: trap::Label<PtrTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PtrTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PtrType>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<PtrType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PtrType is a subclass of Locatable
+impl From<trap::Label<PtrTypeRepr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<PtrTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PtrTypeRepr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PtrType>> for trap::Label<TypeRef> {
-    fn from(value: trap::Label<PtrType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PtrType is a subclass of TypeRef
+impl From<trap::Label<PtrTypeRepr>> for trap::Label<TypeRepr> {
+    fn from(value: trap::Label<PtrTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PtrTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -7053,66 +6867,66 @@ impl From<trap::Label<RefPat>> for trap::Label<Pat> {
 }
 
 #[derive(Debug)]
-pub struct RefType {
-    pub id: trap::TrapId<RefType>,
+pub struct RefTypeRepr {
+    pub id: trap::TrapId<RefTypeRepr>,
     pub is_mut: bool,
     pub lifetime: Option<trap::Label<Lifetime>>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
 }
 
-impl trap::TrapEntry for RefType {
+impl trap::TrapEntry for RefTypeRepr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("ref_types", vec![id.into()]);
+        out.add_tuple("ref_type_reprs", vec![id.into()]);
         if self.is_mut {
-            out.add_tuple("ref_type_is_mut", vec![id.into()]);
+            out.add_tuple("ref_type_repr_is_mut", vec![id.into()]);
         }
         if let Some(v) = self.lifetime {
-            out.add_tuple("ref_type_lifetimes", vec![id.into(), v.into()]);
+            out.add_tuple("ref_type_repr_lifetimes", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("ref_type_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("ref_type_repr_type_reprs", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for RefType {
-    fn class_name() -> &'static str { "RefType" }
+impl trap::TrapClass for RefTypeRepr {
+    fn class_name() -> &'static str { "RefTypeRepr" }
 }
 
-impl From<trap::Label<RefType>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<RefType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RefType is a subclass of AstNode
+impl From<trap::Label<RefTypeRepr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<RefTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RefTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RefType>> for trap::Label<Element> {
-    fn from(value: trap::Label<RefType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RefType is a subclass of Element
+impl From<trap::Label<RefTypeRepr>> for trap::Label<Element> {
+    fn from(value: trap::Label<RefTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RefTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RefType>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<RefType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RefType is a subclass of Locatable
+impl From<trap::Label<RefTypeRepr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<RefTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RefTypeRepr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<RefType>> for trap::Label<TypeRef> {
-    fn from(value: trap::Label<RefType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme RefType is a subclass of TypeRef
+impl From<trap::Label<RefTypeRepr>> for trap::Label<TypeRepr> {
+    fn from(value: trap::Label<RefTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme RefTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -7241,6 +7055,81 @@ impl From<trap::Label<ReturnExpr>> for trap::Label<Locatable> {
     }
 }
 
+#[derive(Debug)]
+pub struct SelfParam {
+    pub id: trap::TrapId<SelfParam>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
+    pub is_mut: bool,
+    pub lifetime: Option<trap::Label<Lifetime>>,
+    pub name: Option<trap::Label<Name>>,
+}
+
+impl trap::TrapEntry for SelfParam {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("self_params", vec![id.into()]);
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("param_base_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.type_repr {
+            out.add_tuple("param_base_type_reprs", vec![id.into(), v.into()]);
+        }
+        if self.is_mut {
+            out.add_tuple("self_param_is_mut", vec![id.into()]);
+        }
+        if let Some(v) = self.lifetime {
+            out.add_tuple("self_param_lifetimes", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.name {
+            out.add_tuple("self_param_names", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for SelfParam {
+    fn class_name() -> &'static str { "SelfParam" }
+}
+
+impl From<trap::Label<SelfParam>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<SelfParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SelfParam is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<SelfParam>> for trap::Label<Element> {
+    fn from(value: trap::Label<SelfParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SelfParam is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<SelfParam>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<SelfParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SelfParam is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<SelfParam>> for trap::Label<ParamBase> {
+    fn from(value: trap::Label<SelfParam>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SelfParam is a subclass of ParamBase
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct SlicePat {
     pub id: trap::TrapId<SlicePat>,
@@ -7301,58 +7190,58 @@ impl From<trap::Label<SlicePat>> for trap::Label<Pat> {
 }
 
 #[derive(Debug)]
-pub struct SliceType {
-    pub id: trap::TrapId<SliceType>,
-    pub ty: Option<trap::Label<TypeRef>>,
+pub struct SliceTypeRepr {
+    pub id: trap::TrapId<SliceTypeRepr>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
 }
 
-impl trap::TrapEntry for SliceType {
+impl trap::TrapEntry for SliceTypeRepr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("slice_types", vec![id.into()]);
-        if let Some(v) = self.ty {
-            out.add_tuple("slice_type_ties", vec![id.into(), v.into()]);
+        out.add_tuple("slice_type_reprs", vec![id.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("slice_type_repr_type_reprs", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for SliceType {
-    fn class_name() -> &'static str { "SliceType" }
+impl trap::TrapClass for SliceTypeRepr {
+    fn class_name() -> &'static str { "SliceTypeRepr" }
 }
 
-impl From<trap::Label<SliceType>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<SliceType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme SliceType is a subclass of AstNode
+impl From<trap::Label<SliceTypeRepr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<SliceTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SliceTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<SliceType>> for trap::Label<Element> {
-    fn from(value: trap::Label<SliceType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme SliceType is a subclass of Element
+impl From<trap::Label<SliceTypeRepr>> for trap::Label<Element> {
+    fn from(value: trap::Label<SliceTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SliceTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<SliceType>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<SliceType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme SliceType is a subclass of Locatable
+impl From<trap::Label<SliceTypeRepr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<SliceTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SliceTypeRepr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<SliceType>> for trap::Label<TypeRef> {
-    fn from(value: trap::Label<SliceType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme SliceType is a subclass of TypeRef
+impl From<trap::Label<SliceTypeRepr>> for trap::Label<TypeRepr> {
+    fn from(value: trap::Label<SliceTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme SliceTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -7667,58 +7556,58 @@ impl From<trap::Label<TupleStructPat>> for trap::Label<Pat> {
 }
 
 #[derive(Debug)]
-pub struct TupleType {
-    pub id: trap::TrapId<TupleType>,
-    pub fields: Vec<trap::Label<TypeRef>>,
+pub struct TupleTypeRepr {
+    pub id: trap::TrapId<TupleTypeRepr>,
+    pub fields: Vec<trap::Label<TypeRepr>>,
 }
 
-impl trap::TrapEntry for TupleType {
+impl trap::TrapEntry for TupleTypeRepr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("tuple_types", vec![id.into()]);
+        out.add_tuple("tuple_type_reprs", vec![id.into()]);
         for (i, v) in self.fields.into_iter().enumerate() {
-            out.add_tuple("tuple_type_fields", vec![id.into(), i.into(), v.into()]);
+            out.add_tuple("tuple_type_repr_fields", vec![id.into(), i.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for TupleType {
-    fn class_name() -> &'static str { "TupleType" }
+impl trap::TrapClass for TupleTypeRepr {
+    fn class_name() -> &'static str { "TupleTypeRepr" }
 }
 
-impl From<trap::Label<TupleType>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<TupleType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleType is a subclass of AstNode
+impl From<trap::Label<TupleTypeRepr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<TupleTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleTypeRepr is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TupleType>> for trap::Label<Element> {
-    fn from(value: trap::Label<TupleType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleType is a subclass of Element
+impl From<trap::Label<TupleTypeRepr>> for trap::Label<Element> {
+    fn from(value: trap::Label<TupleTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleTypeRepr is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TupleType>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<TupleType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleType is a subclass of Locatable
+impl From<trap::Label<TupleTypeRepr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<TupleTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleTypeRepr is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TupleType>> for trap::Label<TypeRef> {
-    fn from(value: trap::Label<TupleType>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleType is a subclass of TypeRef
+impl From<trap::Label<TupleTypeRepr>> for trap::Label<TypeRepr> {
+    fn from(value: trap::Label<TupleTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleTypeRepr is a subclass of TypeRepr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -7728,7 +7617,7 @@ impl From<trap::Label<TupleType>> for trap::Label<TypeRef> {
 #[derive(Debug)]
 pub struct TypeArg {
     pub id: trap::TrapId<TypeArg>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
 }
 
 impl trap::TrapEntry for TypeArg {
@@ -7738,8 +7627,8 @@ impl trap::TrapEntry for TypeArg {
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("type_args", vec![id.into()]);
-        if let Some(v) = self.ty {
-            out.add_tuple("type_arg_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("type_arg_type_reprs", vec![id.into(), v.into()]);
         }
     }
 }
@@ -7788,7 +7677,7 @@ impl From<trap::Label<TypeArg>> for trap::Label<Locatable> {
 pub struct TypeParam {
     pub id: trap::TrapId<TypeParam>,
     pub attrs: Vec<trap::Label<Attr>>,
-    pub default_type: Option<trap::Label<TypeRef>>,
+    pub default_type: Option<trap::Label<TypeRepr>>,
     pub name: Option<trap::Label<Name>>,
     pub type_bound_list: Option<trap::Label<TypeBoundList>>,
 }
@@ -7915,70 +7804,74 @@ impl From<trap::Label<UnderscoreExpr>> for trap::Label<Locatable> {
 }
 
 #[derive(Debug)]
-pub struct WhileExpr {
-    pub id: trap::TrapId<WhileExpr>,
+pub struct Variant {
+    pub id: trap::TrapId<Variant>,
     pub attrs: Vec<trap::Label<Attr>>,
-    pub condition: Option<trap::Label<Expr>>,
-    pub label: Option<trap::Label<Label>>,
-    pub loop_body: Option<trap::Label<BlockExpr>>,
+    pub expr: Option<trap::Label<Expr>>,
+    pub field_list: Option<trap::Label<FieldList>>,
+    pub name: Option<trap::Label<Name>>,
+    pub visibility: Option<trap::Label<Visibility>>,
 }
 
-impl trap::TrapEntry for WhileExpr {
+impl trap::TrapEntry for Variant {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("while_exprs", vec![id.into()]);
+        out.add_tuple("variants", vec![id.into()]);
         for (i, v) in self.attrs.into_iter().enumerate() {
-            out.add_tuple("while_expr_attrs", vec![id.into(), i.into(), v.into()]);
+            out.add_tuple("variant_attrs", vec![id.into(), i.into(), v.into()]);
         }
-        if let Some(v) = self.condition {
-            out.add_tuple("while_expr_conditions", vec![id.into(), v.into()]);
+        if let Some(v) = self.expr {
+            out.add_tuple("variant_exprs", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.label {
-            out.add_tuple("while_expr_labels", vec![id.into(), v.into()]);
+        if let Some(v) = self.field_list {
+            out.add_tuple("variant_field_lists", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.loop_body {
-            out.add_tuple("while_expr_loop_bodies", vec![id.into(), v.into()]);
+        if let Some(v) = self.name {
+            out.add_tuple("variant_names", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.visibility {
+            out.add_tuple("variant_visibilities", vec![id.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for WhileExpr {
-    fn class_name() -> &'static str { "WhileExpr" }
+impl trap::TrapClass for Variant {
+    fn class_name() -> &'static str { "Variant" }
 }
 
-impl From<trap::Label<WhileExpr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<WhileExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme WhileExpr is a subclass of AstNode
+impl From<trap::Label<Variant>> for trap::Label<Addressable> {
+    fn from(value: trap::Label<Variant>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Variant is a subclass of Addressable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<WhileExpr>> for trap::Label<Element> {
-    fn from(value: trap::Label<WhileExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme WhileExpr is a subclass of Element
+impl From<trap::Label<Variant>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<Variant>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Variant is a subclass of AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<WhileExpr>> for trap::Label<Expr> {
-    fn from(value: trap::Label<WhileExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme WhileExpr is a subclass of Expr
+impl From<trap::Label<Variant>> for trap::Label<Element> {
+    fn from(value: trap::Label<Variant>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Variant is a subclass of Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<WhileExpr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<WhileExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme WhileExpr is a subclass of Locatable
+impl From<trap::Label<Variant>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<Variant>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Variant is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -8166,12 +8059,112 @@ impl From<trap::Label<YieldExpr>> for trap::Label<Locatable> {
     }
 }
 
+#[derive(Debug)]
+pub struct BlockExpr {
+    pub id: trap::TrapId<BlockExpr>,
+    pub label: Option<trap::Label<Label>>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub is_async: bool,
+    pub is_const: bool,
+    pub is_gen: bool,
+    pub is_move: bool,
+    pub is_try: bool,
+    pub is_unsafe: bool,
+    pub stmt_list: Option<trap::Label<StmtList>>,
+}
+
+impl trap::TrapEntry for BlockExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("block_exprs", vec![id.into()]);
+        if let Some(v) = self.label {
+            out.add_tuple("labelable_expr_labels", vec![id.into(), v.into()]);
+        }
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("block_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if self.is_async {
+            out.add_tuple("block_expr_is_async", vec![id.into()]);
+        }
+        if self.is_const {
+            out.add_tuple("block_expr_is_const", vec![id.into()]);
+        }
+        if self.is_gen {
+            out.add_tuple("block_expr_is_gen", vec![id.into()]);
+        }
+        if self.is_move {
+            out.add_tuple("block_expr_is_move", vec![id.into()]);
+        }
+        if self.is_try {
+            out.add_tuple("block_expr_is_try", vec![id.into()]);
+        }
+        if self.is_unsafe {
+            out.add_tuple("block_expr_is_unsafe", vec![id.into()]);
+        }
+        if let Some(v) = self.stmt_list {
+            out.add_tuple("block_expr_stmt_lists", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for BlockExpr {
+    fn class_name() -> &'static str { "BlockExpr" }
+}
+
+impl From<trap::Label<BlockExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<BlockExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme BlockExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<BlockExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<BlockExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme BlockExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<BlockExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<BlockExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme BlockExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<BlockExpr>> for trap::Label<LabelableExpr> {
+    fn from(value: trap::Label<BlockExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme BlockExpr is a subclass of LabelableExpr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<BlockExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<BlockExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme BlockExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct CallExpr {
     pub id: trap::TrapId<CallExpr>,
     pub arg_list: Option<trap::Label<ArgList>>,
     pub attrs: Vec<trap::Label<Attr>>,
-    pub expr: Option<trap::Label<Expr>>,
+    pub function: Option<trap::Label<Expr>>,
 }
 
 impl trap::TrapEntry for CallExpr {
@@ -8187,8 +8180,8 @@ impl trap::TrapEntry for CallExpr {
         for (i, v) in self.attrs.into_iter().enumerate() {
             out.add_tuple("call_expr_base_attrs", vec![id.into(), i.into(), v.into()]);
         }
-        if let Some(v) = self.expr {
-            out.add_tuple("call_expr_exprs", vec![id.into(), v.into()]);
+        if let Some(v) = self.function {
+            out.add_tuple("call_expr_functions", vec![id.into(), v.into()]);
         }
     }
 }
@@ -8250,7 +8243,7 @@ pub struct Const {
     pub is_const: bool,
     pub is_default: bool,
     pub name: Option<trap::Label<Name>>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
     pub visibility: Option<trap::Label<Visibility>>,
 }
 
@@ -8276,8 +8269,8 @@ impl trap::TrapEntry for Const {
         if let Some(v) = self.name {
             out.add_tuple("const_names", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("const_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("const_type_reprs", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.visibility {
             out.add_tuple("const_visibilities", vec![id.into(), v.into()]);
@@ -8289,6 +8282,15 @@ impl trap::TrapClass for Const {
     fn class_name() -> &'static str { "Const" }
 }
 
+impl From<trap::Label<Const>> for trap::Label<Addressable> {
+    fn from(value: trap::Label<Const>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Const is a subclass of Addressable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 impl From<trap::Label<Const>> for trap::Label<AssocItem> {
     fn from(value: trap::Label<Const>) -> Self {
         // SAFETY: this is safe because in the dbscheme Const is a subclass of AssocItem
@@ -8386,6 +8388,15 @@ impl trap::TrapClass for Enum {
     fn class_name() -> &'static str { "Enum" }
 }
 
+impl From<trap::Label<Enum>> for trap::Label<Addressable> {
+    fn from(value: trap::Label<Enum>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Enum is a subclass of Addressable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 impl From<trap::Label<Enum>> for trap::Label<AstNode> {
     fn from(value: trap::Label<Enum>) -> Self {
         // SAFETY: this is safe because in the dbscheme Enum is a subclass of AstNode
@@ -8466,6 +8477,15 @@ impl trap::TrapClass for ExternBlock {
     fn class_name() -> &'static str { "ExternBlock" }
 }
 
+impl From<trap::Label<ExternBlock>> for trap::Label<Addressable> {
+    fn from(value: trap::Label<ExternBlock>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExternBlock is a subclass of Addressable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 impl From<trap::Label<ExternBlock>> for trap::Label<AstNode> {
     fn from(value: trap::Label<ExternBlock>) -> Self {
         // SAFETY: this is safe because in the dbscheme ExternBlock is a subclass of AstNode
@@ -8546,6 +8566,15 @@ impl trap::TrapClass for ExternCrate {
     fn class_name() -> &'static str { "ExternCrate" }
 }
 
+impl From<trap::Label<ExternCrate>> for trap::Label<Addressable> {
+    fn from(value: trap::Label<ExternCrate>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ExternCrate is a subclass of Addressable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 impl From<trap::Label<ExternCrate>> for trap::Label<AstNode> {
     fn from(value: trap::Label<ExternCrate>) -> Self {
         // SAFETY: this is safe because in the dbscheme ExternCrate is a subclass of AstNode
@@ -8605,7 +8634,7 @@ pub struct Function {
     pub is_gen: bool,
     pub is_unsafe: bool,
     pub name: Option<trap::Label<Name>>,
-    pub ret_type: Option<trap::Label<RetType>>,
+    pub ret_type: Option<trap::Label<RetTypeRepr>>,
     pub visibility: Option<trap::Label<Visibility>>,
     pub where_clause: Option<trap::Label<WhereClause>>,
 }
@@ -8666,6 +8695,15 @@ impl trap::TrapClass for Function {
     fn class_name() -> &'static str { "Function" }
 }
 
+impl From<trap::Label<Function>> for trap::Label<Addressable> {
+    fn from(value: trap::Label<Function>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Function is a subclass of Addressable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 impl From<trap::Label<Function>> for trap::Label<AssocItem> {
     fn from(value: trap::Label<Function>) -> Self {
         // SAFETY: this is safe because in the dbscheme Function is a subclass of AssocItem
@@ -8747,8 +8785,8 @@ pub struct Impl {
     pub is_const: bool,
     pub is_default: bool,
     pub is_unsafe: bool,
-    pub self_ty: Option<trap::Label<TypeRef>>,
-    pub trait_: Option<trap::Label<TypeRef>>,
+    pub self_ty: Option<trap::Label<TypeRepr>>,
+    pub trait_: Option<trap::Label<TypeRepr>>,
     pub visibility: Option<trap::Label<Visibility>>,
     pub where_clause: Option<trap::Label<WhereClause>>,
 }
@@ -8797,6 +8835,15 @@ impl trap::TrapClass for Impl {
     fn class_name() -> &'static str { "Impl" }
 }
 
+impl From<trap::Label<Impl>> for trap::Label<Addressable> {
+    fn from(value: trap::Label<Impl>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Impl is a subclass of Addressable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 impl From<trap::Label<Impl>> for trap::Label<AstNode> {
     fn from(value: trap::Label<Impl>) -> Self {
         // SAFETY: this is safe because in the dbscheme Impl is a subclass of AstNode
@@ -8842,6 +8889,60 @@ impl From<trap::Label<Impl>> for trap::Label<Stmt> {
     }
 }
 
+#[derive(Debug)]
+pub struct LoopingExpr {
+    _unused: ()
+}
+
+impl trap::TrapClass for LoopingExpr {
+    fn class_name() -> &'static str { "LoopingExpr" }
+}
+
+impl From<trap::Label<LoopingExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<LoopingExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LoopingExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LoopingExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<LoopingExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LoopingExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LoopingExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<LoopingExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LoopingExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LoopingExpr>> for trap::Label<LabelableExpr> {
+    fn from(value: trap::Label<LoopingExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LoopingExpr is a subclass of LabelableExpr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LoopingExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<LoopingExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LoopingExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct MacroCall {
     pub id: trap::TrapId<MacroCall>,
@@ -8879,6 +8980,15 @@ impl trap::TrapClass for MacroCall {
     fn class_name() -> &'static str { "MacroCall" }
 }
 
+impl From<trap::Label<MacroCall>> for trap::Label<Addressable> {
+    fn from(value: trap::Label<MacroCall>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroCall is a subclass of Addressable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 impl From<trap::Label<MacroCall>> for trap::Label<AssocItem> {
     fn from(value: trap::Label<MacroCall>) -> Self {
         // SAFETY: this is safe because in the dbscheme MacroCall is a subclass of AssocItem
@@ -8981,6 +9091,15 @@ impl trap::TrapClass for MacroDef {
     fn class_name() -> &'static str { "MacroDef" }
 }
 
+impl From<trap::Label<MacroDef>> for trap::Label<Addressable> {
+    fn from(value: trap::Label<MacroDef>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroDef is a subclass of Addressable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 impl From<trap::Label<MacroDef>> for trap::Label<AstNode> {
     fn from(value: trap::Label<MacroDef>) -> Self {
         // SAFETY: this is safe because in the dbscheme MacroDef is a subclass of AstNode
@@ -9061,6 +9180,15 @@ impl trap::TrapClass for MacroRules {
     fn class_name() -> &'static str { "MacroRules" }
 }
 
+impl From<trap::Label<MacroRules>> for trap::Label<Addressable> {
+    fn from(value: trap::Label<MacroRules>) -> Self {
+        // SAFETY: this is safe because in the dbscheme MacroRules is a subclass of Addressable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 impl From<trap::Label<MacroRules>> for trap::Label<AstNode> {
     fn from(value: trap::Label<MacroRules>) -> Self {
         // SAFETY: this is safe because in the dbscheme MacroRules is a subclass of AstNode
@@ -9234,6 +9362,15 @@ impl trap::TrapClass for Module {
     fn class_name() -> &'static str { "Module" }
 }
 
+impl From<trap::Label<Module>> for trap::Label<Addressable> {
+    fn from(value: trap::Label<Module>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Module is a subclass of Addressable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 impl From<trap::Label<Module>> for trap::Label<AstNode> {
     fn from(value: trap::Label<Module>) -> Self {
         // SAFETY: this is safe because in the dbscheme Module is a subclass of AstNode
@@ -9359,7 +9496,7 @@ pub struct Static {
     pub is_mut: bool,
     pub is_static: bool,
     pub name: Option<trap::Label<Name>>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
     pub visibility: Option<trap::Label<Visibility>>,
 }
 
@@ -9385,8 +9522,8 @@ impl trap::TrapEntry for Static {
         if let Some(v) = self.name {
             out.add_tuple("static_names", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("static_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("static_type_reprs", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.visibility {
             out.add_tuple("static_visibilities", vec![id.into(), v.into()]);
@@ -9398,6 +9535,15 @@ impl trap::TrapClass for Static {
     fn class_name() -> &'static str { "Static" }
 }
 
+impl From<trap::Label<Static>> for trap::Label<Addressable> {
+    fn from(value: trap::Label<Static>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Static is a subclass of Addressable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 impl From<trap::Label<Static>> for trap::Label<AstNode> {
     fn from(value: trap::Label<Static>) -> Self {
         // SAFETY: this is safe because in the dbscheme Static is a subclass of AstNode
@@ -9495,6 +9641,15 @@ impl trap::TrapClass for Struct {
     fn class_name() -> &'static str { "Struct" }
 }
 
+impl From<trap::Label<Struct>> for trap::Label<Addressable> {
+    fn from(value: trap::Label<Struct>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Struct is a subclass of Addressable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 impl From<trap::Label<Struct>> for trap::Label<AstNode> {
     fn from(value: trap::Label<Struct>) -> Self {
         // SAFETY: this is safe because in the dbscheme Struct is a subclass of AstNode
@@ -9595,6 +9750,15 @@ impl trap::TrapClass for Trait {
     fn class_name() -> &'static str { "Trait" }
 }
 
+impl From<trap::Label<Trait>> for trap::Label<Addressable> {
+    fn from(value: trap::Label<Trait>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Trait is a subclass of Addressable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 impl From<trap::Label<Trait>> for trap::Label<AstNode> {
     fn from(value: trap::Label<Trait>) -> Self {
         // SAFETY: this is safe because in the dbscheme Trait is a subclass of AstNode
@@ -9683,6 +9847,15 @@ impl trap::TrapClass for TraitAlias {
     fn class_name() -> &'static str { "TraitAlias" }
 }
 
+impl From<trap::Label<TraitAlias>> for trap::Label<Addressable> {
+    fn from(value: trap::Label<TraitAlias>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TraitAlias is a subclass of Addressable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 impl From<trap::Label<TraitAlias>> for trap::Label<AstNode> {
     fn from(value: trap::Label<TraitAlias>) -> Self {
         // SAFETY: this is safe because in the dbscheme TraitAlias is a subclass of AstNode
@@ -9735,7 +9908,7 @@ pub struct TypeAlias {
     pub generic_param_list: Option<trap::Label<GenericParamList>>,
     pub is_default: bool,
     pub name: Option<trap::Label<Name>>,
-    pub ty: Option<trap::Label<TypeRef>>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
     pub type_bound_list: Option<trap::Label<TypeBoundList>>,
     pub visibility: Option<trap::Label<Visibility>>,
     pub where_clause: Option<trap::Label<WhereClause>>,
@@ -9760,8 +9933,8 @@ impl trap::TrapEntry for TypeAlias {
         if let Some(v) = self.name {
             out.add_tuple("type_alias_names", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.ty {
-            out.add_tuple("type_alias_ties", vec![id.into(), v.into()]);
+        if let Some(v) = self.type_repr {
+            out.add_tuple("type_alias_type_reprs", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.type_bound_list {
             out.add_tuple("type_alias_type_bound_lists", vec![id.into(), v.into()]);
@@ -9779,6 +9952,15 @@ impl trap::TrapClass for TypeAlias {
     fn class_name() -> &'static str { "TypeAlias" }
 }
 
+impl From<trap::Label<TypeAlias>> for trap::Label<Addressable> {
+    fn from(value: trap::Label<TypeAlias>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TypeAlias is a subclass of Addressable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 impl From<trap::Label<TypeAlias>> for trap::Label<AssocItem> {
     fn from(value: trap::Label<TypeAlias>) -> Self {
         // SAFETY: this is safe because in the dbscheme TypeAlias is a subclass of AssocItem
@@ -9885,6 +10067,15 @@ impl trap::TrapClass for Union {
     fn class_name() -> &'static str { "Union" }
 }
 
+impl From<trap::Label<Union>> for trap::Label<Addressable> {
+    fn from(value: trap::Label<Union>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Union is a subclass of Addressable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 impl From<trap::Label<Union>> for trap::Label<AstNode> {
     fn from(value: trap::Label<Union>) -> Self {
         // SAFETY: this is safe because in the dbscheme Union is a subclass of AstNode
@@ -9961,6 +10152,15 @@ impl trap::TrapClass for Use {
     fn class_name() -> &'static str { "Use" }
 }
 
+impl From<trap::Label<Use>> for trap::Label<Addressable> {
+    fn from(value: trap::Label<Use>) -> Self {
+        // SAFETY: this is safe because in the dbscheme Use is a subclass of Addressable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 impl From<trap::Label<Use>> for trap::Label<AstNode> {
     fn from(value: trap::Label<Use>) -> Self {
         // SAFETY: this is safe because in the dbscheme Use is a subclass of AstNode
@@ -10005,3 +10205,270 @@ impl From<trap::Label<Use>> for trap::Label<Stmt> {
         }
     }
 }
+
+#[derive(Debug)]
+pub struct ForExpr {
+    pub id: trap::TrapId<ForExpr>,
+    pub label: Option<trap::Label<Label>>,
+    pub loop_body: Option<trap::Label<BlockExpr>>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub iterable: Option<trap::Label<Expr>>,
+    pub pat: Option<trap::Label<Pat>>,
+}
+
+impl trap::TrapEntry for ForExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("for_exprs", vec![id.into()]);
+        if let Some(v) = self.label {
+            out.add_tuple("labelable_expr_labels", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.loop_body {
+            out.add_tuple("looping_expr_loop_bodies", vec![id.into(), v.into()]);
+        }
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("for_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.iterable {
+            out.add_tuple("for_expr_iterables", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.pat {
+            out.add_tuple("for_expr_pats", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for ForExpr {
+    fn class_name() -> &'static str { "ForExpr" }
+}
+
+impl From<trap::Label<ForExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ForExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ForExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<ForExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ForExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<ForExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ForExpr>> for trap::Label<LabelableExpr> {
+    fn from(value: trap::Label<ForExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForExpr is a subclass of LabelableExpr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ForExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ForExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ForExpr>> for trap::Label<LoopingExpr> {
+    fn from(value: trap::Label<ForExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForExpr is a subclass of LoopingExpr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct LoopExpr {
+    pub id: trap::TrapId<LoopExpr>,
+    pub label: Option<trap::Label<Label>>,
+    pub loop_body: Option<trap::Label<BlockExpr>>,
+    pub attrs: Vec<trap::Label<Attr>>,
+}
+
+impl trap::TrapEntry for LoopExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("loop_exprs", vec![id.into()]);
+        if let Some(v) = self.label {
+            out.add_tuple("labelable_expr_labels", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.loop_body {
+            out.add_tuple("looping_expr_loop_bodies", vec![id.into(), v.into()]);
+        }
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("loop_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for LoopExpr {
+    fn class_name() -> &'static str { "LoopExpr" }
+}
+
+impl From<trap::Label<LoopExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<LoopExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LoopExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LoopExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<LoopExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LoopExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LoopExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<LoopExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LoopExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LoopExpr>> for trap::Label<LabelableExpr> {
+    fn from(value: trap::Label<LoopExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LoopExpr is a subclass of LabelableExpr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LoopExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<LoopExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LoopExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<LoopExpr>> for trap::Label<LoopingExpr> {
+    fn from(value: trap::Label<LoopExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme LoopExpr is a subclass of LoopingExpr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct WhileExpr {
+    pub id: trap::TrapId<WhileExpr>,
+    pub label: Option<trap::Label<Label>>,
+    pub loop_body: Option<trap::Label<BlockExpr>>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub condition: Option<trap::Label<Expr>>,
+}
+
+impl trap::TrapEntry for WhileExpr {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("while_exprs", vec![id.into()]);
+        if let Some(v) = self.label {
+            out.add_tuple("labelable_expr_labels", vec![id.into(), v.into()]);
+        }
+        if let Some(v) = self.loop_body {
+            out.add_tuple("looping_expr_loop_bodies", vec![id.into(), v.into()]);
+        }
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("while_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        if let Some(v) = self.condition {
+            out.add_tuple("while_expr_conditions", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for WhileExpr {
+    fn class_name() -> &'static str { "WhileExpr" }
+}
+
+impl From<trap::Label<WhileExpr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<WhileExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme WhileExpr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<WhileExpr>> for trap::Label<Element> {
+    fn from(value: trap::Label<WhileExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme WhileExpr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<WhileExpr>> for trap::Label<Expr> {
+    fn from(value: trap::Label<WhileExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme WhileExpr is a subclass of Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<WhileExpr>> for trap::Label<LabelableExpr> {
+    fn from(value: trap::Label<WhileExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme WhileExpr is a subclass of LabelableExpr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<WhileExpr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<WhileExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme WhileExpr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<WhileExpr>> for trap::Label<LoopingExpr> {
+    fn from(value: trap::Label<WhileExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme WhileExpr is a subclass of LoopingExpr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
diff --git a/rust/extractor/src/main.rs b/rust/extractor/src/main.rs
index ecbdc965f8e..86aeb09f6a4 100644
--- a/rust/extractor/src/main.rs
+++ b/rust/extractor/src/main.rs
@@ -1,13 +1,16 @@
+use crate::diagnostics::{emit_extraction_diagnostics, ExtractionStep};
 use crate::rust_analyzer::path_to_file_id;
+use crate::trap::TrapId;
 use anyhow::Context;
 use archive::Archiver;
-use log::info;
+use log::{info, warn};
 use ra_ap_hir::Semantics;
 use ra_ap_ide_db::line_index::{LineCol, LineIndex};
 use ra_ap_ide_db::RootDatabase;
-use ra_ap_project_model::ProjectManifest;
+use ra_ap_project_model::{CargoConfig, ProjectManifest};
 use ra_ap_vfs::Vfs;
 use rust_analyzer::{ParseResult, RustAnalyzer};
+use std::time::Instant;
 use std::{
     collections::HashMap,
     path::{Path, PathBuf},
@@ -15,6 +18,7 @@ use std::{
 
 mod archive;
 mod config;
+mod diagnostics;
 pub mod generated;
 mod qltest;
 mod rust_analyzer;
@@ -24,18 +28,31 @@ pub mod trap;
 struct Extractor<'a> {
     archiver: &'a Archiver,
     traps: &'a trap::TrapFileProvider,
+    steps: Vec<ExtractionStep>,
 }
 
-impl Extractor<'_> {
-    fn extract(&self, rust_analyzer: &rust_analyzer::RustAnalyzer, file: &std::path::Path) {
+impl<'a> Extractor<'a> {
+    pub fn new(archiver: &'a Archiver, traps: &'a trap::TrapFileProvider) -> Self {
+        Self {
+            archiver,
+            traps,
+            steps: Vec::new(),
+        }
+    }
+
+    fn extract(&mut self, rust_analyzer: &rust_analyzer::RustAnalyzer, file: &std::path::Path) {
         self.archiver.archive(file);
 
+        let before_parse = Instant::now();
         let ParseResult {
             ast,
             text,
             errors,
             semantics_info,
         } = rust_analyzer.parse(file);
+        self.steps.push(ExtractionStep::parse(before_parse, file));
+
+        let before_extract = Instant::now();
         let line_index = LineIndex::new(text.as_ref());
         let display_path = file.to_string_lossy();
         let mut trap = self.traps.create("source", file);
@@ -73,22 +90,79 @@ impl Extractor<'_> {
                 err.to_string()
             )
         });
+        self.steps
+            .push(ExtractionStep::extract(before_extract, file));
     }
 
     pub fn extract_with_semantics(
-        &self,
+        &mut self,
         file: &Path,
         semantics: &Semantics<'_, RootDatabase>,
         vfs: &Vfs,
     ) {
         self.extract(&RustAnalyzer::new(vfs, semantics), file);
     }
-    pub fn extract_without_semantics(&self, file: &Path, reason: &str) {
+
+    pub fn extract_without_semantics(&mut self, file: &Path, reason: &str) {
         self.extract(&RustAnalyzer::WithoutSemantics { reason }, file);
     }
+
+    pub fn load_manifest(
+        &mut self,
+        project: &ProjectManifest,
+        config: &CargoConfig,
+    ) -> Option<(RootDatabase, Vfs)> {
+        let before = Instant::now();
+        let ret = RustAnalyzer::load_workspace(project, config);
+        self.steps
+            .push(ExtractionStep::load_manifest(before, project));
+        ret
+    }
+
+    pub fn load_source(
+        &mut self,
+        file: &Path,
+        semantics: &Semantics<'_, RootDatabase>,
+        vfs: &Vfs,
+    ) -> Result<(), String> {
+        let before = Instant::now();
+        let Some(id) = path_to_file_id(file, vfs) else {
+            return Err("not included in files loaded from manifest".to_string());
+        };
+        if semantics.file_to_module_def(id).is_none() {
+            return Err("not included as a module".to_string());
+        }
+        self.steps.push(ExtractionStep::load_source(before, file));
+        Ok(())
+    }
+
+    pub fn emit_extraction_diagnostics(
+        self,
+        start: Instant,
+        cfg: &config::Config,
+    ) -> anyhow::Result<()> {
+        emit_extraction_diagnostics(start, cfg, &self.steps)?;
+        let mut trap = self.traps.create("diagnostics", "extraction");
+        for step in self.steps {
+            let file = trap.emit_file(&step.file);
+            let duration_ms = usize::try_from(step.ms).unwrap_or_else(|_e| {
+                warn!("extraction step duration overflowed ({step:?})");
+                i32::MAX as usize
+            });
+            trap.emit(generated::ExtractorStep {
+                id: TrapId::Star,
+                action: format!("{:?}", step.action),
+                file,
+                duration_ms,
+            });
+        }
+        trap.commit()?;
+        Ok(())
+    }
 }
 
 fn main() -> anyhow::Result<()> {
+    let start = Instant::now();
     let mut cfg = config::Config::extract().context("failed to load configuration")?;
     stderrlog::new()
         .module(module_path!())
@@ -103,10 +177,7 @@ fn main() -> anyhow::Result<()> {
     let archiver = archive::Archiver {
         root: cfg.source_archive_dir.clone(),
     };
-    let extractor = Extractor {
-        archiver: &archiver,
-        traps: &traps,
-    };
+    let mut extractor = Extractor::new(&archiver, &traps);
     let files: Vec<PathBuf> = cfg
         .inputs
         .iter()
@@ -132,21 +203,13 @@ fn main() -> anyhow::Result<()> {
     }
     let cargo_config = cfg.to_cargo_config();
     for (manifest, files) in map.values().filter(|(_, files)| !files.is_empty()) {
-        if let Some((ref db, ref vfs)) = RustAnalyzer::load_workspace(manifest, &cargo_config) {
+        if let Some((ref db, ref vfs)) = extractor.load_manifest(manifest, &cargo_config) {
             let semantics = Semantics::new(db);
             for file in files {
-                let Some(id) = path_to_file_id(file, vfs) else {
-                    extractor.extract_without_semantics(
-                        file,
-                        "not included in files loaded from manifest",
-                    );
-                    continue;
+                match extractor.load_source(file, &semantics, vfs) {
+                    Ok(()) => extractor.extract_with_semantics(file, &semantics, vfs),
+                    Err(reason) => extractor.extract_without_semantics(file, &reason),
                 };
-                if semantics.file_to_module_def(id).is_none() {
-                    extractor.extract_without_semantics(file, "not included as a module");
-                    continue;
-                }
-                extractor.extract_with_semantics(file, &semantics, vfs);
             }
         } else {
             for file in files {
@@ -155,5 +218,5 @@ fn main() -> anyhow::Result<()> {
         }
     }
 
-    Ok(())
+    extractor.emit_extraction_diagnostics(start, &cfg)
 }
diff --git a/rust/extractor/src/rust_analyzer.rs b/rust/extractor/src/rust_analyzer.rs
index 735bacb27c1..a896211333d 100644
--- a/rust/extractor/src/rust_analyzer.rs
+++ b/rust/extractor/src/rust_analyzer.rs
@@ -17,6 +17,7 @@ use ra_ap_vfs::Vfs;
 use ra_ap_vfs::VfsPath;
 use ra_ap_vfs::{AbsPathBuf, FileId};
 use std::borrow::Cow;
+use std::iter;
 use std::path::{Path, PathBuf};
 use triomphe::Arc;
 
@@ -188,10 +189,28 @@ fn from_utf8_lossy(v: &[u8]) -> (Cow<'_, str>, Option<SyntaxError>) {
     (Cow::Owned(res), Some(error))
 }
 
-pub(crate) fn path_to_file_id(path: &Path, vfs: &Vfs) -> Option<FileId> {
-    Utf8PathBuf::from_path_buf(path.to_path_buf())
-        .ok()
-        .and_then(|x| AbsPathBuf::try_from(x).ok())
-        .map(VfsPath::from)
-        .and_then(|x| vfs.file_id(&x))
+fn canonicalize_if_on_windows(path: &Path) -> Option<PathBuf> {
+    if cfg!(windows) {
+        dunce::canonicalize(path).ok()
+    } else {
+        None
+    }
+}
+
+pub(crate) fn path_to_file_id(path: &Path, vfs: &Vfs) -> Option<FileId> {
+    // There seems to be some flaky inconsistencies around paths on Windows, where sometimes paths
+    // are registered in `vfs` without the `//?/` long path prefix. Then it happens that paths with
+    // that prefix are not found. To work around that, on Windows after failing to find `path` as
+    // is, we then try to canonicalize it using dunce. Dunce will be able to losslessly convert a
+    // `//?/` path into its equivalent one in `vfs` without the prefix, if there is one.
+    iter::once(path.to_path_buf())
+        .chain(canonicalize_if_on_windows(path))
+        .filter_map(|p| {
+            Utf8PathBuf::from_path_buf(p)
+                .ok()
+                .and_then(|x| AbsPathBuf::try_from(x).ok())
+                .map(VfsPath::from)
+                .and_then(|x| vfs.file_id(&x))
+        })
+        .next()
 }
diff --git a/rust/extractor/src/translate/base.rs b/rust/extractor/src/translate/base.rs
index c7e00edb331..396816c6a0c 100644
--- a/rust/extractor/src/translate/base.rs
+++ b/rust/extractor/src/translate/base.rs
@@ -4,13 +4,14 @@ use crate::generated::{self};
 use crate::rust_analyzer::FileSemanticInformation;
 use crate::trap::{DiagnosticSeverity, TrapFile, TrapId};
 use crate::trap::{Label, TrapClass};
-use codeql_extractor::trap::{self};
 use itertools::Either;
 use log::Level;
 use ra_ap_base_db::salsa::InternKey;
 use ra_ap_base_db::CrateOrigin;
 use ra_ap_hir::db::ExpandDatabase;
-use ra_ap_hir::{Adt, Crate, ItemContainer, Module, ModuleDef, PathResolution, Semantics, Type};
+use ra_ap_hir::{
+    Adt, Crate, ItemContainer, Module, ModuleDef, PathResolution, Semantics, Type, Variant,
+};
 use ra_ap_hir_def::type_ref::Mutability;
 use ra_ap_hir_def::ModuleId;
 use ra_ap_hir_expand::ExpandTo;
@@ -47,6 +48,9 @@ macro_rules! emit_detached {
     (Module, $self:ident, $node:ident, $label:ident) => {
         $self.extract_canonical_origin(&$node, $label.into());
     };
+    (Variant, $self:ident, $node:ident, $label:ident) => {
+        $self.extract_canonical_origin_of_enum_variant(&$node, $label);
+    };
     // TODO canonical origin of other items
     (Path, $self:ident, $node:ident, $label:ident) => {
         $self.extract_canonical_destination(&$node, $label);
@@ -60,7 +64,7 @@ macro_rules! emit_detached {
 pub struct Translator<'a> {
     pub trap: TrapFile,
     path: &'a str,
-    label: trap::Label,
+    label: Label<generated::File>,
     line_index: LineIndex,
     file_id: Option<EditionedFileId>,
     pub semantics: Option<&'a Semantics<'a, RootDatabase>>,
@@ -70,7 +74,7 @@ impl<'a> Translator<'a> {
     pub fn new(
         trap: TrapFile,
         path: &'a str,
-        label: trap::Label,
+        label: Label<generated::File>,
         line_index: LineIndex,
         semantic_info: Option<&FileSemanticInformation<'a>>,
     ) -> Translator<'a> {
@@ -396,16 +400,24 @@ impl<'a> Translator<'a> {
             ModuleDef::Adt(Adt::Struct(it)) => self.canonical_path_from_hir(it),
             ModuleDef::Adt(Adt::Union(it)) => self.canonical_path_from_hir(it),
             ModuleDef::Trait(it) => self.canonical_path_from_hir(it),
+            ModuleDef::Variant(it) => self.canonical_path_from_enum_variant(it),
             ModuleDef::Static(_) => None,
             ModuleDef::TraitAlias(_) => None,
             ModuleDef::TypeAlias(_) => None,
             ModuleDef::BuiltinType(_) => None,
             ModuleDef::Macro(_) => None,
-            ModuleDef::Variant(_) => None,
             ModuleDef::Const(_) => None,
         }
     }
 
+    fn canonical_path_from_enum_variant(&self, item: Variant) -> Option<String> {
+        // if we have a Hir entity, it means we have semantics
+        let sema = self.semantics.as_ref().unwrap();
+        let prefix = self.canonical_path_from_hir(item.parent_enum(sema.db))?;
+        let name = item.name(sema.db);
+        Some(format!("{prefix}::{}", name.as_str()))
+    }
+
     fn origin_from_hir<T: AstNode>(&self, item: impl AddressableHir<T>) -> String {
         // if we have a Hir entity, it means we have semantics
         let sema = self.semantics.as_ref().unwrap();
@@ -437,28 +449,58 @@ impl<'a> Translator<'a> {
             ModuleDef::Adt(Adt::Struct(it)) => Some(self.origin_from_hir(it)),
             ModuleDef::Adt(Adt::Union(it)) => Some(self.origin_from_hir(it)),
             ModuleDef::Trait(it) => Some(self.origin_from_hir(it)),
+            ModuleDef::Variant(it) => Some(self.origin_from_enum_variant(it)),
             ModuleDef::Static(_) => None,
             ModuleDef::TraitAlias(_) => None,
             ModuleDef::TypeAlias(_) => None,
             ModuleDef::BuiltinType(_) => None,
             ModuleDef::Macro(_) => None,
-            ModuleDef::Variant(_) => None,
             ModuleDef::Const(_) => None,
         }
     }
 
+    fn origin_from_enum_variant(&self, item: Variant) -> String {
+        // if we have a Hir entity, it means we have semantics
+        let sema = self.semantics.as_ref().unwrap();
+        self.origin_from_hir(item.parent_enum(sema.db))
+    }
+
     pub(crate) fn extract_canonical_origin<T: AddressableAst + HasName>(
         &mut self,
         item: &T,
-        label: Label<generated::Item>,
+        label: Label<generated::Addressable>,
     ) {
         (|| {
             let sema = self.semantics.as_ref()?;
             let def = T::Hir::try_from_source(item, sema)?;
             let path = self.canonical_path_from_hir(def)?;
             let origin = self.origin_from_hir(def);
-            generated::Item::emit_crate_origin(label, origin, &mut self.trap.writer);
-            generated::Item::emit_extended_canonical_path(label, path, &mut self.trap.writer);
+            generated::Addressable::emit_crate_origin(label, origin, &mut self.trap.writer);
+            generated::Addressable::emit_extended_canonical_path(
+                label,
+                path,
+                &mut self.trap.writer,
+            );
+            Some(())
+        })();
+    }
+
+    pub(crate) fn extract_canonical_origin_of_enum_variant(
+        &mut self,
+        item: &ast::Variant,
+        label: Label<generated::Variant>,
+    ) {
+        (|| {
+            let sema = self.semantics.as_ref()?;
+            let def = sema.to_enum_variant_def(item)?;
+            let path = self.canonical_path_from_enum_variant(def)?;
+            let origin = self.origin_from_enum_variant(def);
+            generated::Addressable::emit_crate_origin(label.into(), origin, &mut self.trap.writer);
+            generated::Addressable::emit_extended_canonical_path(
+                label.into(),
+                path,
+                &mut self.trap.writer,
+            );
             Some(())
         })();
     }
diff --git a/rust/extractor/src/translate/generated.rs b/rust/extractor/src/translate/generated.rs
index aea607b753d..a87f2d74caf 100644
--- a/rust/extractor/src/translate/generated.rs
+++ b/rust/extractor/src/translate/generated.rs
@@ -133,7 +133,7 @@ impl Translator<'_> {
         }
     }
 
-    pub(crate) fn emit_type(&mut self, node: ast::Type) -> Label<generated::TypeRef> {
+    pub(crate) fn emit_type(&mut self, node: ast::Type) -> Label<generated::TypeRepr> {
         match node {
             ast::Type::ArrayType(inner) => self.emit_array_type(inner).into(),
             ast::Type::DynTraitType(inner) => self.emit_dyn_trait_type(inner).into(),
@@ -198,30 +198,32 @@ impl Translator<'_> {
         label
     }
 
-    pub(crate) fn emit_array_expr(&mut self, node: ast::ArrayExpr) -> Label<generated::ArrayExpr> {
+    pub(crate) fn emit_array_expr(&mut self, node: ast::ArrayExpr) -> Label<generated::ArrayExprInternal> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let exprs = node.exprs().map(|x| self.emit_expr(x)).collect();
-        let label = self.trap.emit(generated::ArrayExpr {
+        let is_semicolon = node.semicolon_token().is_some();
+        let label = self.trap.emit(generated::ArrayExprInternal {
             id: TrapId::Star,
             attrs,
             exprs,
+            is_semicolon,
         });
         self.emit_location(label, &node);
-        emit_detached!(ArrayExpr, self, node, label);
+        emit_detached!(ArrayExprInternal, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
 
-    pub(crate) fn emit_array_type(&mut self, node: ast::ArrayType) -> Label<generated::ArrayType> {
+    pub(crate) fn emit_array_type(&mut self, node: ast::ArrayType) -> Label<generated::ArrayTypeRepr> {
         let const_arg = node.const_arg().map(|x| self.emit_const_arg(x));
-        let ty = node.ty().map(|x| self.emit_type(x));
-        let label = self.trap.emit(generated::ArrayType {
+        let element_type_repr = node.ty().map(|x| self.emit_type(x));
+        let label = self.trap.emit(generated::ArrayTypeRepr {
             id: TrapId::Star,
             const_arg,
-            ty,
+            element_type_repr,
         });
         self.emit_location(label, &node);
-        emit_detached!(ArrayType, self, node, label);
+        emit_detached!(ArrayTypeRepr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -261,7 +263,7 @@ impl Translator<'_> {
         let param_list = node.param_list().map(|x| self.emit_param_list(x));
         let ret_type = node.ret_type().map(|x| self.emit_ret_type(x));
         let return_type_syntax = node.return_type_syntax().map(|x| self.emit_return_type_syntax(x));
-        let ty = node.ty().map(|x| self.emit_type(x));
+        let type_repr = node.ty().map(|x| self.emit_type(x));
         let type_bound_list = node.type_bound_list().map(|x| self.emit_type_bound_list(x));
         let label = self.trap.emit(generated::AssocTypeArg {
             id: TrapId::Star,
@@ -271,7 +273,7 @@ impl Translator<'_> {
             param_list,
             ret_type,
             return_type_syntax,
-            ty,
+            type_repr,
             type_bound_list,
         });
         self.emit_location(label, &node);
@@ -397,12 +399,12 @@ impl Translator<'_> {
     pub(crate) fn emit_call_expr(&mut self, node: ast::CallExpr) -> Label<generated::CallExpr> {
         let arg_list = node.arg_list().map(|x| self.emit_arg_list(x));
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
-        let expr = node.expr().map(|x| self.emit_expr(x));
+        let function = node.expr().map(|x| self.emit_expr(x));
         let label = self.trap.emit(generated::CallExpr {
             id: TrapId::Star,
             arg_list,
             attrs,
-            expr,
+            function,
         });
         self.emit_location(label, &node);
         emit_detached!(CallExpr, self, node, label);
@@ -413,12 +415,12 @@ impl Translator<'_> {
     pub(crate) fn emit_cast_expr(&mut self, node: ast::CastExpr) -> Label<generated::CastExpr> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let expr = node.expr().map(|x| self.emit_expr(x));
-        let ty = node.ty().map(|x| self.emit_type(x));
+        let type_repr = node.ty().map(|x| self.emit_type(x));
         let label = self.trap.emit(generated::CastExpr {
             id: TrapId::Star,
             attrs,
             expr,
-            ty,
+            type_repr,
         });
         self.emit_location(label, &node);
         emit_detached!(CastExpr, self, node, label);
@@ -474,7 +476,7 @@ impl Translator<'_> {
         let is_const = node.const_token().is_some();
         let is_default = node.default_token().is_some();
         let name = node.name().map(|x| self.emit_name(x));
-        let ty = node.ty().map(|x| self.emit_type(x));
+        let type_repr = node.ty().map(|x| self.emit_type(x));
         let visibility = node.visibility().map(|x| self.emit_visibility(x));
         let label = self.trap.emit(generated::Const {
             id: TrapId::Star,
@@ -483,7 +485,7 @@ impl Translator<'_> {
             is_const,
             is_default,
             name,
-            ty,
+            type_repr,
             visibility,
         });
         self.emit_location(label, &node);
@@ -523,14 +525,14 @@ impl Translator<'_> {
         let default_val = node.default_val().map(|x| self.emit_const_arg(x));
         let is_const = node.const_token().is_some();
         let name = node.name().map(|x| self.emit_name(x));
-        let ty = node.ty().map(|x| self.emit_type(x));
+        let type_repr = node.ty().map(|x| self.emit_type(x));
         let label = self.trap.emit(generated::ConstParam {
             id: TrapId::Star,
             attrs,
             default_val,
             is_const,
             name,
-            ty,
+            type_repr,
         });
         self.emit_location(label, &node);
         emit_detached!(ConstParam, self, node, label);
@@ -552,14 +554,14 @@ impl Translator<'_> {
         label
     }
 
-    pub(crate) fn emit_dyn_trait_type(&mut self, node: ast::DynTraitType) -> Label<generated::DynTraitType> {
+    pub(crate) fn emit_dyn_trait_type(&mut self, node: ast::DynTraitType) -> Label<generated::DynTraitTypeRepr> {
         let type_bound_list = node.type_bound_list().map(|x| self.emit_type_bound_list(x));
-        let label = self.trap.emit(generated::DynTraitType {
+        let label = self.trap.emit(generated::DynTraitTypeRepr {
             id: TrapId::Star,
             type_bound_list,
         });
         self.emit_location(label, &node);
-        emit_detached!(DynTraitType, self, node, label);
+        emit_detached!(DynTraitTypeRepr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -702,14 +704,14 @@ impl Translator<'_> {
         label
     }
 
-    pub(crate) fn emit_fn_ptr_type(&mut self, node: ast::FnPtrType) -> Label<generated::FnPtrType> {
+    pub(crate) fn emit_fn_ptr_type(&mut self, node: ast::FnPtrType) -> Label<generated::FnPtrTypeRepr> {
         let abi = node.abi().map(|x| self.emit_abi(x));
         let is_async = node.async_token().is_some();
         let is_const = node.const_token().is_some();
         let is_unsafe = node.unsafe_token().is_some();
         let param_list = node.param_list().map(|x| self.emit_param_list(x));
         let ret_type = node.ret_type().map(|x| self.emit_ret_type(x));
-        let label = self.trap.emit(generated::FnPtrType {
+        let label = self.trap.emit(generated::FnPtrTypeRepr {
             id: TrapId::Star,
             abi,
             is_async,
@@ -719,7 +721,7 @@ impl Translator<'_> {
             ret_type,
         });
         self.emit_location(label, &node);
-        emit_detached!(FnPtrType, self, node, label);
+        emit_detached!(FnPtrTypeRepr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -744,16 +746,16 @@ impl Translator<'_> {
         label
     }
 
-    pub(crate) fn emit_for_type(&mut self, node: ast::ForType) -> Label<generated::ForType> {
+    pub(crate) fn emit_for_type(&mut self, node: ast::ForType) -> Label<generated::ForTypeRepr> {
         let generic_param_list = node.generic_param_list().map(|x| self.emit_generic_param_list(x));
-        let ty = node.ty().map(|x| self.emit_type(x));
-        let label = self.trap.emit(generated::ForType {
+        let type_repr = node.ty().map(|x| self.emit_type(x));
+        let label = self.trap.emit(generated::ForTypeRepr {
             id: TrapId::Star,
             generic_param_list,
-            ty,
+            type_repr,
         });
         self.emit_location(label, &node);
-        emit_detached!(ForType, self, node, label);
+        emit_detached!(ForTypeRepr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -880,14 +882,14 @@ impl Translator<'_> {
         label
     }
 
-    pub(crate) fn emit_impl_trait_type(&mut self, node: ast::ImplTraitType) -> Label<generated::ImplTraitType> {
+    pub(crate) fn emit_impl_trait_type(&mut self, node: ast::ImplTraitType) -> Label<generated::ImplTraitTypeRepr> {
         let type_bound_list = node.type_bound_list().map(|x| self.emit_type_bound_list(x));
-        let label = self.trap.emit(generated::ImplTraitType {
+        let label = self.trap.emit(generated::ImplTraitTypeRepr {
             id: TrapId::Star,
             type_bound_list,
         });
         self.emit_location(label, &node);
-        emit_detached!(ImplTraitType, self, node, label);
+        emit_detached!(ImplTraitTypeRepr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -908,12 +910,12 @@ impl Translator<'_> {
         label
     }
 
-    pub(crate) fn emit_infer_type(&mut self, node: ast::InferType) -> Label<generated::InferType> {
-        let label = self.trap.emit(generated::InferType {
+    pub(crate) fn emit_infer_type(&mut self, node: ast::InferType) -> Label<generated::InferTypeRepr> {
+        let label = self.trap.emit(generated::InferTypeRepr {
             id: TrapId::Star,
         });
         self.emit_location(label, &node);
-        emit_detached!(InferType, self, node, label);
+        emit_detached!(InferTypeRepr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -958,12 +960,12 @@ impl Translator<'_> {
 
     pub(crate) fn emit_let_expr(&mut self, node: ast::LetExpr) -> Label<generated::LetExpr> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
-        let expr = node.expr().map(|x| self.emit_expr(x));
+        let scrutinee = node.expr().map(|x| self.emit_expr(x));
         let pat = node.pat().map(|x| self.emit_pat(x));
         let label = self.trap.emit(generated::LetExpr {
             id: TrapId::Star,
             attrs,
-            expr,
+            scrutinee,
             pat,
         });
         self.emit_location(label, &node);
@@ -977,14 +979,14 @@ impl Translator<'_> {
         let initializer = node.initializer().map(|x| self.emit_expr(x));
         let let_else = node.let_else().map(|x| self.emit_let_else(x));
         let pat = node.pat().map(|x| self.emit_pat(x));
-        let ty = node.ty().map(|x| self.emit_type(x));
+        let type_repr = node.ty().map(|x| self.emit_type(x));
         let label = self.trap.emit(generated::LetStmt {
             id: TrapId::Star,
             attrs,
             initializer,
             let_else,
             pat,
-            ty,
+            type_repr,
         });
         self.emit_location(label, &node);
         emit_detached!(LetStmt, self, node, label);
@@ -1178,14 +1180,14 @@ impl Translator<'_> {
         label
     }
 
-    pub(crate) fn emit_macro_type(&mut self, node: ast::MacroType) -> Label<generated::MacroType> {
+    pub(crate) fn emit_macro_type(&mut self, node: ast::MacroType) -> Label<generated::MacroTypeRepr> {
         let macro_call = node.macro_call().map(|x| self.emit_macro_call(x));
-        let label = self.trap.emit(generated::MacroType {
+        let label = self.trap.emit(generated::MacroTypeRepr {
             id: TrapId::Star,
             macro_call,
         });
         self.emit_location(label, &node);
-        emit_detached!(MacroType, self, node, label);
+        emit_detached!(MacroTypeRepr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1224,12 +1226,12 @@ impl Translator<'_> {
 
     pub(crate) fn emit_match_expr(&mut self, node: ast::MatchExpr) -> Label<generated::MatchExpr> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
-        let expr = node.expr().map(|x| self.emit_expr(x));
+        let scrutinee = node.expr().map(|x| self.emit_expr(x));
         let match_arm_list = node.match_arm_list().map(|x| self.emit_match_arm_list(x));
         let label = self.trap.emit(generated::MatchExpr {
             id: TrapId::Star,
             attrs,
-            expr,
+            scrutinee,
             match_arm_list,
         });
         self.emit_location(label, &node);
@@ -1330,12 +1332,12 @@ impl Translator<'_> {
         label
     }
 
-    pub(crate) fn emit_never_type(&mut self, node: ast::NeverType) -> Label<generated::NeverType> {
-        let label = self.trap.emit(generated::NeverType {
+    pub(crate) fn emit_never_type(&mut self, node: ast::NeverType) -> Label<generated::NeverTypeRepr> {
+        let label = self.trap.emit(generated::NeverTypeRepr {
             id: TrapId::Star,
         });
         self.emit_location(label, &node);
-        emit_detached!(NeverType, self, node, label);
+        emit_detached!(NeverTypeRepr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1343,12 +1345,12 @@ impl Translator<'_> {
     pub(crate) fn emit_offset_of_expr(&mut self, node: ast::OffsetOfExpr) -> Label<generated::OffsetOfExpr> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let fields = node.fields().map(|x| self.emit_name_ref(x)).collect();
-        let ty = node.ty().map(|x| self.emit_type(x));
+        let type_repr = node.ty().map(|x| self.emit_type(x));
         let label = self.trap.emit(generated::OffsetOfExpr {
             id: TrapId::Star,
             attrs,
             fields,
-            ty,
+            type_repr,
         });
         self.emit_location(label, &node);
         emit_detached!(OffsetOfExpr, self, node, label);
@@ -1371,12 +1373,12 @@ impl Translator<'_> {
     pub(crate) fn emit_param(&mut self, node: ast::Param) -> Label<generated::Param> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let pat = node.pat().map(|x| self.emit_pat(x));
-        let ty = node.ty().map(|x| self.emit_type(x));
+        let type_repr = node.ty().map(|x| self.emit_type(x));
         let label = self.trap.emit(generated::Param {
             id: TrapId::Star,
             attrs,
             pat,
-            ty,
+            type_repr,
         });
         self.emit_location(label, &node);
         emit_detached!(Param, self, node, label);
@@ -1424,14 +1426,14 @@ impl Translator<'_> {
         label
     }
 
-    pub(crate) fn emit_paren_type(&mut self, node: ast::ParenType) -> Label<generated::ParenType> {
-        let ty = node.ty().map(|x| self.emit_type(x));
-        let label = self.trap.emit(generated::ParenType {
+    pub(crate) fn emit_paren_type(&mut self, node: ast::ParenType) -> Label<generated::ParenTypeRepr> {
+        let type_repr = node.ty().map(|x| self.emit_type(x));
+        let label = self.trap.emit(generated::ParenTypeRepr {
             id: TrapId::Star,
-            ty,
+            type_repr,
         });
         self.emit_location(label, &node);
-        emit_detached!(ParenType, self, node, label);
+        emit_detached!(ParenTypeRepr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1483,7 +1485,7 @@ impl Translator<'_> {
         let path_type = node.path_type().map(|x| self.emit_path_type(x));
         let ret_type = node.ret_type().map(|x| self.emit_ret_type(x));
         let return_type_syntax = node.return_type_syntax().map(|x| self.emit_return_type_syntax(x));
-        let ty = node.ty().map(|x| self.emit_type(x));
+        let type_repr = node.ty().map(|x| self.emit_type(x));
         let label = self.trap.emit(generated::PathSegment {
             id: TrapId::Star,
             generic_arg_list,
@@ -1492,7 +1494,7 @@ impl Translator<'_> {
             path_type,
             ret_type,
             return_type_syntax,
-            ty,
+            type_repr,
         });
         self.emit_location(label, &node);
         emit_detached!(PathSegment, self, node, label);
@@ -1500,14 +1502,14 @@ impl Translator<'_> {
         label
     }
 
-    pub(crate) fn emit_path_type(&mut self, node: ast::PathType) -> Label<generated::PathType> {
+    pub(crate) fn emit_path_type(&mut self, node: ast::PathType) -> Label<generated::PathTypeRepr> {
         let path = node.path().map(|x| self.emit_path(x));
-        let label = self.trap.emit(generated::PathType {
+        let label = self.trap.emit(generated::PathTypeRepr {
             id: TrapId::Star,
             path,
         });
         self.emit_location(label, &node);
-        emit_detached!(PathType, self, node, label);
+        emit_detached!(PathTypeRepr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1528,18 +1530,18 @@ impl Translator<'_> {
         label
     }
 
-    pub(crate) fn emit_ptr_type(&mut self, node: ast::PtrType) -> Label<generated::PtrType> {
+    pub(crate) fn emit_ptr_type(&mut self, node: ast::PtrType) -> Label<generated::PtrTypeRepr> {
         let is_const = node.const_token().is_some();
         let is_mut = node.mut_token().is_some();
-        let ty = node.ty().map(|x| self.emit_type(x));
-        let label = self.trap.emit(generated::PtrType {
+        let type_repr = node.ty().map(|x| self.emit_type(x));
+        let label = self.trap.emit(generated::PtrTypeRepr {
             id: TrapId::Star,
             is_const,
             is_mut,
-            ty,
+            type_repr,
         });
         self.emit_location(label, &node);
-        emit_detached!(PtrType, self, node, label);
+        emit_detached!(PtrTypeRepr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1627,13 +1629,13 @@ impl Translator<'_> {
     pub(crate) fn emit_record_field(&mut self, node: ast::RecordField) -> Label<generated::RecordField> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
         let name = node.name().map(|x| self.emit_name(x));
-        let ty = node.ty().map(|x| self.emit_type(x));
+        let type_repr = node.ty().map(|x| self.emit_type(x));
         let visibility = node.visibility().map(|x| self.emit_visibility(x));
         let label = self.trap.emit(generated::RecordField {
             id: TrapId::Star,
             attrs,
             name,
-            ty,
+            type_repr,
             visibility,
         });
         self.emit_location(label, &node);
@@ -1732,18 +1734,18 @@ impl Translator<'_> {
         label
     }
 
-    pub(crate) fn emit_ref_type(&mut self, node: ast::RefType) -> Label<generated::RefType> {
+    pub(crate) fn emit_ref_type(&mut self, node: ast::RefType) -> Label<generated::RefTypeRepr> {
         let is_mut = node.mut_token().is_some();
         let lifetime = node.lifetime().map(|x| self.emit_lifetime(x));
-        let ty = node.ty().map(|x| self.emit_type(x));
-        let label = self.trap.emit(generated::RefType {
+        let type_repr = node.ty().map(|x| self.emit_type(x));
+        let label = self.trap.emit(generated::RefTypeRepr {
             id: TrapId::Star,
             is_mut,
             lifetime,
-            ty,
+            type_repr,
         });
         self.emit_location(label, &node);
-        emit_detached!(RefType, self, node, label);
+        emit_detached!(RefTypeRepr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1772,14 +1774,14 @@ impl Translator<'_> {
         label
     }
 
-    pub(crate) fn emit_ret_type(&mut self, node: ast::RetType) -> Label<generated::RetType> {
-        let ty = node.ty().map(|x| self.emit_type(x));
-        let label = self.trap.emit(generated::RetType {
+    pub(crate) fn emit_ret_type(&mut self, node: ast::RetType) -> Label<generated::RetTypeRepr> {
+        let type_repr = node.ty().map(|x| self.emit_type(x));
+        let label = self.trap.emit(generated::RetTypeRepr {
             id: TrapId::Star,
-            ty,
+            type_repr,
         });
         self.emit_location(label, &node);
-        emit_detached!(RetType, self, node, label);
+        emit_detached!(RetTypeRepr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1813,14 +1815,14 @@ impl Translator<'_> {
         let is_mut = node.mut_token().is_some();
         let lifetime = node.lifetime().map(|x| self.emit_lifetime(x));
         let name = node.name().map(|x| self.emit_name(x));
-        let ty = node.ty().map(|x| self.emit_type(x));
+        let type_repr = node.ty().map(|x| self.emit_type(x));
         let label = self.trap.emit(generated::SelfParam {
             id: TrapId::Star,
             attrs,
             is_mut,
             lifetime,
             name,
-            ty,
+            type_repr,
         });
         self.emit_location(label, &node);
         emit_detached!(SelfParam, self, node, label);
@@ -1840,14 +1842,14 @@ impl Translator<'_> {
         label
     }
 
-    pub(crate) fn emit_slice_type(&mut self, node: ast::SliceType) -> Label<generated::SliceType> {
-        let ty = node.ty().map(|x| self.emit_type(x));
-        let label = self.trap.emit(generated::SliceType {
+    pub(crate) fn emit_slice_type(&mut self, node: ast::SliceType) -> Label<generated::SliceTypeRepr> {
+        let type_repr = node.ty().map(|x| self.emit_type(x));
+        let label = self.trap.emit(generated::SliceTypeRepr {
             id: TrapId::Star,
-            ty,
+            type_repr,
         });
         self.emit_location(label, &node);
-        emit_detached!(SliceType, self, node, label);
+        emit_detached!(SliceTypeRepr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -1872,7 +1874,7 @@ impl Translator<'_> {
         let is_mut = node.mut_token().is_some();
         let is_static = node.static_token().is_some();
         let name = node.name().map(|x| self.emit_name(x));
-        let ty = node.ty().map(|x| self.emit_type(x));
+        let type_repr = node.ty().map(|x| self.emit_type(x));
         let visibility = node.visibility().map(|x| self.emit_visibility(x));
         let label = self.trap.emit(generated::Static {
             id: TrapId::Star,
@@ -1881,7 +1883,7 @@ impl Translator<'_> {
             is_mut,
             is_static,
             name,
-            ty,
+            type_repr,
             visibility,
         });
         self.emit_location(label, &node);
@@ -2018,12 +2020,12 @@ impl Translator<'_> {
 
     pub(crate) fn emit_tuple_field(&mut self, node: ast::TupleField) -> Label<generated::TupleField> {
         let attrs = node.attrs().map(|x| self.emit_attr(x)).collect();
-        let ty = node.ty().map(|x| self.emit_type(x));
+        let type_repr = node.ty().map(|x| self.emit_type(x));
         let visibility = node.visibility().map(|x| self.emit_visibility(x));
         let label = self.trap.emit(generated::TupleField {
             id: TrapId::Star,
             attrs,
-            ty,
+            type_repr,
             visibility,
         });
         self.emit_location(label, &node);
@@ -2070,14 +2072,14 @@ impl Translator<'_> {
         label
     }
 
-    pub(crate) fn emit_tuple_type(&mut self, node: ast::TupleType) -> Label<generated::TupleType> {
+    pub(crate) fn emit_tuple_type(&mut self, node: ast::TupleType) -> Label<generated::TupleTypeRepr> {
         let fields = node.fields().map(|x| self.emit_type(x)).collect();
-        let label = self.trap.emit(generated::TupleType {
+        let label = self.trap.emit(generated::TupleTypeRepr {
             id: TrapId::Star,
             fields,
         });
         self.emit_location(label, &node);
-        emit_detached!(TupleType, self, node, label);
+        emit_detached!(TupleTypeRepr, self, node, label);
         self.emit_tokens(&node, label.into(), node.syntax().children_with_tokens());
         label
     }
@@ -2087,7 +2089,7 @@ impl Translator<'_> {
         let generic_param_list = node.generic_param_list().map(|x| self.emit_generic_param_list(x));
         let is_default = node.default_token().is_some();
         let name = node.name().map(|x| self.emit_name(x));
-        let ty = node.ty().map(|x| self.emit_type(x));
+        let type_repr = node.ty().map(|x| self.emit_type(x));
         let type_bound_list = node.type_bound_list().map(|x| self.emit_type_bound_list(x));
         let visibility = node.visibility().map(|x| self.emit_visibility(x));
         let where_clause = node.where_clause().map(|x| self.emit_where_clause(x));
@@ -2097,7 +2099,7 @@ impl Translator<'_> {
             generic_param_list,
             is_default,
             name,
-            ty,
+            type_repr,
             type_bound_list,
             visibility,
             where_clause,
@@ -2109,10 +2111,10 @@ impl Translator<'_> {
     }
 
     pub(crate) fn emit_type_arg(&mut self, node: ast::TypeArg) -> Label<generated::TypeArg> {
-        let ty = node.ty().map(|x| self.emit_type(x));
+        let type_repr = node.ty().map(|x| self.emit_type(x));
         let label = self.trap.emit(generated::TypeArg {
             id: TrapId::Star,
-            ty,
+            type_repr,
         });
         self.emit_location(label, &node);
         emit_detached!(TypeArg, self, node, label);
@@ -2125,14 +2127,14 @@ impl Translator<'_> {
         let is_async = node.async_token().is_some();
         let is_const = node.const_token().is_some();
         let lifetime = node.lifetime().map(|x| self.emit_lifetime(x));
-        let ty = node.ty().map(|x| self.emit_type(x));
+        let type_repr = node.ty().map(|x| self.emit_type(x));
         let label = self.trap.emit(generated::TypeBound {
             id: TrapId::Star,
             generic_param_list,
             is_async,
             is_const,
             lifetime,
-            ty,
+            type_repr,
         });
         self.emit_location(label, &node);
         emit_detached!(TypeBound, self, node, label);
@@ -2307,13 +2309,13 @@ impl Translator<'_> {
     pub(crate) fn emit_where_pred(&mut self, node: ast::WherePred) -> Label<generated::WherePred> {
         let generic_param_list = node.generic_param_list().map(|x| self.emit_generic_param_list(x));
         let lifetime = node.lifetime().map(|x| self.emit_lifetime(x));
-        let ty = node.ty().map(|x| self.emit_type(x));
+        let type_repr = node.ty().map(|x| self.emit_type(x));
         let type_bound_list = node.type_bound_list().map(|x| self.emit_type_bound_list(x));
         let label = self.trap.emit(generated::WherePred {
             id: TrapId::Star,
             generic_param_list,
             lifetime,
-            ty,
+            type_repr,
             type_bound_list,
         });
         self.emit_location(label, &node);
diff --git a/rust/extractor/src/trap.rs b/rust/extractor/src/trap.rs
index 58f56fb2b1e..6c8e9b2c3c8 100644
--- a/rust/extractor/src/trap.rs
+++ b/rust/extractor/src/trap.rs
@@ -1,5 +1,5 @@
-use crate::config;
 use crate::config::Compression;
+use crate::{config, generated};
 use codeql_extractor::{extractor, file_paths, trap};
 use log::debug;
 use ra_ap_ide_db::line_index::LineCol;
@@ -138,7 +138,7 @@ pub enum DiagnosticSeverity {
 impl TrapFile {
     pub fn emit_location_label(
         &mut self,
-        file_label: UntypedLabel,
+        file_label: Label<generated::File>,
         start: LineCol,
         end: LineCol,
     ) -> UntypedLabel {
@@ -149,7 +149,7 @@ impl TrapFile {
         extractor::location_label(
             &mut self.writer,
             trap::Location {
-                file_label,
+                file_label: file_label.as_untyped(),
                 start_line,
                 start_column,
                 end_line,
@@ -159,7 +159,7 @@ impl TrapFile {
     }
     pub fn emit_location<E: TrapClass>(
         &mut self,
-        file_label: UntypedLabel,
+        file_label: Label<generated::File>,
         entity_label: Label<E>,
         start: LineCol,
         end: LineCol,
@@ -192,8 +192,10 @@ impl TrapFile {
             ],
         );
     }
-    pub fn emit_file(&mut self, absolute_path: &Path) -> trap::Label {
-        extractor::populate_file(&mut self.writer, absolute_path)
+    pub fn emit_file(&mut self, absolute_path: &Path) -> Label<generated::File> {
+        let untyped = extractor::populate_file(&mut self.writer, absolute_path);
+        // SAFETY: populate_file emits `@file` typed labels
+        unsafe { Label::from_untyped(untyped) }
     }
 
     pub fn label<T: TrapEntry>(&mut self, id: TrapId<T>) -> Label<T> {
@@ -243,8 +245,8 @@ impl TrapFileProvider {
         })
     }
 
-    pub fn create(&self, category: &str, key: &Path) -> TrapFile {
-        let path = file_paths::path_for(&self.trap_dir.join(category), key, "trap");
+    pub fn create(&self, category: &str, key: impl AsRef<Path>) -> TrapFile {
+        let path = file_paths::path_for(&self.trap_dir.join(category), key.as_ref(), "trap");
         debug!("creating trap file {}", path.display());
         let mut writer = trap::Writer::new();
         extractor::populate_empty_location(&mut writer);
diff --git a/rust/ql/.generated.list b/rust/ql/.generated.list
index ca25e0533fc..99aab4bba8f 100644
--- a/rust/ql/.generated.list
+++ b/rust/ql/.generated.list
@@ -1,32 +1,36 @@
+lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll b0e9c10a3fdd62e355dcc74f9d5198e6f4d597cd957efd4dd7a3418115055c5c 14fc7e1beb4751897639c5c3a64d5eb234ff0dc753d2db0b8d4c1845a55959f0
 lib/codeql/rust/elements/Abi.qll 4c973d28b6d628f5959d1f1cc793704572fd0acaae9a97dfce82ff9d73f73476 250f68350180af080f904cd34cb2af481c5c688dc93edf7365fd0ae99855e893
+lib/codeql/rust/elements/Addressable.qll 13011bfd2e1556694c3d440cc34af8527da4df49ad92b62f2939d3699ff2cea5 ddb25935f7553a1a384b1abe2e4b4fa90ab50b952dadec32fd867afcb054f4be
 lib/codeql/rust/elements/ArgList.qll 661f5100f5d3ef8351452d9058b663a2a5c720eea8cf11bedd628969741486a2 28e424aac01a90fb58cd6f9f83c7e4cf379eea39e636bc0ba07efc818be71c71
-lib/codeql/rust/elements/ArrayExpr.qll a3e6e122632f4011644ec31b37f88b32fe3f2b7e388e7e878a6883309937049f 12ccb5873d95c433da5606fd371d182ef2f71b78d0c53c2d6dec10fa45852bdc
-lib/codeql/rust/elements/ArrayType.qll affd43d308200d60d08e8924cdbb2a17a827ebaa62a296e07bb9ce97451e3c4c 80589a7f79bf2ac293a027faf2589b3027a6c4a286533f2ffccad259a306a8cb
+lib/codeql/rust/elements/ArrayExpr.qll e4e7cff3518c50ec908271906dd46c1fbe9098faa1e8cd06a27f0a6e8d165ed1 fe02a4f4197f57ecd1e8e82d6c9384148ec29d8b106d7f696795b2f325e4a71b
+lib/codeql/rust/elements/ArrayListExpr.qll 451aedcecb479c385ff497588c7a07fda304fd5b873270223a4f2c804e96b245 a8cb008f6f732215623b5626c84b37b651ca01ccafb2cf4c835df35d5140c6ad
+lib/codeql/rust/elements/ArrayRepeatExpr.qll 4b7ed5be7d2caaf69f6fc0cd05b0e2416c52d547b1a73fb23d5a13007f75f4dd f6366f21cc48376b5fdf37e8c5c2b19415d4cbdeef09f33bb99cde5cb0f5b0e7
+lib/codeql/rust/elements/ArrayTypeRepr.qll 7d5148c9efaf13e6880b327ca426304f7574608a29e6b8a219ed291003cbe1ae 73a297b0307cd014d08ccb3c00fc57b6c115adadee72a0ebb4c01fcae9e47163
 lib/codeql/rust/elements/AsmExpr.qll 2f1c78e92b56d66a559543b2103d8f880dd4fa4c6907346f668b3714cf2355e9 12e174fc469c067c957f6c1a5969ab56a71a07c537ca930a564cce81c7ab4481
 lib/codeql/rust/elements/AssocItem.qll 5e514287bbe353d1d637991e7af836e5659ad66922df99af68ab61399e7f8f9a 3733af54938271161ee2720c32ac43228d519b5c46b7cea1e4bbe3dc634f8857
 lib/codeql/rust/elements/AssocItemList.qll ee719e7105a1936e2dd6cda0c55c73ff2704b6461861b2503ed86198484e4c06 de26c8127fd643b8b4567c0ce39511050f7ceefa0075a48a8ad03d50f56a1142
-lib/codeql/rust/elements/AssocTypeArg.qll 4740b296f596f58ed8d2788f55ffc1557ea22329b17b9374c885c4fd395d6eff 0191ca01b917d611ecd25f8171bbacd88335cf6a447f2f9da84dda816a170a65
+lib/codeql/rust/elements/AssocTypeArg.qll a01fb46212bed37224841e9aa3909290e720fdaffc7e443cf8a52f6bf7111ff4 9783f77b4983df46f054a18d339107fa17e5f392c360a772811ccf3bb9da32a1
 lib/codeql/rust/elements/AstNode.qll 5ee6355afb1cafd6dfe408b8c21836a1ba2aeb709fb618802aa09f9342646084 dee708f19c1b333cbd9609819db3dfdb48a0c90d26266c380f31357b1e2d6141
 lib/codeql/rust/elements/Attr.qll 53887a49513b95e38344b57d824a7474331467561f1edf38d5ca608d8cefa0cd 2e9eeb32ba6cc186691897979e30d32bc6eaff523e37064ee84cf09ded5afe17
 lib/codeql/rust/elements/AwaitExpr.qll d8b37c01f7d27f0ec40d92a533a8f09a06af7ece1ae832b4ea8f2450c1762511 92cdb7ff0efddf26bed2b7b2729fddd197e26c1a11c8fec0c747aab642710c21
 lib/codeql/rust/elements/BecomeExpr.qll 7a3cfc4894feb6be1cde664f675b18936434e68ccea52e55314c33d01491e34f 49666eca509b30d44bb02702bda67239c76bf8d9f231022c9cf6ecca123f8616
 lib/codeql/rust/elements/BinaryExpr.qll 394522da3bc3a716fc7bc40c3560143ca840f5d210cfcba2a752c3026dd0f725 fbbd6fb79bf16a7d9820613654c584cd7ff3e7a29988f3920b6cfbe746acfd8d
-lib/codeql/rust/elements/BlockExpr.qll b952fd44b89de248931d4089834d2c9406f6f2fc1a3f5c2365156be4e55157cf daccc07ab11ac696679b9fadc99f40b1bf579c90bf6c7cca6e82eaa313932ede
+lib/codeql/rust/elements/BlockExpr.qll b5cf57119b15f27d0bc258dfa375b0ef2730c157870ff543f0dc7a8cfe514182 f6a01999606b010c81ef9c6ff1385e6640632b6f5ce067ffeb0ef0af0a0aeb92
 lib/codeql/rust/elements/BoxPat.qll 1b2c3fff171aa6aa238c9460b122f26c79e04577cea67fa856de99842ba873d4 0caf8d23ed6e0997a6b8751def27641582151fba6e24fccf798712a4690b42f1
 lib/codeql/rust/elements/BreakExpr.qll 7ca3807a20e9a9a988d1fd7abebf240325ed422fcb45c719ba46272f031f94db dffb7379d3f3ba220acfbd05eb7bb6cfd9cfda211e9c8b1f5240ca5fa61be3fc
 lib/codeql/rust/elements/CallExpr.qll f336500ca7a611b164d48b90e80edb0c0d3816792b0ececce659ac1ff1ffeb3e f99a9c55466418ef53860c44d9f2d6161af4b492178ddd9e5870dff742b70ae5
 lib/codeql/rust/elements/CallExprBase.qll 2846202b5208b541977500286951d96487bf555838c6c16cdd006a71e383745a c789d412bf099c624329379e0c7d94fa0d23ae2edea7a25a2ea0f3c0042ccf62
 lib/codeql/rust/elements/Callable.qll e1ed21a7e6bd2426f6ccd0e46cee506d8ebf90a6fdc4dca0979157da439853aa 02f6c09710116ce82157aec9a5ec706983c38e4d85cc631327baf8d409b018c6
-lib/codeql/rust/elements/CastExpr.qll ba281bde130f43c486c4ad889539b77fba9e41afdf7980e50b6a8696a1ec7527 61257003d395896ec60729d0bc01da36697615bb725d07141255fbb5c44e50a0
+lib/codeql/rust/elements/CastExpr.qll cd8333612f94b47b19ea45cd0f78d62855b30e1a86d7f3052a7bec503bc8f575 198089248d838155081586f81403320ca88375bf178f8d831b0860693bb85386
 lib/codeql/rust/elements/ClosureBinder.qll 977df800f97cc9b03fffb5e5e1fc6acd08a2938e04cb6ad91108784a15b0d510 f6fad4127226fe1dff2f16416d8a7fde5d8ab4a88f30e443ac5e5ff618de3e05
-lib/codeql/rust/elements/ClosureExpr.qll 192f67bb98d455f7de9eb871fc8f7353dfd991b857ed9fe65d01ef8610ece852 af99426b33dcf19ca4b97817dd94dd102cb0884c30bf7d947e9e6762e1c152ee
+lib/codeql/rust/elements/ClosureExpr.qll 67e2a106e9154c90367b129987e574d2a9ecf5b297536627e43706675d35eaed d6a381132ddd589c5a7ce174f50f9620041ddf690e15a65ebfb05ff7e7c02de7
 lib/codeql/rust/elements/Comment.qll fedad50575125e9a64a8a8776a8c1dbf1e76df990f01849d9f0955f9d74cb2a6 8eb1afad1e1007a4f0090fdac65d81726b23eda6517d067fd0185f70f17635ab
-lib/codeql/rust/elements/Const.qll 2843a870e2abdf5b63fbea13f8a9ec4981b74369adec2ed3ce00a7d6f5a6fee3 c0bdb467cce63dcd3c65b21ef0836d8bf4e6c8d7d70049df8581fd35fdd03083
+lib/codeql/rust/elements/Const.qll bf6c62e79da145aa50ee9d24278510c3762cad921bfe76684b20fac4895653ef 31df5752216725a88d53cfc4a1432fa6cdc39251a8560d695135c55185ab22dd
 lib/codeql/rust/elements/ConstArg.qll f37b34417503bbd2f3ce09b3211d8fa71f6a954970c2738c73be6c55f204e58e 15ef5e189b67cfdfe4d16909e0b411ac8fdd4ef187c328bdede03a1a5e416b54
 lib/codeql/rust/elements/ConstBlockPat.qll a25f42b84dbeb33e10955735ef53b8bb7e3258522d6d1a9068f19adaf1af89d9 eeb816d2b54db77a1e7bb70e90b68d040a0cd44e9d44455a223311c3615c5e6e
-lib/codeql/rust/elements/ConstParam.qll bda26c61f531b4a6bbe8c95c414f5431b75bbc3d9b559fc6dc21d60b32f993f9 dc82bcba1a513d1d9e0072ec252b78a17ff7217b2064290b1791b24f72a99221
+lib/codeql/rust/elements/ConstParam.qll 248db1e3abef6943326c42478a15f148f8cdaa25649ef5578064b15924c53351 28babba3aea28a65c3fe3b3db6cb9c86f70d7391e9d6ef9188eb2e4513072f9f
 lib/codeql/rust/elements/ContinueExpr.qll 9f27c5d5c819ad0ebc5bd10967ba8d33a9dc95b9aae278fcfb1fcf9216bda79c 0dc061445a6b89854fdce92aaf022fdc76b724511a50bb777496ce75c9ecb262
-lib/codeql/rust/elements/DynTraitType.qll 5d249ac6b61916dad08be29631de77405928f0f38da499c66c1c412347945860 2adc38d1afd039b48c56d934e521e4a41589f761b988587bc55781104d6bd996
+lib/codeql/rust/elements/DynTraitTypeRepr.qll 5953263ec1e77613170c13b5259b22a71c206a7e08841d2fa1a0b373b4014483 d4380c6cc460687dcd8598df27cad954ef4f508f1117a82460d15d295a7b64ab
 lib/codeql/rust/elements/Element.qll 0b62d139fef54ed2cf2e2334806aa9bfbc036c9c2085d558f15a42cc3fa84c48 24b999b93df79383ef27ede46e38da752868c88a07fe35fcff5d526684ba7294
 lib/codeql/rust/elements/Enum.qll 2f122b042519d55e221fceac72fce24b30d4caf1947b25e9b68ee4a2095deb11 83a47445145e4fda8c3631db602a42dbb7a431f259eddf5c09dccd86f6abdd0e
 lib/codeql/rust/elements/Expr.qll e5d65e805ccf440d64d331e55df4c4144ab8c8f63f367382494714087659ffe8 2bbc1e5d3a65f413ec33d9822fa451fbdbe32349158db58cc0bfcfafb0e21bda
@@ -37,38 +41,40 @@ lib/codeql/rust/elements/ExternItem.qll c39bbae40fa569d3d84a10045d7eeced3db85e6c
 lib/codeql/rust/elements/ExternItemList.qll bc96f188970e8dc0cd1e77dea3e49b715edf6392539add5744cb1b396064a3b0 d1270d50448b36947372e86337a3efb5ed416c77aac709f6421d4d2f06999a7a
 lib/codeql/rust/elements/FieldExpr.qll 8102cd659f9059cf6af2a22033cfcd2aae9c35204b86f7d219a05f1f8de54b3b f818169dddf5102095ae1410583615f80031376a08b5307d0c464e79953c3975
 lib/codeql/rust/elements/FieldList.qll bd243adc4696c60f636055a1c2da28039fe2028476c9247eb6a68003b849b757 ab63cdf410afd1e515f873b49f46bb5c2bf27e6c78fd206ccbdba064c4c0a4b2
-lib/codeql/rust/elements/FnPtrType.qll c4a90dc660cf620972dc23b95494f5caf9f050eabd4bdb52fdc061f8797ba9a1 f8defc91582fa503607664668f9e2e6c2cd8b320c7c449610f21e52e332a129f
-lib/codeql/rust/elements/ForExpr.qll 312804d53dd9236a2f2a15c9d6ec348b46e139a54eb5893e7e12487725df7444 fa5e20099b1179033bc209bad3548e3d1d4019c7fe0e455cec8ca1a9d48692ab
-lib/codeql/rust/elements/ForType.qll 0036bed8749358c356d78c4a0eef40d73e2796284293cde5604ae70ddd6d0470 4edcaf8f7c67d42ebe3ebb1be6a7643758717d4fe88f5f648b6a1c5ff4ee4de7
-lib/codeql/rust/elements/Format.qll 506172d176f4b965f428585c032464f4abe07a0e47c574f8e011d8641ec45370 653e81bf233b8729649064de64f4a7a8533f8864ac6d2ea913f347088c924c60
+lib/codeql/rust/elements/FnPtrTypeRepr.qll 25a88a8445b4abfaf7c95fcef03db5328aa81e35cebe56516bdda01380f0a69e 0a77d08b6b2d63e7a037f366b6dffd5006e975a8af2424af60a4f9ad74d441ba
+lib/codeql/rust/elements/ForExpr.qll 0cc8bfe10b8baf62a1ff65c8463cfb17ab64b41c30c9e1edb962a227df2036d9 b1be73294e6da0f49fd32177ad0b05fecf26081d5ce424f288be99a4bd59cc84
+lib/codeql/rust/elements/ForTypeRepr.qll dc4e00cd23606df93d753f2ca6862b55a10c722a7e952bb2e11b494738d2a3d2 ca169d2faca3baab3720086f7b2de5c26f55faf2dbab958298377ad65f73949b
+lib/codeql/rust/elements/Format.qll 51222fa2d2e85d496ab093d74d3bc606ede3ce48f926106e059dc8478e657203 b4da6be38413c86f2e9d82004624abab16e23ef238197a5c85246009cce276d5
 lib/codeql/rust/elements/FormatArgsArg.qll 5bc9b4cd1bac7131165836e93838c45452a08ea6011741cbddace3cbf9c69440 f825140e98dc9800d5c045402186793c7b21511448e2f6bf6402d1e06305219c
-lib/codeql/rust/elements/FormatArgsExpr.qll f2ffad5a1105b29a8437c8ed6cf918cfcf4d65ac164bbf1be0585c3b673ca749 3ba20dc312a0a994bb43b37b2db72cbd4e06061b97918fa0e84ce355070ffbeb
-lib/codeql/rust/elements/FormatArgument.qll bdd93e1da78637f19beee6f953d3a45512100e925d90cb5ad08a097f412009b8 2a0ae7eb885615e380f925c0d130a1b795bf3c395486550a1f1c9c82848f8d77
+lib/codeql/rust/elements/FormatArgsExpr.qll 8127cbe4082f7acc3d8a05298c2c9bea302519b8a6cd2d158a83c516d18fc487 88cf9b3bedd69a1150968f9a465c904bbb6805da0e0b90cfd1fc0dab1f6d9319
+lib/codeql/rust/elements/FormatArgument.qll f6fe17ee1481c353dd42edae8b5fa79aeb99dff25b4842ec9a6f267b1837d1e3 5aed19c2daf2383b89ad7fd527375641cff26ddee7afddb89bc0d18d520f4034
 lib/codeql/rust/elements/FormatTemplateVariableAccess.qll ff3218a1dda30c232d0ecd9d1c60bbb9f3973456ef0bee1d1a12ad14b1e082b5 e4316291c939800d8b34d477d92be9404a30d52b7eee37302aef3d3205cf4ae0
-lib/codeql/rust/elements/Function.qll 2c76c2c7036891996b1f0ebde16c414edf37ebb44ff9c3483088dc6218733e07 d84d017d98aa240bf3bee6502a030aa8cfb7ed95425ffa9853e73b41485e1f4a
+lib/codeql/rust/elements/Function.qll 61fafe4bc91c997e9fb64f2770fc6682d333c61df3283fac58163df14a500430 ca7cb756942ccd01f961f3e959c7fddabeaabb72c4226ca756a6a30a4b1a4c48
 lib/codeql/rust/elements/GenericArg.qll 5f11ce0e3c5f08de84db61f56ba1b984652455ba6b95a8b8a5b5a235913d4072 756b6a73d66fde45bdcc65ce2362a5b1391af2927e6d54b6550b3ecd5fd11e75
 lib/codeql/rust/elements/GenericArgList.qll dcf274db517b0e8f19e4545d77f86cdd4066ff2805e68c808d0bb5750b49f569 1055a82929e850264e501b367ef4d314a3e6bb8943ec95f4284d157fb4d0092f
 lib/codeql/rust/elements/GenericParam.qll b58448b808d6dfa05db9574f54c22ce51f0b1d78784263c75a95d6bfc787067d 4afbab71fe717d7d7d3e2f60ea8c3d97bcb29b17b4efb79eabfe8f070edcb9bb
 lib/codeql/rust/elements/GenericParamList.qll 91d6f8cab06d7a3c53cfc714698a04c867867536705f03ed37b135e9e87f78c8 d1d88c31f712ca7ea83b6bf61466710069f2fbdfa40499321686e2867b99b35f
 lib/codeql/rust/elements/IdentPat.qll ad5f202316d4eeee3ca81ea445728f4ad7eb6bb7d81232bc958c22a93d064bf2 7ce2772e391e593d8fd23b2b44e26d0d7e780327ec973fcc9dce52a75fda0e36
 lib/codeql/rust/elements/IfExpr.qll f62153e8098b3eb08b569d4e25c750bc686665651579db4bc9e11dcef8e75d63 55006a55d612f189e73caa02f7b4deda388c692f0a801cdda9f833f2afdca778
-lib/codeql/rust/elements/Impl.qll 9593c47af4fa08afb19c52aab7d0bac6740fed7ec60201f47e7bc46f13bfb329 4ec840401563ab6136b99491b881c9a10108240de972b19ec64227e1e7d73e65
-lib/codeql/rust/elements/ImplTraitType.qll f7241044f6666a509cfbc01bf6df3db5360e67dd0f9baba4a323566701359203 350636d0b1c7a77e006170cbfa9108c259dd5831b0f242da76c10be3ecc32870
+lib/codeql/rust/elements/Impl.qll 6407348d86e73cdb68e414f647260cb82cb90bd40860ba9c40248d82dcba686c f60e07c8731185f7aa9c792a40c120669920d95f5400658de102b4a3ce30dd10
+lib/codeql/rust/elements/ImplTraitTypeRepr.qll e2d5a3ade0a9eb7dcb7eec229a235581fe6f293d1cb66b1036f6917c01dff981 49367cada57d1873c9c9d2b752ee6191943a23724059b2674c2d7f85497cff97
 lib/codeql/rust/elements/IndexExpr.qll 0e2e9f018d06ae72be0fc4ddbc019a9aacd8a06f42b4c4431760bd149e7f2290 2bcfd557abd53a48e48de7915c4f2089107c62dfb3e732a904848248dfd3727b
-lib/codeql/rust/elements/InferType.qll c71184ae6aa181be94e299882503350e057493e17f1133a1e96162a0e5cbd1ef f0f19b611708df45a6ff811f8066c8042a8e1ac9b7bd94910514547ea430d3d5
-lib/codeql/rust/elements/Item.qll 5c9148ff0eaeb4404c2d8156e7df0ef5753fd44ead972da05a49659ddaa25480 78446f788617e40525d4d4b489848e75f2143a90e18d40974c3bff7b1e7c825c
+lib/codeql/rust/elements/InferTypeRepr.qll 0a7b3e92512b2b167a8e04d650e12700dbbb8b646b10694056d622ba2501d299 e5e67b7c1124f430750f186da4642e646badcdcf66490dd328af3e64ac8da9e9
+lib/codeql/rust/elements/Item.qll 59353bf99dea5b464f45ed0dc5cef2db8208e92985d81dcd0b5ea09b638d10e4 2b0b87a4b1a1d9b512a67279d1dec2089d22d1df121585f7a9ca9661d689f74f
 lib/codeql/rust/elements/ItemList.qll c33e46a9ee45ccb194a0fe5b30a6ad3bcecb0f51486c94e0191a943710a17a7d 5a69c4e7712b4529681c4406d23dc1b6b9e5b3c03552688c55addab271912ed5
 lib/codeql/rust/elements/Label.qll a31d41db351af7f99a55b26cdbbc7f13b4e96b660a74e2f1cc90c17ee8df8d73 689f87cb056c8a2aefe1a0bfc2486a32feb44eb3175803c61961a6aeee53d66e
+lib/codeql/rust/elements/LabelableExpr.qll 598be487cd051b004ab95cbbc3029100069dc9955851c492029d80f230e56f0d 92c49b3cfdaba07982f950e18a8d62dae4e96f5d9ae0d7d2f4292628361f0ddc
 lib/codeql/rust/elements/LetElse.qll 85d16cb9cb2162493a9bacfe4b9e6a3b325d9466175b6d1a8e649bdf2191b864 c268d0878e9f82e8ede930b3825745c39ab8cd4db818eb9be6dc5ca49bee7579
 lib/codeql/rust/elements/LetExpr.qll 435f233890799a9f52972a023e381bc6fe2e0b3df1e696dc98b21682a3c1d88e b34da72dd222a381e098f160551ec614ebb98eb46af35c6e1d337e173d8ec4b9
-lib/codeql/rust/elements/LetStmt.qll e589d750ff87c25e28e15dab61e1a3555a45ced42158b05c991c6f5873abd86a 383484181b825cd7bc20e014fc4d5888f66e1f257502e1893f3d55aed2cdef3d
+lib/codeql/rust/elements/LetStmt.qll b89881b3e57317941f74adb39f16eb665380128a6bdfaacf4dce2499cdaea2e2 2890d12a475f045a8a1213e5c7751a05e63a72978a20fd3f4862e281048b2f0e
 lib/codeql/rust/elements/Lifetime.qll 048b81704723fab0ad9011f2c26a61e4a37b901c9f8372a6a74a04bdd85e273d 1d1e47c37c74ed092aa89ed4d38f49de3ee8bd9677669a33488fadda9ff733d1
 lib/codeql/rust/elements/LifetimeArg.qll 58a3c02b5ae720a48533332fb1808fbcc993cd1dfdb717894ba95a4c1ce3de4d 07da9323f89b92da86efa3f44a0f96c4c9738b3a28a136c4523243be79365396
 lib/codeql/rust/elements/LifetimeParam.qll db9f2c7bb32d49808993b400875e79560ac546736f106983398e32c9fdac51ca 0cb2ceaac7b0459f149fcce5ed708c9445fae7e340ec0e63744987a4fc852ef4
 lib/codeql/rust/elements/LiteralExpr.qll 40b67404b7c2b81e5afabc53a2a93e0a503f687bb31a2b4bfa4e07b2d764eb8d 67ab1be2286e769fba7a50ca16748e3c141760ccaefaebae99faa71f523a43d5
 lib/codeql/rust/elements/LiteralPat.qll daffb5f380a47543669c8cc92628b0e0de478c3ac82685802c63e8d75a206bed adfe9796598cf6ca4a9170c89ffd871e117f1cea6dd7dd80ecbbb947327a1a5d
 lib/codeql/rust/elements/Locatable.qll 2855efa4a469b54e0ca85daa89309a8b991cded6f3f10db361010831ba1e11d3 00c3406d14603f90abea11bf074eaf2c0b623a30e29cf6afc3a247cb58b92f0f
-lib/codeql/rust/elements/LoopExpr.qll 58ade0bc4a01a1cc361363682fde3ea56f4c5fbb4b28f5723ceff52ebaf897d7 fa299162c742bcf3b2211dc20821b312e3c133350c288a050eb26e6f8b5a5c78
+lib/codeql/rust/elements/LoopExpr.qll ee171177650fa23eef102a9580765f4b6073a1cc41bab1ec31ad4f84ffe6c2c9 bfcf0cca4dc944270d9748a202829a38c64dfae167c0d3a4202788ceb9daf5f6
+lib/codeql/rust/elements/LoopingExpr.qll 7ad7d4bbfd05adc0bb9b4ca90ff3377b8298121ca5360ffb45d5a7a1e20fe37a 964168b2045ee9bad827bba53f10a64d649b3513f2d1e3c17a1b1f11d0fc7f3a
 lib/codeql/rust/elements/MacroCall.qll a39a11d387355f59af3007dcbab3282e2b9e3289c1f8f4c6b96154ddb802f8c3 88d4575e462af2aa780219ba1338a790547fdfc1d267c4b84f1b929f4bc08d05
 lib/codeql/rust/elements/MacroDef.qll acb39275a1a3257084314a46ad4d8477946130f57e401c70c5949ad6aafc5c5f 6a8a8db12a3ec345fede51ca36e8c6acbdce58c5144388bb94f0706416fa152a
 lib/codeql/rust/elements/MacroExpr.qll ea9fed13f610bab1a2c4541c994510e0cb806530b60beef0d0c36b23e3b620f0 ad11a6bbd3a229ad97a16049cc6b0f3c8740f9f75ea61bbf4eebb072db9b12d2
@@ -76,7 +82,7 @@ lib/codeql/rust/elements/MacroItems.qll 00a5d41f7bb836d952abbd9382e42f72a9d81e65
 lib/codeql/rust/elements/MacroPat.qll dbf193b4fb544ac0b5a7dcfc31a6652de7239b6e643ff15b05868b2c142e940c 19b45c0a1eb1198e450c05d564b5d4aa0d6da29e7db84b9521eadf901e20a932
 lib/codeql/rust/elements/MacroRules.qll a94535506798077043b9c1470992ac4310bf67bcce5f722080886d1b3e6d90d1 bd8e08a7171991abc85100b45267631e66d1b332caf1e5882cd17caee5cf18a3
 lib/codeql/rust/elements/MacroStmts.qll 6e9a1f90231cb72b27d3ff9479e399a9fba4abd0872a5005ab2fac45d5ca9be0 d6ca3a8254fc45794a93c451a3305c9b4be033a467ad72158d40d6f675a377a0
-lib/codeql/rust/elements/MacroType.qll e5a153643e49a6be41483ad944550a030e0500764947b4e328cef6fa08c4fbd4 a42332c0a9c5cf7317fc49f3e1049e7751004fcc3efa056bbe058a8bfa2ef0cb
+lib/codeql/rust/elements/MacroTypeRepr.qll 92fa5f6d20cce8fa3f2b4b823a8a77fdb7c11f2c2b12b8f900828c3a54eca334 51289f2622d1bb58d9a093255da2c05084a0b184f02e69e2526ec7fefdfdfd75
 lib/codeql/rust/elements/MatchArm.qll c39fd6cc0da24b1ff8d1e42835bcfee7695ad13580e3c7c50acd7c881b1cd894 62a31d2bd125e6aaebefc406e541a641271d3c497a377959f94dd4735b2bfbf8
 lib/codeql/rust/elements/MatchArmList.qll e6c48fd7419d88e996b82eb45e4aa2686dfd079b283b02be7710192fb2cb93a0 0ec63a0ca56f5f7f80093fd3e77b198b74c6289e67be55dc6a4deb610753c7bd
 lib/codeql/rust/elements/MatchExpr.qll e9ef1664f020823b6f4bb72d906a9dc0c1ee6432d4a9a13f7dbdbab2b2b1ee4d 38d71e5c487abcb5682293c573343be66e499a6e131bb630604c120d34b7777b
@@ -87,47 +93,48 @@ lib/codeql/rust/elements/Missing.qll 70e6ac9790314752849c9888443c98223ccfc93a193
 lib/codeql/rust/elements/Module.qll 0bc85019177709256f8078d9de2a36f62f848d476225bff7bba1e35f249875c7 3fbb70e0c417a644dd0cada2c364c6e6876cfa16f37960e219c87e49c966c94e
 lib/codeql/rust/elements/Name.qll 3d7ed16c232912e30e5a075f5087ad344a8f76dcc27bc8f71a80c133802b89d7 036dc3ba0c20eb0907ef6dcc532214aa5de8e0de0fa819eca1fce0355b3741a3
 lib/codeql/rust/elements/NameRef.qll f11e33cdbefb3efdd8db6cd1eee593948a16ef5dd13e781c167ebd5e35b22e8c acda02258d55a6ecda0bd92eecf1778e0737a46e861a41c7dfd3203acc0eb4e9
-lib/codeql/rust/elements/NeverType.qll 669823dd60bba0cebac614f9dbad9dc9228405d76e62092e265df57fdd2e04e2 8fe32975ef80d86fb8b218f56962f0a89911008a8d6989e245c3e0362f2c747f
-lib/codeql/rust/elements/OffsetOfExpr.qll 8f6dd1fe0aad1642e58f5e97620306e4b36cdf01324fead1e2a92e8e60951c41 b192f7a5fae3049a6cac3b7a225a0e590f744e6c5ff6346ffdd1699f83bf718f
+lib/codeql/rust/elements/NeverTypeRepr.qll 538a8c2d4063dca2497a69b6b9e2fed418cbf32159e2bf9e044c59fff6a3b31a d6f827520c9dcfb97ac5619c420035305d4508017dc3517ba91e36d5d3298a72
+lib/codeql/rust/elements/OffsetOfExpr.qll 370734a01c72364c9d6a904597190dac99dc1262631229732c8687fd1b3e2aa0 e222d2688aa18ed6eec04f2f6ac1537f5c7467d2cef878122e8fc158d4f6f99e
 lib/codeql/rust/elements/OrPat.qll 408b71f51edbfc79bf93b86fb058d01fa79caf2ebfeef37b50ae1da886c71b68 4a3f2b00db33fe26ee0859e35261016312cb491e23c46746cdd6d8bb1f6c88ef
-lib/codeql/rust/elements/Param.qll 3108a710214977218421b220d1330793173d6b6b91708b641e3d1275f80faedb 4bb2b80d0a9a4d86f980440851d59ca6fffea681e5518f5d605c521191efd7b4
+lib/codeql/rust/elements/Param.qll d0c0a427c003bbbacaeb0c2f4566f35b997ad0bca4d49f97b50c3a4bd1ddbd71 e654a17dfcb7aaeb589e7944c38f591c4cf922ebceb834071bcb9f9165ee48be
+lib/codeql/rust/elements/ParamBase.qll 6fe595b1bebd4a760e17fb364e5aa77505cc57b9bda89c21abdad1ce9e496419 f03316c25d38ecc56c16d7d36358144072159f6ab176315293c7bf3b45b35fff
 lib/codeql/rust/elements/ParamList.qll 33a22ba7de565db4009d3f56eecd5ef809c28d9dce9bbac3fb71b528baae4f70 004375e227d87f76f930322ad3eac274f9b691bf58785ae69977fa319f3dba7e
 lib/codeql/rust/elements/ParenExpr.qll b635f0e5d300cd9cf3651cfcefd58316c21727295bbfd44b1f5672f9e3de67b6 d81c0034d4ea7ca5829f9b00e0a634ba5b557a6296d99f0b5344b11e1ba705a1
 lib/codeql/rust/elements/ParenPat.qll 40d033de6c85ad042223e0da80479adebab35494396ab652da85d3497e435c5a 8f2febe5d5cefcb076d201ae9607d403b9cfe8169d2f4b71d13868e0af43dc25
-lib/codeql/rust/elements/ParenType.qll e1f5695b143c97b98ccdb460a5cf872461cfc13b83a4f005f26c288dc0afae10 1164f8efae7f255925411bddb33939fab0bf1c07955a16fef173b3f4675d09ae
+lib/codeql/rust/elements/ParenTypeRepr.qll 8f35ca4ad9077ef1636f011df6875df8840a1937db5adee2ddf6ffff4bcb0766 c9b4bcd429026908a125cc1a772a1005da7754c5257b8c63685befb6dd4d7aa8
 lib/codeql/rust/elements/Pat.qll 56211c5cb4709e7c12a2bfd2da5e413a451672d99e23a8386c08ad0b999fd45c b1b1893a13a75c4f0390f7e2a14ee98a46f067cfdc991a8d43adc82497d20aff
-lib/codeql/rust/elements/Path.qll a0078e6d57dfd5a3b7fb2be4587f55f8e9c65ee042815a8a5b8dbd5273b4076a 0e2d4f8cbd54bd60aa4929b5fd50fe214346b6c0451f73e45143445d15420108
-lib/codeql/rust/elements/PathExpr.qll 906df1d80c662b79f1b0b0428c39754b7f8dbcb2234919dd45dd8206a099dd36 1d6015afab6378c926c5838c9a5772cfcfeedf474e2eeca3e46085300ff8d4e1
+lib/codeql/rust/elements/Path.qll 94869df09b929c4a60bae42b7e3a66c007f41078c08b7d9c6defb705b953ce8e eb317f75b89978d41fd3b166c7e3d871da4c04b3e17afbbcd0a5d73881e0d1d9
+lib/codeql/rust/elements/PathExpr.qll b52834ff2c725e7e0a224fec91864f0ac13bb7228e27d0e9f82a49c3fba6646f 8723cbbc9ad5b5ee34d80f68dea0cbb2be8e74df0234fc28e1bc7a72687cf25a
 lib/codeql/rust/elements/PathExprBase.qll bb41092ec690ae926e3233c215dcaf1fd8e161b8a6955151949f492e02dba13a b2257072f8062d31c29c63ee1311b07e0d2eb37075f582cfc76bb542ef773198
 lib/codeql/rust/elements/PathPat.qll 6897e69bcb24b56d39ede796cf5767988dcd5741e02333fa8495dd7c814f771a 2a011fb92f17e4b4ff713e6d29f591054dfede22a9aaa006e67fca2c23ab76bf
-lib/codeql/rust/elements/PathSegment.qll 536a8fe172db367e5f1dc678a014e2350eadfc379242d2b5451725e826ab1448 1a3a237f56c1d9ccdce6832ec6417fed25cd3e29ba836363cc6085e2125de4c5
-lib/codeql/rust/elements/PathType.qll a7bd3b05dc2c0e96c91c5485db508a1f5bb8fe3a01486be6815ae9dabb163add b11e996b6c0cc21a3d8d1ddc23c37e4d54a78e84a9278b3ceca1e94cb7321532
+lib/codeql/rust/elements/PathSegment.qll df95d0b621623f2383634031a49c76949f25550b82cca0f73fb89f39487a9a2b 37addce4537f7864e24f6da0d4c6545a105df598a3f1428c33404aa6dff445c4
+lib/codeql/rust/elements/PathTypeRepr.qll 29028e35e93e8d1a3ec2eac7d65347e60364c20f9f6474bc74808bfc0efdd2f8 99058b68f79b01e9889f10ddb2f6e1fb40ad85475e459c7e9629d30f7c014bca
 lib/codeql/rust/elements/PrefixExpr.qll 107e7bd111b637fd6d76026062d54c2780760b965f172ef119c50dd0714a377d 46954a9404e561c51682395729daac3bda5442113f29839d043e9605d63f7f6d
-lib/codeql/rust/elements/PtrType.qll b137f47a53e41b3b30c7d80dbdd6724bf15f99530ca40cc264a04af5f07aa878 b2ffdf739bfb7564d942fe54409834a59511c0b305b6d5b2219a8ee0ef594332
+lib/codeql/rust/elements/PtrTypeRepr.qll 2eb2b6f6e5858a10fa1b10d85400ed6db781339bf152162a2fd33213c1ce083b bb99c2da04c80d3c14f47cda1feb9719af801d209becb3d9b20746a2a3b8fc02
 lib/codeql/rust/elements/RangeExpr.qll 43785bea08a6a537010db1138e68ae92eed7e481744188dfb3bad119425ff740 5e81cfbdf4617372a73d662a248a0b380c1f40988a5daefb7f00057cae10d3d4
 lib/codeql/rust/elements/RangePat.qll b5c0cfc84b8a767d58593fa7102dcf4be3ff8b02ba2f5360c384fa8af4aac830 cc28399dd99630bfa50c54e641a3833abe6643137d010a0a25749d1d70e8c911
 lib/codeql/rust/elements/RecordExpr.qll eb402960c5c6a14d0a0ffebd61a352b59b5d1cc1c2531cacd54754310a812d77 415c93384e63cf38003dde987715554ebf45fc32ba03bc5fd78b8d2501812de1
 lib/codeql/rust/elements/RecordExprField.qll edac04146849e2aeca27e7bbb896c21aa2e2b15736b1e8a06ac51ab01433b3ac 7c062bd6d5dd5b1d972450fb0b3272cd9b45f94ccd668c3bd4347e2dce3279ed
 lib/codeql/rust/elements/RecordExprFieldList.qll 672c3854cb84090c8a2e9311c43448016dc2614ecbf86dbe404156304674e38f 01ae0ffca0bf640c61120e36fcf2c560555f4aabbd49ddce6f5c1a3561dbfc31
-lib/codeql/rust/elements/RecordField.qll 9c462033cc889756876cb3d2a07e4f0d9a67064cf188cdd68e08ab21e5edc459 437254bbf6537f1a575ae344c2e23ffad7138776db8f7ebf90026c13886a2638
+lib/codeql/rust/elements/RecordField.qll 87d68aa912574596ba09ecb3ab437472635cd76eff49cd5bef00eaabbd264f08 01871ee4dd9bd02acd981fbc109abfa4ee1b303deaa148484476317c4c41c924
 lib/codeql/rust/elements/RecordFieldList.qll cebab3fba41221e61cda801070a7f414b62b4fbcf2206e35462c0da35ad75c3f db092d47eea871d61541b9711d7139a99394e0ed83901a8ae60f03dfa8ed722f
 lib/codeql/rust/elements/RecordPat.qll a210d700e710107100fedad1098fb789056a0c0b8dbc11de2b242877e692ec20 3efa12d7bfa0da7c09a42b2b43c50ff3985c55676db7f3be2c771765d81f9a10
 lib/codeql/rust/elements/RecordPatField.qll 7487461887e82bcf224b02628dfc64457121ab17e731e2dc7aa7e731ab16c02f f2018e55722245eb4273fb067242aaa503c43f91671a55b3a4bb51fe7bc0a03c
 lib/codeql/rust/elements/RecordPatFieldList.qll c3198c997f389ce95db377ca40ac69a1448f120093f37ab1c92a5a3f1f6aa0d4 9db36d274f1ec77c442ae7e38f940a65c9a92f1541f66140188b226965851535
 lib/codeql/rust/elements/RefExpr.qll 91a0d3a86002289dc01ffbe8daca13e34e92e522fbb508241a9d51faf1d4a9d2 b6e63d8e6f8956d2501706d129a6f5f24b410ea6539839757c76ba950c410582
 lib/codeql/rust/elements/RefPat.qll fe076bdccb454111b38f360837d180274ba8a003b4cffe910b5197cd74188089 2604c8bb2b0b47091d5fc4aa276de46fe3561e346bd98f291c3783cef402ba06
-lib/codeql/rust/elements/RefType.qll 5dc6012188d5baf36cd7bf0ebc127e28e98862a3f91ea4df2f9b9c962f3a395d ddb06ebe7fb92ad7bbe86cf182270e8494b74edf91b8c841aaf7ba932e5092ac
+lib/codeql/rust/elements/RefTypeRepr.qll ac41d8b4132f273d65873ea3c59631bc1718b3266ae08075346e6cb1bfe2f17c b7e34851d37008806d4519105a5e3405dda07b999294c6656a0c447ac1635b2a
 lib/codeql/rust/elements/Rename.qll 55fa06145f2160304caac0a5ce4cf6a496e41adfd66f44b3c0a1d23229ed8ce0 80262f0abf61749cdf0d5701637db359960f5404ad1dbfdd90f5048d2e7c315d
 lib/codeql/rust/elements/Resolvable.qll 213c0c157541002ddd61cc76cdc11386819aa59dff0a81780474cccb6b7fb211 cdcf807587f887493888341a1b6f9bed202b80b37cacc77041a256b05ff4d3d1
 lib/codeql/rust/elements/RestPat.qll a898a2c396f974a52424efbc8168174416ac6ed30f90d57c81646d2c08455794 db635ead3fa236e45bbd9955c714ff0abb1e57e1ce80d99dc5bb13438475adbf
-lib/codeql/rust/elements/RetType.qll 36ea39240a56c504d94d5487ea9679563eef3dfe0e23bf42d992d1ab2b883518 2fe5b6f62a634c6aa30a1ecd620f3446c167669cf1285c8ef8dd5e5a6ef5fc71
+lib/codeql/rust/elements/RetTypeRepr.qll a95a053e861a8d6e5e8eda531f29c611b00904d48ea2bb493138d94d39096ace ebde4f865d310351ba6ee71852428819627ea3909e341d6800ab268b1810c6fa
 lib/codeql/rust/elements/ReturnExpr.qll b87187cff55bc33c8c18558c9b88617179183d1341b322c1cab35ba07167bbdb 892f3a9df2187e745c869e67f33c228ee42754bc9e4f8f4c1718472eb8f8c80f
 lib/codeql/rust/elements/ReturnTypeSyntax.qll 0aa9125f5ea8864ecf1e4ff6e85f060f1b11fdd603448816145fea1b290f0232 3911819548ad1cf493199aac2ed15652c8e48b532a1e92153388b062191c1e6e
-lib/codeql/rust/elements/SelfParam.qll 5c9629e1cd837f5d84bdd79a1aef9cca6fb0acb1fb18671d4a4d28c23a74551a 41eb92527cf4379a2df54a0c9fabc368cb6f9b8d1ac73bd2ab3f13214573e764
+lib/codeql/rust/elements/SelfParam.qll 7d720c99097a340bc7bf6cc27ac6fe291a04af53e9bac23bf070b04b36e6e033 736488794a46ea702dcd3f603134052598207f3953acce3c9237bd6c6a038b23
 lib/codeql/rust/elements/SlicePat.qll f48f13bb13378cc68f935d5b09175c316f3e81f50ef6a3ac5fdbfbfb473d6fc1 4c8df0b092274f37028e287a949f1a287f7505b7c2c36ee8d5f47fb8365d278a
-lib/codeql/rust/elements/SliceType.qll 7e49dba57826c7bb72a88f9e802febdb09adfc49804f6205dc88f2a307fd1f30 6c3ee430f812f1d9fbb1fb1fdd2c47130a4bde7fccf17f09404b8cbc8104678a
+lib/codeql/rust/elements/SliceTypeRepr.qll 4f3fcb2b457ba95c76a1ff786e6fc217ad1a5f570dac68ec5da4b9a37c963186 b3f524d744d3fcef85a2e1e175b99a8e3acab36b2a717f107272ed92a48940c0
 lib/codeql/rust/elements/SourceFile.qll 5916d550385d618bd3b3d4835fbd3040485822220af8ce52ee1adb649b3d8594 0b79766216649e948fa59de467d64fa752de4666c28e0e503e88740ae27a2aef
-lib/codeql/rust/elements/Static.qll 1e25940c774538de9b1aea877e20e34b672d6a3ed3b56a741195995f051c5acd 94f09d08b35decc6990c0cab23354f84aa8ef271ea1a77a233c9fcd6ab14c643
+lib/codeql/rust/elements/Static.qll 439550ae01b4975dc08867ecdc1f8a4da0127321af9511857a006e6bdf6400b0 e83252e8bc06045322bd2cbadd5a2c7deb82b8a11ddbc9809d3e199056f57bee
 lib/codeql/rust/elements/Stmt.qll 532b12973037301246daf7d8c0177f734202f43d9261c7a4ca6f5080eea8ca64 b838643c4f2b4623d2c816cddad0e68ca3e11f2879ab7beaece46f489ec4b1f3
 lib/codeql/rust/elements/StmtList.qll 6f990782d5a5307d6d8a3256eb510aedfdaf7bd0e45f3dff35388842ab487b8c b412a27dea0c67307ab79104d45c5b4848c3191cc983e8b0d8dfa739a1b65d9c
 lib/codeql/rust/elements/Struct.qll 96b7020c7670d5ea7effa6e390d3a163dba05ca5206cfdd1284f4a41e5664c6a 3fea0d13b8da0f210f3ad9004189efc3c56bcc90e67d6ef7817c6767f6aff273
@@ -137,17 +144,17 @@ lib/codeql/rust/elements/Trait.qll f78a917c2f2e5a0dfcd7c36e95ad67b1fa218484ee509
 lib/codeql/rust/elements/TraitAlias.qll cb2af66ca1da20122b800097dbaaa904e5b6e753571fcfd6821e779be273d742 da8666db52609a5d04b847dfcecf753644f813597d58a4aa1a7e2d35ede96ef8
 lib/codeql/rust/elements/TryExpr.qll d2c5eb215f1b46a86b82e7d99fe1dcfb2b4cb42811f331e54cc602b40a10a0eb 8c207264924428e969060f4cb903b37e27f8ff74e45be7d13a2ead44a572b36a
 lib/codeql/rust/elements/TupleExpr.qll 561486554f0c397bc37c87894c56507771174bfb25f19b3bf258a94f67573e56 d523246820853ff0a7c6b5f9dbe73d42513cadd6d6b76ea7e64147140ac93c15
-lib/codeql/rust/elements/TupleField.qll e58d024fc41519b559eef36cf6081d03a786b05357e4322e7046092131ea508f cad861b23fb4cdf2fbe90595de0e4776f1db9b69c3f3825221e475bc92895351
+lib/codeql/rust/elements/TupleField.qll 2e78c52e3f5b3cfa59231c864f7d44fbe9c1ec43f8310f9250817bd7a88369b6 71466032bb32a0f6d64c5d8902587c2fa36cdece53799d3e03ece06e384e85f4
 lib/codeql/rust/elements/TupleFieldList.qll 73397eef1cf8c18286b8f5bb12fbdc9bb75eee3b7bd64d149892952b79e498a3 13ac90f466ab22e5750af9e44aff9605b9e16f8350b4eaecff6a99e83d154e25
 lib/codeql/rust/elements/TuplePat.qll 028cdea43868b0fdd2fc4c31ff25b6bbb40813e8aaccf72186051a280db7632e 38c56187971671e6a9dd0c6ccccb2ee4470aa82852110c6b89884496eb4abc64
 lib/codeql/rust/elements/TupleStructPat.qll 16a3f10992db62cc6630dc962a2a0d243c41b8aca064d6cb6c82a2f4e6987a12 c2b4c14567ee2dd65e0b643c9d18dfe5098fb3bd4ed45dcc825065bfa7c7c02d
-lib/codeql/rust/elements/TupleType.qll b5c798f7c9b08c8a6cc0a57fc5c36d714e70d5e955a9e87b6b309c18365d7596 ebea533ab126392344d080da1bc9efabcabb5397e93c9d213ffc71a61bb8d47c
-lib/codeql/rust/elements/TypeAlias.qll 64780697f5869266345d040fdaee05c62b8670b9b5c6369692f9a9dc646986fc afcc7617d0e2e16d92d2a53c3e6661fd184bf5cf21b154f121dbf4d3b7ab30e6
-lib/codeql/rust/elements/TypeArg.qll 39aea9a9f0b74e8b90e957dbc3ce593cbdb1d2e0d9320428ce2e9cbfcb772e53 f1f2612633de9f534faf76c368b6154a8dc20feb9297262fcb10a8f192aa2e02
-lib/codeql/rust/elements/TypeBound.qll 3549a2ded6dbe401a49690c7b7c1d629d55dae2347380ee0e0632d3b64f200e7 e407603af5bc1ba2704a457eaa7fffd8c52cb13b3ccfc9ef477ad120ff8e98a1
+lib/codeql/rust/elements/TupleTypeRepr.qll 819b600abfb2d6110e3f9c09a3901c875530acf372c65e3d9071aed8ab302cbb 508e8e527248b42ba3f20d3ff5163c348c9d338b12ff7d244246fc711e9d240c
+lib/codeql/rust/elements/TypeAlias.qll 2974953465e096fee61c70199a5672174254494786bc762c32c84df97422f08b 55e634e3dfa6ea3980ab37a524ea60c6adc207114a313c0c2a3632f7b5583dab
+lib/codeql/rust/elements/TypeArg.qll 88b5d150dbb207079bf40019b60eb6f5389247aa3040474729019d2be48e92a6 6a507290152be04b1d2c4e2c04214cfc87c583ed0611bd75655aff59eb8ce952
+lib/codeql/rust/elements/TypeBound.qll 0c1629a7e2bce7e6f603e1209cd5b182b9bb61fa4c287bc4276d40cf004011e5 40c6f1d099f35be61ce721d3ee921c14722190b50874f87035036ef14ed2fb68
 lib/codeql/rust/elements/TypeBoundList.qll a0b95aa95485a0e23b9198ca492ea3fa075fb0dc9fb40ba997aff35d70c51d3b 51de36a56cd2921758260c62cebeb96e703d10b226ca505c874ae54c5a981348
-lib/codeql/rust/elements/TypeParam.qll e06ed282dd55dc68970265706a22499c8ec4ea8c3459d11e20549eeb5504e2b7 479826e69d2a9189f66962b17f55c62df89e297623f38287eb296ec78487a1a6
-lib/codeql/rust/elements/TypeRef.qll b180dc4fe85d0eb3032ed3a63aea54ca0b667a6a00f2fa0505fa742bd89d6927 b0210ee96929ca0f335955f76d2a0c06ce32201b8bb45d8424aece786ed6dae5
+lib/codeql/rust/elements/TypeParam.qll 1ed46cf5b687e75fd062142114197354422dc7378f637a93bcd26038d7a51cfa 89ec428bda92d44c265263886ad427032dbced6169b405af0cd51f0a981fb587
+lib/codeql/rust/elements/TypeRepr.qll ea41b05ef0aaac71da460f9a6a8331cf98166f2c388526068ddacbd67488c892 11a01e42dab9183bac14de1ca49131788ede99e75b0ef759efcbc7cf08524184
 lib/codeql/rust/elements/UnderscoreExpr.qll 233661b82b87c8cda16d8f2e17965658c3dc6b69efb23cb8eb9c4f50c68521e0 8edff8e80aac2ecf83a6b58f310cab688cbaeea0a0e68a298b644e565960cc74
 lib/codeql/rust/elements/Unextracted.qll 12e60c79ef5b94d72b579b19970622e7b73822ebc13fbcfedfe953527ab1ac36 ec015db2eb12c3c82693ddc71d32d9ab9ef7a958e741e2510681bb707ceca23e
 lib/codeql/rust/elements/Unimplemented.qll bf624d28163e5c99accda16c0c99f938bec4a3b1b920a463e86fc8529ff5ff02 013bc7777298d250338f835cd494b5a8accea2d6a4f9561851f283ac129a446b
@@ -155,23 +162,25 @@ lib/codeql/rust/elements/Union.qll 92ffb1abc03889b9b71dae9491d4595e443c80b472474
 lib/codeql/rust/elements/Use.qll e27d30ece0456a73732dfd867dfc5abdf48a50de56e7dafcab444b688610af72 7efe59c04dd2f10b4a25b8a17beb51362be0a93d73e5a9e1251cf133cf1227c3
 lib/codeql/rust/elements/UseTree.qll 16b6e42146dc4c2e9d8cc6bc143933d675d1a4c9a56b309f390f4bf5df99b25d 9f8dd7d621dd15f6f1ccec676b08da02773673cbb3a3570781c16167c6e08ef4
 lib/codeql/rust/elements/UseTreeList.qll 768c4ec25e8807bba65619f566b22fa5c0946c36e96c88cfdee04c2875b44554 6433c8d9acd4e346cadd5fef01d79dd35bb6245115bdceb5322c0511106030b0
-lib/codeql/rust/elements/Variant.qll b0770c3ce0a82dcb2e238024b1db4ee2b76271f5a3d94f03bdaee71a25218da1 af242bd8651b653d931bf4cd3c234bdb58c8516eb4576edc03a929232946c38e
+lib/codeql/rust/elements/Variant.qll 328323ef59faf01dcf71e7d728fd10a60465a1bd24e1d3578289cdf6554e5b63 ba49c635790395d9df4398c3c0fec700c3c7761fcc6581623a45d381d23ac34d
 lib/codeql/rust/elements/VariantList.qll 07adfe5750b2d5b50c8629f36feba24edd84f75698a80339d4cee20f4e95829d 7d322e60c84ea45f8c8b509226da7ae3c0125bcda42a98a94e3e6a9855cab79e
 lib/codeql/rust/elements/Visibility.qll d2cf0727efaf8df6b3808cb4a6b2e26d18e42db766d92e97ad3ef046d91cb9e5 8947a1e2d48b532c6455ddf143fa5b1dff28c40da1f1c6a72769fc9db7ecbaf6
 lib/codeql/rust/elements/WhereClause.qll da51212766700e40713fff968078a0172a4f73eebc5425d8e0d60b03c2fe59fa 0ec036aea729b8f4af0eb8118911dce715e2eb4640ae7b5e40a007a48da03899
-lib/codeql/rust/elements/WherePred.qll 4815cd8f2a536c895e1f6831bef2ee6b9ea42c4fea12df1f164de1c965795bc1 3b46806767d81218d2e21656afe39c957c364ff7067c9af3ae8bacbf7f93858b
-lib/codeql/rust/elements/WhileExpr.qll 9c12c26f953163c70020669327bd8c931493ef7fb4b75e6711202c0bab1d2697 2e2c96425bcd4414c65d9069a71a5123a3a10dd1449cafc121ac08f91ea49728
+lib/codeql/rust/elements/WherePred.qll 595ae1b4f9db7308f25fbed04f4f2e44fc64dd6384c2c173ff20b645cfeaad9a a4dbd58a9f8cf5b37b3b630f18ee26c58bb267b7cade132532b71288864b0f95
+lib/codeql/rust/elements/WhileExpr.qll 9e0c23057bf3fa3e050d5f6de0650f554ce576861783ea7d1e4c7d35db129ad3 b294c4f6e4dea922a4274779287edcb484409b2654a553298626ded9d1e8c5a4
 lib/codeql/rust/elements/WildcardPat.qll 4f941afc5f9f8d319719312399a8f787c75a0dbb709ec7cf488f019339635aab a9140a86da752f9126e586ddb9424b23b3fb4841a5420bac48108c38bb218930
 lib/codeql/rust/elements/YeetExpr.qll 4172bf70de31cab17639da6eed4a12a7afcefd7aa9182216c3811c822d3d6b17 88223aab1bef696f508e0605615d6b83e1eaef755314e6a651ae977edd3757c3
 lib/codeql/rust/elements/YieldExpr.qll de2dc096a077f6c57bba9d1c2b2dcdbecce501333753b866d77c3ffbe06aa516 1f3e8949689c09ed356ff4777394fe39f2ed2b1e6c381fd391790da4f5d5c76a
 lib/codeql/rust/elements/internal/AbiConstructor.qll 4484538db49d7c1d31c139f0f21879fceb48d00416e24499a1d4b1337b4141ac 460818e397f2a1a8f2e5466d9551698b0e569d4640fcb87de6c4268a519b3da1
 lib/codeql/rust/elements/internal/AbiImpl.qll 01439712ecadc9dc8da6f74d2e19cee13c77f8e1e25699055da675b2c88cb02d dcc9395ef8abd1af3805f3e7fcbc2d7ce30affbce654b6f5e559924768db403c
+lib/codeql/rust/elements/internal/AddressableImpl.qll e01a6104980960f5708d5a0ada774ba21db9a344e33deeaf3d3239c627268c77 b8bfc711b267df305ac9fe5f6a994f051ddeca7fc95dacd76d1bae2d4fa7adde
 lib/codeql/rust/elements/internal/ArgListConstructor.qll a73685c8792ae23a2d628e7357658efb3f6e34006ff6e9661863ef116ec0b015 0bee572a046e8dfc031b1216d729843991519d94ae66280f5e795d20aea07a22
 lib/codeql/rust/elements/internal/ArgListImpl.qll 19664651c06b46530f0ae5745ccb3233afc97b9152e053761d641de6e9c62d38 40af167e571f5c255f264b3be7cc7f5ff42ec109661ca03dcee94e92f8facfc6
-lib/codeql/rust/elements/internal/ArrayExprConstructor.qll f4ac4efefe5fe4fe1e666f35b1ee92d2243d977b3f3308151c89f61582203c09 4167ae58ec869f7dbd8467093c4a53afd7c1efcf1cc865efa62b4eb484bd7ff8
-lib/codeql/rust/elements/internal/ArrayExprImpl.qll 205db9816ec56409db1a0c3987e3a64b8e88b9942055d4bcf84a5fd5943efded 094c954c2861fa7dea69247c9c16ddc6c8699dcd3201a993c72229450bed1490
-lib/codeql/rust/elements/internal/ArrayTypeConstructor.qll 9e92e6c40df992b4d71ae0e80392e81499604c7586a671b89d31d2d98060380e 76a1915a88f50ffa60bf129237bae2d66cf26d2a9018aca8ccb343929e847531
-lib/codeql/rust/elements/internal/ArrayTypeImpl.qll e22d4f4eb21ba1ea44dd53e0c80aa60ec3a42818c1fc2d512c92dc496a6e2cb3 1b4a7347dbb9310ace1e9e3d08c3ba53c1dc441539cebcb4a78f64a58097bc0a
+lib/codeql/rust/elements/internal/ArrayExprInternal.qll 07a219b3d3fba3ff8b18e77686b2f58ab01acd99e0f5d5cad5d91af937e228f5 7528fc0e2064c481f0d6cbff3835950a044e429a2cd00c4d8442d2e132560d37
+lib/codeql/rust/elements/internal/ArrayExprInternalConstructor.qll f9756bc40beee99c5e4355bf157030b440c532dff5bdf43e848b3aa1a00fea90 39467f7f313e6f9ede1fe92375ee408098dc65291ca8ee50e36a3684a2767836
+lib/codeql/rust/elements/internal/ArrayExprInternalImpl.qll ae4488846c8309b2d4a51d54b36fce0a75107917c0b1f8af5ccf40797f570580 37838c7d6a04b95a16ed46e963d7e56def7a30b5e5ef1ab7e0dfdb5f256fa874
+lib/codeql/rust/elements/internal/ArrayTypeReprConstructor.qll 52fea288f2031ae4fd5e5fe62300311134ed1dec29e372500487bf2c294516c1 fa6484f548aa0b85867813166f4b6699517dda9906e42d361f5e8c6486bdcb81
+lib/codeql/rust/elements/internal/ArrayTypeReprImpl.qll ee16057197a489e6539c256d59f615636610022ec920fef93d36abf051c8687d 39a86b29d94f6d3b422161f0b1db6d0462c149bd465d60bfc82d383dd891c63b
 lib/codeql/rust/elements/internal/AsmExprConstructor.qll 36c68023b58beec30af9f05d9d902a4c49faa0206b5528d6aad494a91da07941 4d91b7d30def03e634b92c0d7b99b47c3aadd75f4499f425b80355bc775ea5b6
 lib/codeql/rust/elements/internal/AsmExprImpl.qll c34419c96378e2ae2ebb17d16f9efb4c97d3558919c252be9203aee223ac30a2 1d99c8fa35fabf931e564383c06c95fb39201fd588b759d28aef2fda7ed2c247
 lib/codeql/rust/elements/internal/AssocItemImpl.qll f462dacb8e60db8d8ffae44307c990370210c57b66721fd072c34b5ae76d3cc9 7fdb8faff0f310c1cb2bdd52f18368c8d78873467800c41ab3d1989f3196d845
@@ -182,25 +191,18 @@ lib/codeql/rust/elements/internal/AssocTypeArgImpl.qll 429f12a1a53c81634fc35331b
 lib/codeql/rust/elements/internal/AttrConstructor.qll de1dd30692635810277430291ba3889a456344dbd25938d9f8289ab22506d5cd 57b62b2b07dee4a9daeed241e0b4514ba36fd5ec0abb089869a4d5b2c79d6e72
 lib/codeql/rust/elements/internal/AttrImpl.qll 486d307f74a48e6475fe014b07d5e0e13bbdf493ea80823e77e39747edf470d7 0847aa78d0e075aedbe46c10935969046bde4a7ab842da9d184739eb99a777c2
 lib/codeql/rust/elements/internal/AwaitExprConstructor.qll 44ff1653e73d5b9f6885c0a200b45175bb8f2ceb8942c0816520976c74f1fc77 11e6f4a1e1462a59e2652925c8bd6663e0346c311c0b60ebe80daa3b55b268b0
-lib/codeql/rust/elements/internal/AwaitExprImpl.qll 97eb9abc0f30ead9385f31c87b461e6f1bbfbeaac17810838bb94543bfca181f 66357ffc8c106aae565524d7110e9f50f2b3f573b1508c1d1b02db02af4cc52e
 lib/codeql/rust/elements/internal/BecomeExprConstructor.qll ba073aaa256cb8827a0307c3128d50f62b11aac0b1f324e48c95f30351a9b942 3a787ded505c3158fa4f4923f66e8ecdcb7b5f86f27f64c5412dc32dca031f18
-lib/codeql/rust/elements/internal/BecomeExprImpl.qll 8522410257ca9ff09e5314c3a39fba02f6ba18e1d4349b91f8823586317f3e47 073a877a6d72c5b762aac64cdd843fd2872aaefb9e264fb90eac8c25753a6e07
 lib/codeql/rust/elements/internal/BinaryExprConstructor.qll 7f9b17757f78b9fb7c46e21d2040a77fa50083bef4911c8464991c3d1ad91d87 a59390cd8e896c0bfbdc9ba0674e06d980ffcefa710fbc9886be52ed427e9717
 lib/codeql/rust/elements/internal/BlockExprConstructor.qll 438337c807645e98a01440f3f4610d68b0567ba15c8f51dc43bf5a30c9af3696 48ce7a546910c884619762349b8ada9836284f8008298fdb0070a38f7ddf25a0
 lib/codeql/rust/elements/internal/BlockExprImpl.qll 36ac09e4a6eeeec22919b62b1d004bdb5bb2527e67932c308aec383a770768d6 3b4b2a2014f6fe075c63a2d633b297566b548ef2e4343cadf067a9edbcadc876
 lib/codeql/rust/elements/internal/BoxPatConstructor.qll 153f110ba25fd6c889092bfd16f73bb610fa60d6e0c8965d5f44d2446fcd48a2 9324cf0d8aa29945551bf8ab64801d598f57aab8cd4e19bcd4e9ef8a4a4e06eb
-lib/codeql/rust/elements/internal/BoxPatImpl.qll d62a3cc1d5bab6bd258f702ec731ec57f0e5ef2672ab9de4b6f3b558078629eb 26b4fabb676adbbdb0d7f81449e493ee49380ea04d131f779714ac2434bb323a
 lib/codeql/rust/elements/internal/BreakExprConstructor.qll 356be043c28e0b34fdf925a119c945632ee883c6f5ebb9a27003c6a8d250afd9 bb77e66b04bb9489340e7506931559b94285c6904b6f9d2f83b214cba4f3cfd5
-lib/codeql/rust/elements/internal/CallExprBaseImpl.qll d2749cc1a9d7ee8bf7f34b6c3e0238a576a68e439a8c10a503c164ff45ffcbeb ffc7b0a8841945fe6736b0e1aed7d9ed69185db03dee2b16da121325b39397c7
 lib/codeql/rust/elements/internal/CallExprConstructor.qll 742b38e862e2cf82fd1ecc4d4fc5b4782a9c7c07f031452b2bae7aa59d5aa13a cad6e0a8be21d91b20ac2ec16cab9c30eae810b452c0f1992ed87d5c7f4144dc
-lib/codeql/rust/elements/internal/CallExprImpl.qll 7e48610680ba6f2876a1a005ab0743496dd2364b9c44aca441bd33e11317e2d7 bb12c3c28156b40796fe3ba112760f87bb5abb323aab3c5b7bb3e0facaef8d35
 lib/codeql/rust/elements/internal/CallableImpl.qll 917a7d298583e15246428f32fba4cde6fc57a1790262731be27a96baddd8cf5e c5c0848024e0fe3fbb775e7750cf1a2c2dfa454a5aef0df55fec3d0a6fe99190
 lib/codeql/rust/elements/internal/CastExprConstructor.qll f3d6e10c4731f38a384675aeab3fba47d17b9e15648293787092bb3247ed808d d738a7751dbadb70aa1dcffcf8af7fa61d4cf8029798369a7e8620013afff4ed
-lib/codeql/rust/elements/internal/CastExprImpl.qll 3c57b75f01efc70013ba3f05bd79fe2747fe1d1de47b84ff73b06ad38b4f1093 da813adc3390d23ec0643e37226a58e8afdb78e889380ad265d7531a344b841c
 lib/codeql/rust/elements/internal/ClosureBinderConstructor.qll 6e376ab9d40308e95bcdaf1cc892472c92099d477720192cd382d2c4e0d9c8a1 60a0efe50203ad5bb97bdfc06d602182edcc48ac9670f2d27a9675bd9fd8e19f
 lib/codeql/rust/elements/internal/ClosureBinderImpl.qll 58c6b17d34d678802ce3484f556482f3f6e3c3ff9a4be0e845bc2077818ab6fb 467261e12cba46f324364f5366bdb0034bf3c922b08307d39441ea5181e3f5f8
 lib/codeql/rust/elements/internal/ClosureExprConstructor.qll a348229d2b25c7ebd43b58461830b7915e92d31ae83436ec831e0c4873f6218a 70a1d2ac33db3ac4da5826b0e8628f2f29a8f9cdfd8e4fd0e488d90ce0031a38
-lib/codeql/rust/elements/internal/ClosureExprImpl.qll 5ae3d211273b3effc3bff9f06bcef480f8264084e0509e69b8ff29bc29f47b05 ff562bc8d15ecb76ada3111c7c74dd990a0e80f41a32477f5f2f7db9e8f71102
 lib/codeql/rust/elements/internal/CommentConstructor.qll 0b4a6a976d667bf7595500dfb91b9cfc87460a501837ba5382d9a8d8321d7736 7d02d8c94a319dc48e7978d5270e33fc5c308d443768ff96b618236d250123f1
 lib/codeql/rust/elements/internal/ConstArgConstructor.qll f63021dc1ca2276786da3a981d06c18d7a360b5e75c08bca5d1afece4f7c4a83 487a870cbf5ed6554d671a8e159edd9261d853eba2d28ce2bd459759f47f11f2
 lib/codeql/rust/elements/internal/ConstArgImpl.qll 234fe6533c208a1731cdb423aa3a28909bd7e042dbc28bbedfd4f62e42b6f21e c576a49006f7a10483041fc07f2f0d089710ac61840be61a2e71140db709f9c6
@@ -211,10 +213,9 @@ lib/codeql/rust/elements/internal/ConstImpl.qll 7aac2b441a41f21b7d788e3eb042554f
 lib/codeql/rust/elements/internal/ConstParamConstructor.qll f6645f952aac87c7e00e5e9661275312a1df47172088b4de6b5a253d5c4ed048 eda737470a7b89cf6a02715c9147d074041d6d00fd50d5b2d70266add6e4b571
 lib/codeql/rust/elements/internal/ConstParamImpl.qll 909d85d857dfb973cd8e148744d3a88506d113d193d35ab0243be745d004ad45 c9e18170c5b4e4d5fca9f175bb139a248055b608ceafdd90c7182d06d67c3cba
 lib/codeql/rust/elements/internal/ContinueExprConstructor.qll cd93f1b35ccdb031d7e8deba92f6a76187f6009c454f3ea07e89ba459de57ca6 6f658e7d580c4c9068b01d6dd6f72888b8800860668a6653f8c3b27dc9996935
-lib/codeql/rust/elements/internal/DynTraitTypeConstructor.qll 2bfd81fdf116b76f4a62b47bed5f0a730c04ce79747ecd1d3b683b8de22ff4aa 375c57350c432351396b92f28fded1e95a8002e3a1b31f3b66039f9b3d9bdea9
-lib/codeql/rust/elements/internal/DynTraitTypeImpl.qll 8ccf27db0b898f518874ae094e5c97206384ad2fd3f82f81a5ecaad953278f71 e28ab56b8814a804e23afa790ca0f9a2665195b0b316d6cc52936e76ce5c0011
+lib/codeql/rust/elements/internal/DynTraitTypeReprConstructor.qll 6964e6c80fb7f5e283c1d15562cef18ed097452b7fcbc04eff780c7646675c7a f03c4830bf1b958fdfb6563136fa21c911b2e41ce1d1caee14ec572c7232866d
+lib/codeql/rust/elements/internal/DynTraitTypeReprImpl.qll fa2dc41b441c2e8d663644ca8ae53f473ac54b3c977490b5173787cffe4a62b1 118945a547627b639574c5f8e58bf7dbf5f3882c6d74ebf363c28c8fb88799d3
 lib/codeql/rust/elements/internal/EnumConstructor.qll eca1a13937faacb1db50e4cf69d175f992f2204a5aaed9144bb6f3cb63814ac5 1bafba78b2729fdb052a25a1ba3f4f70871564aa4df632b4a1d467858a437924
-lib/codeql/rust/elements/internal/EnumImpl.qll c4dfa97b0c656957390417ab09c81b29b67fbff1b7b14976d65625ebea6b2c11 940303d4d4cec130f1981d309f8eaea6803c14a41174bbe9a87dd12ce4975945
 lib/codeql/rust/elements/internal/ExprImpl.qll ab20ee174e2e786f34af6e5dedf3ec071bb89fc266b3e91df6377f72aa38d3f2 f68192700f449bf1c229cfbaabd5353c7c559941c915d5a0c88752cf9844194b
 lib/codeql/rust/elements/internal/ExprStmtConstructor.qll dd6bb06a7d48c12f630aafd611621cc50ce0f3e7d9abba5484a695f90879264b dc8b6ec8acc314e041ae71868803630c5d4cab488c72c1ea929bb756e1847c52
 lib/codeql/rust/elements/internal/ExprStmtImpl.qll 420221c64245b490dab85f4e50d6b408cf488349869eb87312c166e185ad8145 2c2a4c71eea8c1ad8823e8e22780fadebb38ae502b3a7b9b062923a188fef692
@@ -225,60 +226,48 @@ lib/codeql/rust/elements/internal/ExternCrateImpl.qll ade4df9d3f87daf6534b8e79ff
 lib/codeql/rust/elements/internal/ExternItemImpl.qll 577c8ac387c47746e3b45f943374c7ab641e8ad119e8591c31f219a5f08d3a29 bba88b974d1c03c78e0caf3d8f4118426d2aa8bd6ffd6f59a3da8ff1524a173f
 lib/codeql/rust/elements/internal/ExternItemListConstructor.qll 9e4f6a036707c848c0553119272fd2b11c1740dd9910a626a9a0cf68a55b249b efde86b18bd419154fb5b6d28790a14ea989b317d84b5c1ddbdfb29c6924fd86
 lib/codeql/rust/elements/internal/ExternItemListImpl.qll e89d0cf938f6e137ba1ce7907a923b1ab2be7be2fdd642c3b7a722f11b9199f8 85906d3ce89e5abc301cc96ea5104d53e90af3f5f22f8d54ec437687096e39d8
+lib/codeql/rust/elements/internal/ExtractorStep.qll 1c65668007ea71d05333e44132eccc01dc2a2b4908fb37d0a73995119d3ed5f0 8cbe1eeb35bc2bc95c1b7765070d1ff58aae03fd28dc94896b091858eea40efe
+lib/codeql/rust/elements/internal/ExtractorStepConstructor.qll 00c527a3139ad399ea1efd0ebe4656372d70f6c4e79136bc497a6cb84becae8e 93817f3dddeaf2c0964ab31c2df451dcee0aeba7cb6520803d8ce42cefcb3703
 lib/codeql/rust/elements/internal/FieldExprConstructor.qll b3be2c4ccaf2c8a1283f3d5349d7f4f49f87b35e310ef33491023c5ab6f3abc5 645d0d4073b032f6b7284fc36a10a6ec85596fb95c68f30c09504f2c5a6f789f
-lib/codeql/rust/elements/internal/FieldExprImpl.qll bae3828bdee6fa3b36219e831cecc2a09fd3c40c4a945f8a19fb5d8765c6f302 be4b89e39013a380bc172ac46e496f14ebdebb1d93e1b7ffb3bab98e08db3f6f
 lib/codeql/rust/elements/internal/FieldListImpl.qll 02a09d1d146030c68cead4614f4eef75854f19e55ed1eda60b34c4858a8d4a88 9b9f5e77546434c771d2f785119577ec46569a18473daa4169fb84a097369493
-lib/codeql/rust/elements/internal/FnPtrTypeConstructor.qll 494c53ee599039c02145f91394d8dfe7635b32d03f9fcde5efcc99ced437fec8 992462b1b6b9e64b6201f3c6c232ca524f126efcb562c9f0c176677bb559f33c
-lib/codeql/rust/elements/internal/FnPtrTypeImpl.qll 5d70f71e08341dfa851fc53a47cf362786b57f44244a636e2fbbad3d1c41371e 51d6a1b1132204129bb8ee9d2b72c6d13ce4b3ec8b185d3732d2e64d3f80e807
+lib/codeql/rust/elements/internal/FnPtrTypeReprConstructor.qll 61d8808ea027a6e04d5304c880974332a0195451f6b4474f84b3695ec907d865 0916c63a02b01a839fe23ec8b189d37dc1b8bc4e1ba753cbf6d6f5067a46965a
+lib/codeql/rust/elements/internal/FnPtrTypeReprImpl.qll 23b1309f267b640efe9458429feea986fc66a15ce1496883c292d8700637bbc3 b8785911a504d6d48be3e9dd1a150cb2611bd70ac420433e1f78ce1310c284f1
 lib/codeql/rust/elements/internal/ForExprConstructor.qll d79b88dac19256300b758ba0f37ce3f07e9f848d6ae0c1fdb87bd348e760aa3e 62123b11858293429aa609ea77d2f45cb8c8eebae80a1d81da6f3ad7d1dbc19b
-lib/codeql/rust/elements/internal/ForExprImpl.qll 88fc37b7030d3bfca6071f275c4eac6760ad7dea9a01135cee2079170efeb9d5 cd7216c460f8382498dfb0d61d65d83a9aa608b6a9b6657ccd552b82b55ffc5a
-lib/codeql/rust/elements/internal/ForTypeConstructor.qll 32c40b78aded314b5f51af904bfbd5ae4f1f0ea65854dd6249983cc26b8601bc 729069d58fac648a4b212b0068fb6bca348443b502c38978f171a7539b24333f
-lib/codeql/rust/elements/internal/ForTypeImpl.qll b515639844778d0fbe51e6161a2ec19201b0ba15156a91cdfecc93523081fd61 ab0c09ee415e55db6abcc07493a5d880c5ae0974f0cb760194e40b68a961676b
+lib/codeql/rust/elements/internal/ForTypeReprConstructor.qll eae141dbe9256ab0eb812a926ebf226075d150f6506dfecb56c85eb169cdc76b 721c2272193a6f9504fb780d40e316a93247ebfb1f302bb0a0222af689300245
+lib/codeql/rust/elements/internal/ForTypeReprImpl.qll 5595a576085f032f056c0c5c4e78076b60520df420396fbc785eb912a88fa2b2 e8ee94d7722ece3483872411f60a7b01f1c2578823b0263236f25eedd2c2a6ac
 lib/codeql/rust/elements/internal/FormatArgsArgConstructor.qll 8bd9b4e035ef8adeb3ac510dd68043934c0140facb933be1f240096d01cdfa11 74e9d3bbd8882ae59a7e88935d468e0a90a6529a4e2af6a3d83e93944470f0ee
 lib/codeql/rust/elements/internal/FormatArgsArgImpl.qll 601f7715e9a65bcfa7cea1979fa30d694b5bea29650d799d7dd3080b8eea58e9 ecb0800cdb8c0f93277982dad295ac6a5332e42eff4fb5c8ff19f903b9857003
 lib/codeql/rust/elements/internal/FormatArgsExprConstructor.qll ce29ff5a839b885b1ab7a02d6a381ae474ab1be3e6ee7dcfd7595bdf28e4b558 63bf957426871905a51ea319662a59e38104c197a1024360aca364dc145b11e8
 lib/codeql/rust/elements/internal/FunctionConstructor.qll b50aea579938d03745dfbd8b5fa8498f7f83b967369f63d6875510e09ab7f5d2 19cca32aeaecaf9debc27329e8c39ecec69464bb1d89d7b09908a1d73a8d92a2
 lib/codeql/rust/elements/internal/GenericArgImpl.qll 6b1b804c357425c223f926e560a688e81506f5a35b95485cecf704e88cc009ee cc1ccf6a23dadc397e82664f3911d4b385d4c8ca80b1ee16d5275d9c936148dd
 lib/codeql/rust/elements/internal/GenericArgListConstructor.qll 46859bb3eb09d77987a18642d65ba2e13471a4dc9c0a83a192fddc82e37c335c 2c7d54c876269a88d3461b05745e73b06532b1616cae9b614ac94b28735d8fc4
-lib/codeql/rust/elements/internal/GenericArgListImpl.qll 1a39ba7080147abccaaba451852c9c124fb6177f2ebd64e38ee74014444a34e1 80df3150c961936037ac02b46ef5f775c3f82e66490afbca00a016cb9eee798a
 lib/codeql/rust/elements/internal/GenericParamImpl.qll f435f80d7f275803c1311d362467f4a367deb5a2c0245b17a9e12468a2c3ce2f 8e8fcc29f510efa03ce194ad3a1e2ae3fbd7f8e04ab5a4a2d1db03e95f388446
 lib/codeql/rust/elements/internal/GenericParamListConstructor.qll 7221146d1724e0add3a8e70e0e46670142589eb7143425e1871ac4358a8c8bdb 2fbb7576444d6b2da6164245e2660d592d276ae2c1ca9f2bda5656b1c5c0a73a
 lib/codeql/rust/elements/internal/GenericParamListImpl.qll 524aa0949df6d4d2cb9bee6226650f63a6f181d7644933fa265673b281074885 27b0210e5eaa2040bc8a093e35e1394befb6994b25369544738d0447ef269a9c
 lib/codeql/rust/elements/internal/IdentPatConstructor.qll 09792f5a070996b65f095dc6b1b9e0fb096a56648eed26c0643c59f82377cab0 0bb1a9fcdc62b5197aef3dd6e0ea4d679dde10d5be54b57b5209727ba66e078b
 lib/codeql/rust/elements/internal/IfExprConstructor.qll 03088b54c8fa623f93a5b5a7eb896f680e8b0e9025488157a02c48aaebc6ad56 906f916c3690d0721a31dd31b302dcdcec4233bb507683007d82cf10793a648f
-lib/codeql/rust/elements/internal/IfExprImpl.qll 96dc5be0a650a74f96e0c2214eb58f1af5278ad1695ad790b660fdecb6738c14 06a292fcc459297ef3a0ef5c75c887f993ccd6350eb3fb0d2493e5b7c7199b6b
 lib/codeql/rust/elements/internal/ImplConstructor.qll 24edccca59f70d812d1458b412a45310ddc096d095332f6e3258903c54c1bb44 7eb673b3ab33a0873ee5ce189105425066b376821cce0fc9eb8ace22995f0bc7
-lib/codeql/rust/elements/internal/ImplImpl.qll 33a57be871fe3ab08467a65f2e2e9fb7df9f096c98e9f86d8a755eaf6da6e446 f01d0e9bfccf3926ae9720d3d660ba97e1c094f318bfb252449b2d387176f6a9
-lib/codeql/rust/elements/internal/ImplTraitTypeConstructor.qll b47501280b026a4e9c21ace21d9ae59f4d126a3a1e03a6088ca38cd676cc4f6d 3b0b325ab0139b290a81355559227050ba3096a58f9ff01c4c0f5c5fb5beb6ee
-lib/codeql/rust/elements/internal/ImplTraitTypeImpl.qll 9826a676525c98c30019f62f3c5943b4f62f278ed738dcc023d15f82f36a9d32 da369a61b95685c29fce3c07082d2a58ab633d526d094fa9eaefa82f564609f6
+lib/codeql/rust/elements/internal/ImplTraitTypeReprConstructor.qll 1ed355e5e56f432b24b6f4778e4dc45c6e65095190cacb7a5015529e0c9d01f8 c8505185a042da4eb20a0cc32323194a0290c4bf821c7e0fce7351b194b10f31
+lib/codeql/rust/elements/internal/ImplTraitTypeReprImpl.qll dde9a7d09cce9c83299ce7526f55ff8ed7601fdfb7f76c9b90380b25f0e4fc43 c521e2a24915b617cd9c44726f26056b606f78901e1e6d47cf68efb5f67dd5d7
 lib/codeql/rust/elements/internal/IndexExprConstructor.qll 99bdc3d793c4dbd993860da60abe2b7c604345d645e86916462bc55a6939a5d1 3fe9d7da725956903707806aadbecac8d5b3874e8bed63c9bab54fff630e75dd
-lib/codeql/rust/elements/internal/IndexExprImpl.qll 7914bace26dadf2c1752b65afad2ed226165507e20f3dba7949696103f3d586e 708a9f7eff1cbfcf93841ee009dc01354f4ea3d2e1e00608924e670070410e20
-lib/codeql/rust/elements/internal/InferTypeConstructor.qll fb8f2aec6cd1e681cd84a7bd574459e19b9b2a152009290e2eac550f012a06b7 e2b1694f00a4e6a82b13d08d7bb95c98a73792370c1155263d696e60d39b2c3b
-lib/codeql/rust/elements/internal/InferTypeImpl.qll 9d0bf471a7e0c2671aae52cebadc763ed13e6a62451bf22da3061d7781d8f0bf 4e9e218862e48700523d882eb64d24135289216653cf92195f74eb8a35f50d7c
+lib/codeql/rust/elements/internal/InferTypeReprConstructor.qll bc5f16853401617fc9c5af8a1287a23c5921df1b615cfbe2d7c7a70145ecfcbd da93bd28ea2daade2cbb0a729be3fbf05f72bc02009565c7bb062e4f68fdb9e7
 lib/codeql/rust/elements/internal/ItemImpl.qll 3eaa97dcbdb8870acaebc1e11a37a5cfdfa200751461e54d3a52ca48b90ba9bd 41fbd1110b0e24f4d5a3deee0a51c02d206178111a361a1e94501ca1ab70d7f7
 lib/codeql/rust/elements/internal/ItemListConstructor.qll 08af3bd12536941c3dd4a43c81cc861be24325e242e2593c087a3ce632674291 2fa166159c409d2aaffa73a30babb40829a6de580bd40894d909ee6152801082
 lib/codeql/rust/elements/internal/ItemListImpl.qll fb27417bb3ee17a739ae966dd7c6f382bc2a1de3e7efdfe1586d76a257c0b573 dee7ded650df8ef46b2ac9d472718536fd76dffee86bc208b5a6144060221886
 lib/codeql/rust/elements/internal/LabelConstructor.qll 1f814c94251e664bfa1b1a606aef995382e40e78d4f953350ec951ee0bc8bd34 3157fb8c7c6bd365a739f217ad73ba1e0b65ccd59b922e5ab034e3449915b36c
-lib/codeql/rust/elements/internal/LabelImpl.qll e1934c3f01e6c9a2517001285bc8e36166757a50ff63be09f9000171c04130f7 4f93e722af890b5241bf55674b29ac5cb134cfefb47eba983503dbd4212abb20
 lib/codeql/rust/elements/internal/LetElseConstructor.qll b2b5d68e5701379a0870aa6278078e09f06aa18ddd14045fc6ae62e90827ece7 7359e70bea8a78bcaf6e6ecc8cc37c5135ae31415b74645594456cc8daa82118
-lib/codeql/rust/elements/internal/LetElseImpl.qll 1c801275993b809e80a847736f080a9b650710ef8862797504495d62904a3a71 b79d4760d8e333893e984e45f21eb463dce7f2a49ebd0708321c8653aa8c20cb
 lib/codeql/rust/elements/internal/LetExprConstructor.qll 66f27cbdafb2b72b31d99645ec5ed72f4b762a7d6f5d292d7639dd8b86272972 7da048f4d7f677919c41d5c87ead301eacc12ece634d30b30a8ae1fab580ff30
-lib/codeql/rust/elements/internal/LetExprImpl.qll d9e2f8a2f4c7cf3b80178012b5f38b029064a52e705301b99c7477ec1d9fe479 1a059d383a5988b32ade329d2ac809f3a830eb9c54020e3271861aa9ef136ab8
 lib/codeql/rust/elements/internal/LetStmtConstructor.qll 7ee0d67bebd6d3b9c7560137c165675d17b231318c084952ba4a2226d61e501f 84199ba755bb6c00579eee245b2bca41da478ca813b202b05abaa1246dcf13d8
-lib/codeql/rust/elements/internal/LetStmtImpl.qll 2f3f387a78d1751652bd22dc0ea6cb39f0e186847b6f0dafd74d0f89e2db495a 2ab5a17f588e385f614c8a104a17a91859389227635bd239694a799643727ffc
 lib/codeql/rust/elements/internal/LifetimeArgConstructor.qll 270f7de475814d42e242e5bfe45d7365a675e62c10257110286e6a16ce026454 643d644b60bfe9943507a77011e5360231ac520fbc2f48e4064b80454b96c19b
 lib/codeql/rust/elements/internal/LifetimeArgImpl.qll 2d31b328c07b8922e2c448137d577af429150245170d26fe4a9220cba1a26bfe 18c5f5747ff4be87820c78cadd899d57e1d52c5cd6ae3f4e56ee2f5d3164bd41
 lib/codeql/rust/elements/internal/LifetimeConstructor.qll 2babe40165547ac53f69296bb966201e8634d6d46bc413a174f52575e874d8cd ef419ae0e1b334d8b03cdb96bc1696787b8e76de5d1a08716e2ff5bd7d6dc60d
-lib/codeql/rust/elements/internal/LifetimeImpl.qll 14ec1a4fa0c84fa9e75ea0babebae9c666909239806ed21325c32e47e11c8806 891168f29d4e06a927ec01ef8fd21ff6e0a0a3deadcf1481c99c74bf2ef20536
 lib/codeql/rust/elements/internal/LifetimeParamConstructor.qll 530c59a701d814ebc5e12dc35e3bfb84ed6ee9b5be7a0956ea7ada65f75ff100 ff6507e5d82690e0eec675956813afabbbcfb89626b2dbfffe3da34baeff278c
 lib/codeql/rust/elements/internal/LifetimeParamImpl.qll 8909288801bff8d3e87096dff4b45f434a4c064a9d69d8943a0b30970e011ef9 6d8f80eca24112b5eb659fe5d5fca4fd91c3df20ecab1085dfee9176091237b8
 lib/codeql/rust/elements/internal/LiteralExprConstructor.qll 8ea3569bd50704ce7d57be790d2dfd38f4c40cb0b12e0dd60d6830e8145a686f 88d07ad3298003f314f74bd8e3d64a3094de32080ad42a7e6741c416c3856095
 lib/codeql/rust/elements/internal/LiteralPatConstructor.qll b660cb428a0cba0b713fc7b07d5d2921de4a2f65a805535fb6387684c40620de 2dbc9fbc56e9de53d24265d6b13738ef5b9ced33cc3c4c1c270e04dc2fc1330f
-lib/codeql/rust/elements/internal/LiteralPatImpl.qll af74456649e3949bf27e91f2127389e5c9f2ee99241958afeaa5b55276170994 b8b744b1d0c1b85ec86c535a35fc75d6289636a0e1988500debf236faf24a2cd
 lib/codeql/rust/elements/internal/LoopExprConstructor.qll 45f3f8f7441fcab6adc58831421679ee07bac68ac0417f3cbc90c97426cc805b f7ab3361b4a11e898126378ea277d76949466946762cd6cb5e9e9b4bb9860420
-lib/codeql/rust/elements/internal/LoopExprImpl.qll 068b98978296b22ae59bf9e941e7e2683f4fee0f6c1affbda1fa42c93f015114 e40e384aeff61099d102a681e5dca1aabc6dd6694731f8570d6358e0197368b0
+lib/codeql/rust/elements/internal/LoopingExprImpl.qll 17885c1bcf7b5a3f9c7bbad3d4d55e24372af0dedd5e7fc0efcfc0a8b2cdad70 104dc45ca399b9f6e8227ad561679f728d60170398a52b31fc90cb2a2dd3c33c
 lib/codeql/rust/elements/internal/MacroCallConstructor.qll 707fee4fba1fd632cd00128f493e8919eaaea552ad653af4c1b7a138e362907d b49e7e36bf9306199f2326af042740ff858871b5c79f6aeddf3d5037044dbf1f
-lib/codeql/rust/elements/internal/MacroCallImpl.qll 7732221a0d8677f32695be3e6263f6e5f8857225cf98cc31eb91592e175df260 7c4e15e092abbf3a6070141669f2614909eb0accaaee0da6f70495de6087337b
 lib/codeql/rust/elements/internal/MacroDefConstructor.qll 382a3bdf46905d112ee491620cc94f87d584d72f49e01eb1483f749e4709c055 eb61b90d8d8d655c2b00ff576ae20c8da9709eeef754212bc64d8e1558ad05ce
 lib/codeql/rust/elements/internal/MacroDefImpl.qll f26e787ffd43e8cb079db01eba04412dbf32c338938acf1bc09a2f094bbdfdfe 044f43bc94fe4b6df22afae32e9f039d1d0d9e85ad9f24b6388be71211c37ce5
 lib/codeql/rust/elements/internal/MacroExprConstructor.qll b12edb21ea189a1b28d96309c69c3d08e08837621af22edd67ff9416c097d2df d35bc98e7b7b5451930214c0d93dce33a2c7b5b74f36bf99f113f53db1f19c14
@@ -291,10 +280,9 @@ lib/codeql/rust/elements/internal/MacroRulesConstructor.qll dc04726ad59915ec9805
 lib/codeql/rust/elements/internal/MacroRulesImpl.qll 10c03adfb63ee7a4348ff5cffc6ef5300a531b048f28811a51e940b053e69f68 2498bd64aeaea9849c086abeaa6c248e4ce41b4436155f4bd4840965976d5d54
 lib/codeql/rust/elements/internal/MacroStmtsConstructor.qll c293815cd69c002ba6de1db6018672654420f3f8bdd143f9d0c620adddd2be02 d376f8f07661a8cad1b10039076fd7fca353dcacf3ca40ed6507b8c874e849ca
 lib/codeql/rust/elements/internal/MacroStmtsImpl.qll 27faff9da93ad7f22a6236c73ebb4d4631161cf4ec1b82958cdf79c85aa2087c 7e2863eaf50d4b285b9240f2c5ff9497cfb4393c8528a0738d725d00f1a78406
-lib/codeql/rust/elements/internal/MacroTypeConstructor.qll 0a23573a6f69b38f3d7470050b16197601d67bdd5a4b1a43a155b0b99ccdf6b5 19b623962e8e1f73e55e3ed9712d2a3fe84b9510b99062173902feb2458ec12a
-lib/codeql/rust/elements/internal/MacroTypeImpl.qll b8711279f09f521b05bb67568c089271b7913f863ee64dfdeec2c502de2cbdc8 51bd9d3a2fb2065bce7b193b485e225ca5c8ba2029e60cab427d43a90baf0880
+lib/codeql/rust/elements/internal/MacroTypeReprConstructor.qll cf8a3bdcd41dda1452200993206593e957825b406b357fc89c6286cb282347ac a82279485416567428ab7bff7b8da7a3d1233fb1cfcdb1b22932ff13bd8c8ec9
+lib/codeql/rust/elements/internal/MacroTypeReprImpl.qll 8044498e426597c767308b0bd8894402f7b30f334c71970d7a09dae5e25dd74d c0d566147777f562055727ebfc255e81dfb87ee724782a5a0ceb02f57597c7a0
 lib/codeql/rust/elements/internal/MatchArmConstructor.qll b41c1d5822d54127ce376ef62c6a5fa60e11697319fc7d9c9c54fd313d784a93 96cca80e5684e5893c0e9c0dff365ef8ad9e15ff648c9969ba42d91f95abea05
-lib/codeql/rust/elements/internal/MatchArmImpl.qll 065dff16fc70b51924eb4db57be121283f4b5651105320901558bc93bfdf2641 37f4f6ecd23c5170ee5cb0041625c19a8d3245d56f6f1587a2e588eb86baecf9
 lib/codeql/rust/elements/internal/MatchArmListConstructor.qll 8bc5ac978fe1158ef70d0ac06bdad9e02aadd657decb64abcc4ea03f6715a87a 4604ab0e524d0de6e19c16711b713f2090c95a8708909816a2b046f1bd83fe24
 lib/codeql/rust/elements/internal/MatchArmListImpl.qll 896c6f1650e7ceb60d0b3d90e2b95fe7f8dc529203ddfec58edb063fa9b2871f a668fed1eb68806abfb021913786168d124de47b25da470e7b57f56bf8556891
 lib/codeql/rust/elements/internal/MatchExprConstructor.qll 0355ca543a0f9ad56697bc2e1e2511fa3f233bc1f6344d9e1c2369106901c696 78622807a1c4bff61b751c715639510146c7a713e0c4f63246e9a2cf302f4875
@@ -306,46 +294,35 @@ lib/codeql/rust/elements/internal/MethodCallExprConstructor.qll a1b3c4587f0ae60d
 lib/codeql/rust/elements/internal/MissingConstructor.qll aab0b7f2846f14a5914661a18c7c9eae71b9bde2162a3c5e5e8a8ecafa20e854 8f30b00b5b7918a7500786cc749b61695158b5b3cc8e9f2277b6b6bf0f7850a0
 lib/codeql/rust/elements/internal/MissingImpl.qll e81caa383797dfe837cf101fb78d23ab150b32fef7b47ffcc5489bfcd942ac3e 9f3212d45d77e5888e435e7babd55c1e6b42c3c16f5b1f71170ac41f93ee8d0b
 lib/codeql/rust/elements/internal/ModuleConstructor.qll 31cc83c9d8f25ac07375d19e568f05c068e1f5aa205ff3d9ac31c2510e6f8468 8a70f3f1c18ff87f17e6baf2f05ccaed55c70469288192fc39ef0bb5531b8c0e
-lib/codeql/rust/elements/internal/ModuleImpl.qll bbff32cadbad54bdb613df8c1ac6da8cd2a80d0576361b843f1529e6c63b1938 7342473026561b8e4923625a083ba52c31d3b6797f9061accd1a712598244410
 lib/codeql/rust/elements/internal/NameConstructor.qll a760134c6d4fc785746e1a5dc042a6bf25b8adaa3947a6897c31e50fd91dd5fd 1359f903d57112bcc1f62a609febb288301bfa810e569aa12e1045fd48b5b5c9
 lib/codeql/rust/elements/internal/NameRefConstructor.qll 5ff6eacc614fd41f98b54cbb4960a07a1471cf4ea291758d33e54a48fd5d1bc4 c538d65414a24dfdbeb49cfd997588227559ba038f0b55d14bb5d89ed1a016f2
-lib/codeql/rust/elements/internal/NeverTypeConstructor.qll 6a86bff9d885eddf39a159698710def40d693ccfd0888aefd090a283cb59ae95 9c51d6569f267dde5597067a8470d19d7714304399de4f730e7b85ca21feee20
-lib/codeql/rust/elements/internal/NeverTypeImpl.qll 8c7464cb76f9d081dab318d743817d87ecd69672f382d27323ade94c82e8e0f6 55351661214854bbf7faed6c7d17d598459d4e88eaba130a9b3a9f43f6665c37
+lib/codeql/rust/elements/internal/NeverTypeReprConstructor.qll 2e0a9c75e389e9ef41a18dd9b5d6c29ffe1d1d633e51ef1de90ec553236d201a 61ea87802fd1c3a68e864ccd76657253a228b06471e4c55bcf94ca2be554f866
 lib/codeql/rust/elements/internal/OffsetOfExprConstructor.qll 616e146562adb3ac0fba4d6f55dd6ce60518ed377c0856f1f09ba49593e7bfab 80518ce90fc6d08011d6f5fc2a543958067739e1b0a6a5f2ed90fc9b1db078f0
 lib/codeql/rust/elements/internal/OffsetOfExprImpl.qll e52d4596068cc54719438121f7d5afcaab04e0c70168ac5e4df1a3a0969817a6 6ab37e659d79e02fb2685d6802ae124157bf14b6f790b31688f437c87f40f52c
 lib/codeql/rust/elements/internal/OrPatConstructor.qll 4ef583e07298487c0c4c6d7c76ffcc04b1e5fe58aba0c1da3e2c8446a9e0c92b 980a6bd176ae5e5b11c134569910c5468ba91f480982d846e222d031a6a05f1a
+lib/codeql/rust/elements/internal/ParamBaseImpl.qll fe11999c728c443c46c992e9bed7a2b3e23afa16ae99592e70054bc57ae371b8 df86fdb23266bdfb9ed8a8f02558a760b67f173943b9d075b081229eb5844f66
 lib/codeql/rust/elements/internal/ParamConstructor.qll b98a2d8969f289fdcc8c0fb11cbd19a3b0c71be038c4a74f5988295a2bae52f0 77d81b31064167945b79b19d9697b57ca24462c3a7cc19e462c4693ce87db532
-lib/codeql/rust/elements/internal/ParamImpl.qll 8a5101559f5d636b60ab80237057944b537823ce054d760c3dbd58b2acf05a46 e7a08cefeb6a290a975899045b7b19a9624f5a2b0946cba0866b1854cc0c0fb0
 lib/codeql/rust/elements/internal/ParamListConstructor.qll 3123142ab3cab46fb53d7f3eff6ba2d3ff7a45b78839a53dc1979a9c6a54920e 165f3d777ea257cfcf142cc4ba9a0ebcd1902eb99842b8a6657c87087f3df6fe
-lib/codeql/rust/elements/internal/ParamListImpl.qll 0ed6e9affe1dc0144641502292c2ddd51958fe3d503419caf15198176e3a4174 92d053cc5fdf40a2d98acb665083b5da15403d7da205779a97a4ee66fac0add4
 lib/codeql/rust/elements/internal/ParenExprConstructor.qll 104b67dc3fd53ab52e2a42ffde37f3a3a50647aa7bf35df9ba9528e9670da210 d1f5937756e87a477710c61698d141cdad0ccce8b07ecb51bab00330a1ca9835
-lib/codeql/rust/elements/internal/ParenExprImpl.qll 185e7c0f8f377f62a7ccf1c0d168caf500afd0654b82d47569bfcb97e368a26d 25a41998ce0ff3490d677676bf02fea1861d6c01db99a02fc940cc37ae580db6
 lib/codeql/rust/elements/internal/ParenPatConstructor.qll 9aea3c3b677755177d85c63e20234c234f530a16db20ab699de05ca3f1b59787 29f24aed0d880629a53b30550467ade09a0a778dbf88891769c1e11b0b239f98
-lib/codeql/rust/elements/internal/ParenPatImpl.qll 39c45b3736c4d0329af7a1eec28a8470c3f244efd58a6ba62af482a0e9b4a842 d8aa9e6f8987666cd51cb65f81700d3b4584d3dc7d070836e52a9bc64e572d9e
-lib/codeql/rust/elements/internal/ParenTypeConstructor.qll d62e656a4a3c8ffd4eb87d49585a7a3bfb5dbe3826fbcbd11cb87b46f34c19ae febf6535965afa0f6eac4d2b08730f5a07bbb36a7434abe0a7663d7264961a3f
-lib/codeql/rust/elements/internal/ParenTypeImpl.qll 6f7b4fade4ac0af69bf9766ee7d73da3da1742ba8a7c12d2a067b71c7f96d849 f065ea466111a5abca33d97b9878ef2fcc221f286fc65bec87f3a9c2fd5d57fc
+lib/codeql/rust/elements/internal/ParenTypeReprConstructor.qll b3825399f90c8546c254df1f3285fe6053b8137e4705978de50017be941c9f42 696fa20ce5bd4731566b88c8ea13df836627354d37cc9d39514d89d8fb730200
 lib/codeql/rust/elements/internal/PatImpl.qll 37c9b1da7aa625117644e2cd74ec0b174f69a38cf66926add01786a05d5ad2ad 143685a0b4873fa0b73b204285dca956e59b32d527bfac6cc336326d244994b7
 lib/codeql/rust/elements/internal/PathConstructor.qll 5c6354c28faf9f28f3efee8e19bdb82773adcf4b0c1a38788b06af25bcb6bc4a 3e2aeef7b6b9cda7f7f45a6c8119c98803aa644cf6a492cf0fce318eba40fe8f
 lib/codeql/rust/elements/internal/PathExprBaseImpl.qll e8b09447ee41b4123f7d94c6b366b2602d8022c9644f1088c670c7794307ab2e 96b9b328771aaf19ba18d0591e85fcc915c0f930b2479b433de3bfdd2ea25249
 lib/codeql/rust/elements/internal/PathExprConstructor.qll cf6e0a338a8ed2d1042bdee4c2c49be5827e8c572d8c56e828db265d39e59ae3 36a3d1b7c5cc2cf527616be787b32071b9e2a6613a4f6b3f82e2a3b0e02a516f
 lib/codeql/rust/elements/internal/PathPatConstructor.qll 966c4ea22218ef71e000d7ce8dd5b570c39ad96b9239a3aa8a38292e2a9f36d2 8a1f348e9257ffc6e6bedcd70389b8e7ec2a3ed6e7b3733744ddfab284826e57
-lib/codeql/rust/elements/internal/PathPatImpl.qll 6ab5b5959cfd94e74f60422cbdbd764a5f51ff541db428938c36ba3a512d1d6b 47585157460e8384047de307b0b05deaab758d0f07fd0183d874f7bb9d8bda4b
 lib/codeql/rust/elements/internal/PathSegmentConstructor.qll 2d9639e42035dc7e73b7d6ddb8a977beadc6b4492dee4292b2f85b4409344441 c337fc3b9ef56366428772563e3f25f711474d16e860d3e89c1395a95d9e83e7
-lib/codeql/rust/elements/internal/PathTypeConstructor.qll 8949742c7ab7fcfa3a3f6469e87355a6888931ab9ac7a6a07d2bd51e3fdf8283 fb1a402e94e9a1f33b7757338d7e95b107933339615a4fe86de33e41206dd94a
-lib/codeql/rust/elements/internal/PathTypeImpl.qll 0e3b85df054d1194505796e457ee31a8dac2a2a77284c077cbf1a3bfc179294e c198d4fdf8d1d55f1cf57685a9ad2adf88cc2d6d4f84bafa1e9f039192761399
+lib/codeql/rust/elements/internal/PathTypeReprConstructor.qll e05e7be13d48e7f832e735254777692d4be827a745b1fd94b9649d46fe574393 4aa1e6935a4479b61f205265cbbba01ce96d09a680c20d5decf30d1374d484d4
 lib/codeql/rust/elements/internal/PrefixExprConstructor.qll 90c50b0df2d4b4cbf5e2b7d67a9d243a1af9bfff660b7a70d8b9c7859c28bca7 1a1b5ea1f06ed8d41a658c872e8e1915c241a7c799c691df81b9a7b55d8f2f1e
-lib/codeql/rust/elements/internal/PtrTypeConstructor.qll ee3c4326ea3f198d2537a914dd6eb51d0cf247310f037e13e87632fbd6cfb50a 3814218b5271f3c6c45b52082cca2a3250a2573abced43fe53e1b4145374afe3
-lib/codeql/rust/elements/internal/PtrTypeImpl.qll ff4283ffab39b4a3c0e55e7d655dfdb846171cde0907bf1f893c86b35d2c1135 e54d3a6fb0b5a1484f00fd5a4631455902bab80642c3bb076e538ddcc29a85a4
+lib/codeql/rust/elements/internal/PtrTypeReprConstructor.qll c8bd3502dc23429577fbff0fe3e3c78b812b2237b2bb65862c137083fdaa7a4a 4d5c135be30f71a3712acbc22bdb6c425fa6463043a9ee64543da31151d68366
+lib/codeql/rust/elements/internal/PtrTypeReprImpl.qll 82bb14c7c5764aa6c829d463ed7fb2a8a936881e6f499c8d02fb0964d2f663e6 0a297e11635a7eb7a29989e7ce867f7ac38bc45b6796a0c823c88784def52449
 lib/codeql/rust/elements/internal/RangeExprConstructor.qll a0aa90a1c38c5deea56475399016afae2a00a858b961fbbab8ddeb3bc6a08103 0ddf1bcf28aafc56d7334e6138fb268f9b36a429e4cbdd982cd8384e0644076b
-lib/codeql/rust/elements/internal/RangeExprImpl.qll a6ff92a27e44c2184f5c2d8483de1d0d4a77eb7a5154ff93a8f3a9fc8b63e561 d53d44bc1c1ae426f208595002adcddb88643e1027bbee7445095ca09e433331
 lib/codeql/rust/elements/internal/RangePatConstructor.qll fe4345cb41d970ab64196ca37eccb26e5b9cf85fab4253cacfd2b31de03bd070 1d09d5ec8203d76aed2dfb7e7f14c0c07d6559c8f589e11860fff8a2c682c1a6
 lib/codeql/rust/elements/internal/RangePatImpl.qll ef11ab2c002896036553231741a7cf896fafa09e22e920e15661b9cbe4393cae 24ac2dcce3055a77f3a5e0b38cf13aebefd2eeaefa53674ff144a6225634ac0d
 lib/codeql/rust/elements/internal/RecordExprConstructor.qll 742198bd8223902b5625b4a574a9e3539a8b6cf8e48eecc57cc2de4e980fba6e 0a99e454e234e8b7b59dc11b167172a5fcd31b8a5282349956d6fd861ec735df
 lib/codeql/rust/elements/internal/RecordExprFieldConstructor.qll 11620bc4e2dc7b3903be764cd9510a8e002892722b502876cf3467994aa7a63c e42e50747dd9453a44705b2d6a05e7a4a8c6debed988a0335a774a547d8f7157
-lib/codeql/rust/elements/internal/RecordExprFieldImpl.qll 8af196cbaeeb7997e933fde9ddba50ec099df51f66e03501f00157f238505fe7 29ae10546577a354b0439876ce5deb5ab13455028f02c01fe3903b11eaee35e2
 lib/codeql/rust/elements/internal/RecordExprFieldListConstructor.qll 3a0d6ec872792c400d3a0a5ed1c5051b248a597a4b17ada1a078ea5d972b6721 52bae8222e7aa5bc89b73bec3fd1c3c1de0fe11bf30ccf5668454f63fbfc9b83
 lib/codeql/rust/elements/internal/RecordExprFieldListImpl.qll 1210c23c0495f5d1a72409afc8c559f8da2b8c71340ff2944af9d1f684d0a856 fea96b053cad4135ab09b1c070a4c9f26507dd890a62c30772cf3e2358686640
-lib/codeql/rust/elements/internal/RecordExprImpl.qll 233b3f7ee8dbd1e5431bea5436c6b7ee38e631c041111dcf53e45c6c4c08a6cf 9537497edb739c535d75ce80122f597ad93241bff5399b1dae17a7bfff1c15cd
 lib/codeql/rust/elements/internal/RecordFieldConstructor.qll 9fc05f5101e48a45a028c479b35ec3d2f1a3cc33f0938667fcb813c5a4ab9526 98791dcf7f3209524f6132f9c26980e499cbcf94c1559e95c67544732245f05b
 lib/codeql/rust/elements/internal/RecordFieldImpl.qll 2612dae3c95c9064420a3494872213f7fd7a3e1133243f4adea8a30808a209ae 143b75bb539a1bfea16e1c764a1f549522ef9c8d6d5de3fef377bbf67ba42075
 lib/codeql/rust/elements/internal/RecordFieldListConstructor.qll 9f1d916f3784092dcbff7224451c8f4f0daf6f8293a466b0a30ec9b92cd41358 8aafe377714a134287362c4b96439c1c6baa5a31c2c36a544bd5f73e9213477a
@@ -355,30 +332,24 @@ lib/codeql/rust/elements/internal/RecordPatFieldConstructor.qll 6e1880ed05401b39
 lib/codeql/rust/elements/internal/RecordPatFieldImpl.qll 04bc31b857c8250096d9d1bf3fad1e556a28d83bb3f3b48a3f049048d1e6785f 5853105e55650d05a4b196f17b89baf12b898df0a010e4f88289ce01d16a0379
 lib/codeql/rust/elements/internal/RecordPatFieldListConstructor.qll b8f0ef9b75ffe6be6ce7e601d528f0a1b871123c63e39cead3fd13b8bd4f54b7 166f07c708ab8b3de6bfaf193bac93081b2aacad046aa86de7441085dd20a8c5
 lib/codeql/rust/elements/internal/RecordPatFieldListImpl.qll 2d1dd9910480eb65c59fcef2e1576ce639be85c35d90e4bce721ce22ec742ba3 1e788a2d7d00e9f96dbf7e93d3a18d5bfb4d7749194ff8e9810e9053fa88a94b
-lib/codeql/rust/elements/internal/RecordPatImpl.qll 3c7086be84e336c069f4c7b538c7ad32a7728e7fbf42e4dc7f04c4c99d393c0d 8020215f38639965398c62ddb36c3560579d63928e71e0d773b254e121a68cc3
 lib/codeql/rust/elements/internal/RefExprConstructor.qll 9ad08c0f3d980a56a2af8857cb84db589941d20ab3ae5c8ece004ccaccaaf950 4cac3ace31b7ed77a72e989fce9cdbae2247f03c28a3f0c50d67385d02c7f193
-lib/codeql/rust/elements/internal/RefExprImpl.qll 56ed831a3b30ed375e7369b0a60b9b7635a1b00f058364a6b15078031a85af5f ca7e772b409514363e49d56a174ae9bd2e076755cbd09c4e7e5b732d09acdb25
 lib/codeql/rust/elements/internal/RefPatConstructor.qll d8b88c2c468b08072f6f853306eb61eb88ee1e6c5cfb63958f115a64a9715bb3 0c1d6a8af6a66912698acce47e89d4e3239e67f89c228a36a141f9c685c36394
-lib/codeql/rust/elements/internal/RefPatImpl.qll 3e06e8130d412b47267497097cffc9f4b930b9e54bc90465ab5ac620fbe52048 b8ac844ec99f30605ce476f89ced4fb1159d2df0df43c631f60b3c868e0e1fd7
-lib/codeql/rust/elements/internal/RefTypeConstructor.qll e1952aa69586b440f878400a52d09b2d12d5a29dbe9651360344631cb9493cd4 e4ae45e89472dfd4547d647c75e1635cf065a7d221ed60ed34554f265c0c5405
-lib/codeql/rust/elements/internal/RefTypeImpl.qll f72b760a8a26be21170435da2cb2981638513617fd82742f45f38bc437d9f2c4 f32df49f0b6df85ca5fc4393ccd341ac4304b4947a282ccea48468a26837ef3d
+lib/codeql/rust/elements/internal/RefTypeReprConstructor.qll 8e7012b456ebf1cc7a2c50892c0fffd51f0d5d83e417e1d4cabd4d409e3dddc0 4f3c6368bcea5e8c3f0b83591336f01331dc6dabf9c1e8b67de0fc4d640f65f0
+lib/codeql/rust/elements/internal/RefTypeReprImpl.qll dacd6fa69d2ed4b8899c64256c543b735c02e94823268e3c73bd29b528c855a1 f574ecfa50e1ffee5787422c7babdf19121bd8e31e3520f776b1dd706349d6b6
 lib/codeql/rust/elements/internal/RenameConstructor.qll 65fa2e938978d154701e6cac05b56320b176ee014ef5c20a7b66f3e94fd5c4a7 dfc0ff4606b8e1c14003cc93a0811f4d62ec993b07ff3c1aa0776746577ed103
 lib/codeql/rust/elements/internal/RenameImpl.qll 4f5943fbda4ec772203e651ed4b7dd1fb072219ddc0cb208c0a0951af5e72bd6 b9854cdcf02e70ee372330a4e0bfdb03012bc81af79dd12af2a567fd7fc4672b
-lib/codeql/rust/elements/internal/ResolvableImpl.qll 7599625454fe81c3490a122943363a2a2522a7877b78a80649e93155a418fedd 442072c3d70bdaababd7de8bc6c9382f4a50bab41d13759dcd1a5bee9ea32e49
 lib/codeql/rust/elements/internal/RestPatConstructor.qll 45430925ddf08fba70ede44c7f413ddb41b3113c149b7efc276e0c2bf72507b4 25c678898d72446e7a975bb8b7f2fde51e55b59dbd42f2cca997c833b1a995f1
-lib/codeql/rust/elements/internal/RestPatImpl.qll 1b83464367e5fdc28b0b3946ae74c67c64d30b286c39268b4118337539250e51 83a03308cba4cb3344d48f0a0730b1d3e41a73f16f729d39dc2bae6d3f57f232
-lib/codeql/rust/elements/internal/RetTypeConstructor.qll a96d803c6e4b40be49cfed0853a3e04ae917c47351e5c880fcab06eddf1af9cc d06a0a191cb14c270c0441ffc3d289263808170dcbe05e01847a35ac9d61dfb3
-lib/codeql/rust/elements/internal/RetTypeImpl.qll 0e96f1075ccade28ce5664ab0f5c2e98984ae1d0ed708bc02e40e882672d9e2f 350725d16bcb1e8911bfdd87d9dd21be73ec66d23c2a35827c8c8525c48dc885
+lib/codeql/rust/elements/internal/RetTypeReprConstructor.qll 6dcb56c92a13f5ca2c9a8344bc05638cc611543896c578cd6ca185054f155537 3fe34953ba397dc31533bd28b48df76693e86b51c4a89c26ad4dfdbd816a0874
+lib/codeql/rust/elements/internal/RetTypeReprImpl.qll 394f7d8afe14776b4c629f8b6b98145ad75d62704856d2561a9d365abcf86621 753c445376da05ea2d3946254b767245cf54616bd8372f6fb3e82d4879e66f35
 lib/codeql/rust/elements/internal/ReturnExprConstructor.qll 57be5afbe20aa8db6e63c1f2871914c19c186730ad7dccaa424038c6305730d5 4d3c4f2e9b38a4b54ff26a0032455cdcca3d35fec201b6c932072a9e31fbb4fe
-lib/codeql/rust/elements/internal/ReturnExprImpl.qll eef4960a8c27eaa0540d048fe88893cfe9a6ac377a770cc23d72ebe05d5782f1 b7f35650d80f2f8b4893f0091fea74646341af406b6248f75c477112aca96dea
 lib/codeql/rust/elements/internal/ReturnTypeSyntaxConstructor.qll 8994672e504d1674e5773157d0ad8a0dc3aad3d64ef295e7722e647e78e36c11 abe7df754721f4ff7f3e3bb22d275976b2e9a1ef51436a461fe52ebd2d29cff1
 lib/codeql/rust/elements/internal/ReturnTypeSyntaxImpl.qll d47a3dcfcc2b02a6a9eaeefe9a7a4be2074ecd2019da129dda0f218bc3fbd94b 87198db7c0620ed49369da160f09287015e0cd1718784e1ba28ec3ec5a0bb4a8
 lib/codeql/rust/elements/internal/SelfParamConstructor.qll a63af1d1ccde6013c09e0397f1247f5ab3efd97f3410dd1b6c15e1fb6cd96e54 0d8977653c074d5010c78144327f8b6c4da07f09d21e5cc3342082cd50107a81
-lib/codeql/rust/elements/internal/SelfParamImpl.qll 5408738c40f070e0cea83a6a38d638ac7a134b5a055ecf0cccc035af58ff9b36 604922319ecf9a9405fdd0fe953169162ee2c8cca36349b49163a2895c53ed40
+lib/codeql/rust/elements/internal/SelfParamImpl.qll def23beb8926f498fc81b7b44489001b35d704da1a2058c84c23b329e8bc2f49 c9be1e8fa2c4e23b314a4d0563be6cffcbab6f03d08b77a366f7638b28a09de4
 lib/codeql/rust/elements/internal/SlicePatConstructor.qll 19216ec9e87ca98784d78b29b8b06ea9ac428e2faa468f0717d1c0d0a8e7351c 458e5be76aa51aec579566be39486525ec9d4c73d248cb228da74892e2a56c08
 lib/codeql/rust/elements/internal/SlicePatImpl.qll c6176095360e3b23382557242d2d3ff0b5e0f01f8b1c438452518e9c36ff3c70 644ab41a59a619947f69f75e2d0807245d4ddefc247efaeab63b99b4f08c1cc1
-lib/codeql/rust/elements/internal/SliceTypeConstructor.qll 643e7a2ae261e8f62de8bc2886efddcc096e0c7e8159c0b9e87b24d0509e10d0 719545abb0ccf6e8a203ec9c9f75109c5ab0593c838e2f90e388858680ec62f7
-lib/codeql/rust/elements/internal/SliceTypeImpl.qll a753aa9823b0288d3e8085faedb3a6bb750e98845a11a28b69796aa453c09c8e 343f5d4638b52e6eb0082000e1b147fe36173dcbfc035263819480b430c55127
+lib/codeql/rust/elements/internal/SliceTypeReprConstructor.qll 4576f203450767bfd142b1d6797b6482bb78f7700b6b410475b182d5067504ae 2b5aeaf91d5ea10e2370fa88b86bce7d0691d6d00f18ab8e1a1be917bb1619bb
+lib/codeql/rust/elements/internal/SliceTypeReprImpl.qll e97dd1e8ff1c5d79f845d9bf3e3f190d4497bea93a806dbac97d62ecdffff7da d6c33bfcd3e8bf1cdf96ef95e25ac5dad19f20233f7f4f95c038f83ebb699c4e
 lib/codeql/rust/elements/internal/SourceFileConstructor.qll 1dc559887ea7798774528b5505c8601c61030c17480f7ffca49b68b76fcc0321 75a635b88622e3110b16795bd12ca6fc4af176c92d6e441518d60aa47255edc1
 lib/codeql/rust/elements/internal/SourceFileImpl.qll 0f844062989b363045f16488297f617d592cd90762befb7403f246d0b94a29c2 f38cabe8c34049f4454136bf7281aaef92d411dc41e686856b2058298b6cebc0
 lib/codeql/rust/elements/internal/StaticConstructor.qll 6dd7ee3fd16466c407de35b439074b56341fc97a9c36846b725c2eb43fd4a643 5bf5b0e78d0e9eb294a57b91075de6e4b86a9e6335f546c83ec11ab4c51e5679
@@ -394,7 +365,6 @@ lib/codeql/rust/elements/internal/TokenTreeImpl.qll c61574f2b551db24640258117e0c
 lib/codeql/rust/elements/internal/TraitAliasConstructor.qll d2f159cac53b9d65ec8176b8c8ccb944541cd35c64f0d1ceabb32cd975c000bf 6564981793de762af2775cc729e25054ea788648509d151cbfdbdf99fc9ed364
 lib/codeql/rust/elements/internal/TraitAliasImpl.qll f338dba5388973ec0c5928d4c60664737f75a93d0c7db5fb34053bc41c107641 f2e437469e4ba1d8dd321bc670978e7eed76508e728d1e08e52ddcf52a461d3a
 lib/codeql/rust/elements/internal/TraitConstructor.qll 1f790e63c32f1a22ae1b039ca585b5fe6ffef6339c1e2bf8bca108febb433035 535cebd676001bfbbb724d8006fa2da94e585951b8fd54c7dc092732214615b5
-lib/codeql/rust/elements/internal/TraitImpl.qll 776a0c10c944146b89d616e3bf1311502de9e1e84f0c9d5d7de5aecfc97b87e3 3795d920e98620b30f7e2c218cfb57ae91b37956f9165325b5da6705df8beffa
 lib/codeql/rust/elements/internal/TryExprConstructor.qll 98e3077ebc4d76f687488b344f532b698512af215b66f0a74b5cea8ed180836c b95603c10c262911eeffdf4ccba14849e8443916b360e287963d5f2582d8e434
 lib/codeql/rust/elements/internal/TryExprImpl.qll 00635685db339557cfb89fad0bfc134e53efc6d88c68cce400b72c2dd428ef9f 43559b46e45c009f985b58896b542881b81a3e6b82a6f51b784e8a712ae3da2b
 lib/codeql/rust/elements/internal/TupleExprConstructor.qll 71c38786723225d3d90399b8a085b2b2664c62256654db9e1288fadd56745b9d 639ad70b49ebadc027127fbdc9de14e5180169a4285908233bc38ccac6f14110
@@ -406,9 +376,8 @@ lib/codeql/rust/elements/internal/TupleFieldListImpl.qll ec17ddfe1d03210b7737f9c
 lib/codeql/rust/elements/internal/TuplePatConstructor.qll 2a5e83ad5b8713a732e610128aeddf14e9b344402d6cf30ff0b43aa39e838418 6d467f7141307523994f03ed7b8e8b1a5bcf860963c9934b90e54582ea38096a
 lib/codeql/rust/elements/internal/TuplePatImpl.qll 4adb38f0f8dae4ff285b9f5843efb92af419719a7549e0ff62dc56969bd3c852 3f622130771d7731ed053175a83b289bab1d1f5931526c4854923dbcec7e43f1
 lib/codeql/rust/elements/internal/TupleStructPatConstructor.qll 9d68f67a17a5cec0e78907a53eccfa7696be5b0571da4b486c8184274e56344a 3ffa29f546cd6c644be4fecc7415477a3a4dc00d69b8764be9119abe4c6d8b9e
-lib/codeql/rust/elements/internal/TupleStructPatImpl.qll 896f001d82938bd018516a2b59ba5ad76350edb6b9747ed2ef5b96760aa16388 0552f9c0361d14be9896cbcfda17d8884d03a82c4f23c511a8de77fe71cfbb9f
-lib/codeql/rust/elements/internal/TupleTypeConstructor.qll 88eaec829cd4dcc6a152c7a335b1d365702ef410e46d9c04806fe53f06325b23 044fd0aca067bae82eb8ac448b7bcc66bc736e7e0ab8b770ee126381888fac3d
-lib/codeql/rust/elements/internal/TupleTypeImpl.qll 4d570a1d6c3d69d8f62f125c71f67dd90e982801905716d50292f2e652156948 1dcefae60448b21f85d46d252e314d67a9f2a90171e56351e08e2bc0a4077fb8
+lib/codeql/rust/elements/internal/TupleTypeReprConstructor.qll 80c31c25fd27e330690fb500d757a4bbd33f226186d88ea73bfe4cf29a7db508 d572a72fa361990a3d0a3f9b81d1e966e2ba1ac0a60314ec824c1b8b2814c857
+lib/codeql/rust/elements/internal/TupleTypeReprImpl.qll 149719039d66f0cfb620e18d7af7e0995c5125a91f3883ad979e9ad480136d6e 310ef7e9e1e42853aa6a2c7bd9b8155773ff2b091d853059c7e04c8d5e30d723
 lib/codeql/rust/elements/internal/TypeAliasConstructor.qll 048caa79eb7d400971e3e6d7e580867cbee4bd6b9d291aafac423aa96c321e76 d1d1e33a789ae6fa1a96af4d23d6376b9d82e14e3cbb777963e2d2cb8b22f66d
 lib/codeql/rust/elements/internal/TypeAliasImpl.qll 43af0e8e3df8bca5b4bd48ad870cb619283710ec5b86085d85874a67cac3cb6e 75f1f8ba2bd722d55a84178cf338d34f7c57a156f8cc014bd2b29ee4da5ea9e2
 lib/codeql/rust/elements/internal/TypeArgConstructor.qll 51d621e170fdf5f91497f8cc8c1764ce8a59fde5a2b9ecfad17ce826a96c56c4 a5bbb329bde456a40ffa84a325a4be1271dbde842c1573d1beb7056c8fb0f681
@@ -419,14 +388,12 @@ lib/codeql/rust/elements/internal/TypeBoundListConstructor.qll 4b634b3a4ca8909ce
 lib/codeql/rust/elements/internal/TypeBoundListImpl.qll 23557f993a1de15a3b08652f53fd99dea8b3af4b8a65d7331e99f50735a7942c 8d91dbad037268ec37907ef6c2b0e927f648551afb57f706ed4d79d6aad5f5d6
 lib/codeql/rust/elements/internal/TypeParamConstructor.qll a6e57cccd6b54fa68742d7b8ce70678a79ac133ea8c1bfa89d60b5f74ad07e05 0e5f45d250d736aaf40387be22e55288543bdb55bbb20ecb43f2f056e8be8b09
 lib/codeql/rust/elements/internal/TypeParamImpl.qll 9e7169e8254e2d9d13b11a17cbe04e874f72fb67a75c3585e70eddec71ba5c7f b8c862b2cd53bc211caea23261d9832613418aae51f63ef08922d300c2d1f4f2
-lib/codeql/rust/elements/internal/TypeRefImpl.qll cfc08bdcc8e7e588f533c7e64c0c08d317d63cdb50f4cba4b4b3e589b37b0fea b46ee7de9b5e9894807004e1bedf39e7d25912ed79de6ac5adfb37a43aa4804b
+lib/codeql/rust/elements/internal/TypeReprImpl.qll 504b137313407be57c93fe0acee31716a02f91e23ce417e7c67bae2ae9937564 28fa8b680d5cd782c5c5fb048a9deb9b9debd196e3bc7df1129843e61eb342ea
 lib/codeql/rust/elements/internal/UnderscoreExprConstructor.qll 8dc27831adb49c1a47b9f8997d6065e82b4e48e41e3c35bd8d35255cea459905 6c5a5272d37f83f1c1b17475f8adb7d867e95025d201320e20a32dab1f69f7bf
-lib/codeql/rust/elements/internal/UnderscoreExprImpl.qll 4277b23a09a4ba5e53ca2cfbb20eba6a5f66039b6268da79410e0be30332fedd b9ed79468157a7e751f78aa7597165672cbc38191d5f85ecc15cfdaff388a26a
 lib/codeql/rust/elements/internal/UnextractedImpl.qll 5c23df7e448184d76ccab2c22757ace24663b8be2592a3fa2a44bef43159ebd3 77b0c9fe75a307adc08c422cc88423c5349756878793cf9e79c006c83b4c403b
 lib/codeql/rust/elements/internal/UnimplementedConstructor.qll 70b0489fdc75fed389de8203947ed9c8eabb91373a1264eb2c8018ddbb2d9baa 0f2592c1697a2f2f913014ecd73b0e3ff1ec5b038ba1c3a22e7939bf8759e664
 lib/codeql/rust/elements/internal/UnimplementedImpl.qll 06771abc088e0a8fc24032c9d2633618e8e40343ef8757a68cc0a70f1617165a 5738f626f1f4f573fdf7dcd5bd57a0948d290ed89342b9160e95ef3c84044f9a
 lib/codeql/rust/elements/internal/UnionConstructor.qll d650551a1b3ef29c5a770bdad626269cf539ed0c675af954bc847d2c6111f3f6 aca9064ad653a126ab4f03703e96b274587c852dc5e7ff3fea0fec4d45993f10
-lib/codeql/rust/elements/internal/UnionImpl.qll f1765a7a37fb29eff98d67d166c35df4921eafc8cb61c11c7848185535f0497b 9f041f6ee82bd3cda2ddea0ee58d7a996123b1713b9d127f764eb74a9387f685
 lib/codeql/rust/elements/internal/UseConstructor.qll a4f790795e18abc29a50d6fbaa0db64cba781e3259a42cbf0468c24ac66b63e7 2fa288f073ac094a838c11f091def2c790b347b6a1b79407c11b10c73d6bff57
 lib/codeql/rust/elements/internal/UseImpl.qll ba779517c3c928ab6e794360b6344829e84ec6da5e1de1b03b4eaf8bdae58ce9 0f4ead9eecb584eb9827502276ffe8cb1da0d2fa4b8f660d2afc26ac4e0fba86
 lib/codeql/rust/elements/internal/UseTreeConstructor.qll 3e6e834100fcc7249f8a20f8bd9debe09b705fcf5a0e655537e71ac1c6f7956b cdbc84b8f1b009be1e4a7aaba7f5237823cea62c86b38f1794aad97e3dfcf64b
@@ -444,42 +411,44 @@ lib/codeql/rust/elements/internal/WhereClauseImpl.qll 59d33533e641ce3851e493de30
 lib/codeql/rust/elements/internal/WherePredConstructor.qll f331c37085792a01159e8c218e9ef827e80e99b7c3d5978b6489808f05bd11f8 179cad3e4c5aaaf27755891694ef3569322fcf34c5290e6af49e5b5e3f8aa732
 lib/codeql/rust/elements/internal/WherePredImpl.qll aad95f448ca051d5dcd462429fa1ca95dcec6df2e70b6f64a480bd6839307581 411a66a5d866aa8cb4911c5106849adb103a063e1b90a9ecc5d16db3022bb1f8
 lib/codeql/rust/elements/internal/WhileExprConstructor.qll 01eb17d834584b3cba0098d367324d137aacfc60860752d9053ec414180897e7 e5e0999fb48a48ba9b3e09f87d8f44f43cc3d8a276059d9f67e7714a1852b8a5
-lib/codeql/rust/elements/internal/WhileExprImpl.qll 5e716498402be3a1a8ed3594e13a03938bb793ac80f2a648bc93c0d746028d8b efcee38fe5e984a690c33f8bfdc78c677c2b0cdc5902525e2196a68fdabb6823
 lib/codeql/rust/elements/internal/WildcardPatConstructor.qll 5980c4e5724f88a8cb91365fc2b65a72a47183d01a37f3ff11dcd2021e612dd9 c015e94953e02dc405f8cdc1f24f7cae6b7c1134d69878e99c6858143fc7ab34
-lib/codeql/rust/elements/internal/WildcardPatImpl.qll 01e5fac111cce3bb139fc290dbdb2a80e7369a90952178228efeb025915d40b7 875e91fb1354ab8d94d5fa426b63714c70904f53d7bab15158fcbc290c62a0f1
 lib/codeql/rust/elements/internal/YeetExprConstructor.qll 7763e1717d3672156587250a093dd21680ad88c8224a815b472e1c9bba18f976 70dd1fd50824902362554c8c6075468060d0abbe3b3335957be335057512a417
 lib/codeql/rust/elements/internal/YeetExprImpl.qll e8924147c3ebe0c32d04c5b33edfd82ae965c32479acfd4429eeab525cf42efb b2debcfa42df901f254c58705a5009825ec153464c9ab4b323aa439e5924e59e
 lib/codeql/rust/elements/internal/YieldExprConstructor.qll 8cbfa6405acb151ee31ccc7c89336948a597d783e8890e5c3e53853850871712 966f685eb6b9063bc359213323d3ff760b536158ecd17608e7618a3e9adf475f
 lib/codeql/rust/elements/internal/YieldExprImpl.qll af184649a348ddd0be16dee9daae307240bf123ace09243950342e9d71ededd9 17df90f67dd51623e8a5715b344ccd8740c8fc415af092469f801b99caacb70d
 lib/codeql/rust/elements/internal/generated/Abi.qll 87e1ea6b2a8ebf60e1c69176632740e4e27fc56c3f173939b098ba376562b5fa 94b2121e71c4ec94d53a79f972c05a8484ef0d80ed638f53031e7cf4dc5343d5
+lib/codeql/rust/elements/internal/generated/Addressable.qll 96a8b45166dd035b8d2c6d36b8b67019f2d4d0b4ccff6d492677c0c87197613e d8f1ce29feafc8ff7179399fc7eac5db031a7e1a8bc6b2cd75cfce1da3132e9b
 lib/codeql/rust/elements/internal/generated/ArgList.qll 1b75b2d7dcf524eb468a0268af6293e9d17832d6bedf3feec49a535824339b57 2bcaf464454bdfdda45fbd24d063f0f1df0eb69f684197b37105adc8f72cd1ea
-lib/codeql/rust/elements/internal/generated/ArrayExpr.qll 2ca97b602a707fe2c566002d8709792bb166ae52fdb7da28d7c4b8e0d66dd4bc 1cae1ef017171ec9a1ca28b4f2993b1ee26d22b51b3b04816d9b4e89fdff1fb3
-lib/codeql/rust/elements/internal/generated/ArrayType.qll 225ac477f67865d72b2a2e17420f5e52c25452a3c14f7ff367f873a859f97783 0030e3bf296dd5b69ea912fc85dc7120b060780033083127257cdca792dc3f4b
+lib/codeql/rust/elements/internal/generated/ArrayExpr.qll 73806a0de8168b38a9436fa6b8c6d68c92eeab3d64a1ae7edfff82f871929992 7ad998cdd8f4fed226473517ad7a5765cb35608033047aad53bf8aa3969fd03b
+lib/codeql/rust/elements/internal/generated/ArrayExprInternal.qll 67a7b0fae04b11cf771727ff39a123fb2d5ce6e2d650d32478fcb33a26ed5688 15833405fa85f6abe0e5146dac283cb5a142a07f08300ccc15a1dae30ed88942
+lib/codeql/rust/elements/internal/generated/ArrayListExpr.qll f325163c2bd401286305330482bee20d060cecd24afa9e49deab7ba7e72ca056 ae3f5b303e31fc6c48b38172304ee8dcf3af2b2ba693767824ea8a944b6be0eb
+lib/codeql/rust/elements/internal/generated/ArrayRepeatExpr.qll ac2035488d5b9328f01ce2dd5bd7598e3af1cbb383ddb48b648e1e8908ea82fc 3ec910b184115fb3750692287e8039560e20bd6a5fb26ac1f9c346424d8eaa48
+lib/codeql/rust/elements/internal/generated/ArrayTypeRepr.qll 0945bea9b40ebf871b9d5ac974e256cda985f05113cac63cf8af48da5e4eaace 4d8b67d3ce117f509f984d03ae0c44533d3880d4687c7614fed1e9eac9ce2e6f
 lib/codeql/rust/elements/internal/generated/AsmExpr.qll b5fef59589c02c17857a4a7f5c7b5efb747a1e98710167efa5c2e88cffd7bcbb b43b297a3b4894e8dd92ef3a23b76f2684c303d41e6030398e69b7754ebea9cd
 lib/codeql/rust/elements/internal/generated/AssocItem.qll aa7c06e001b67e4a59476fa7299e09f8da16c93f91aff0ec9812c64386e7c023 0032b45e34e6aba9c4b3d319b108efa0de8ad679b5f254a1ec7c606877ff5e95
 lib/codeql/rust/elements/internal/generated/AssocItemList.qll c53d95395352bb3568198fd18da62e23511c64f19b5aaae4122bd696d402ebf5 3c244f2f0f053903576cdf2b1a15874dee0371caf9fecb5353aceab3c403f532
-lib/codeql/rust/elements/internal/generated/AssocTypeArg.qll 2a5bff8856c2c87f571629236218d23a7eb10fcc8e8e03f4f6957707972a96f8 1ceb581c640a9b0e9540655aebe7280101f33a6a8ff09d81f7d94ebb4d85c480
+lib/codeql/rust/elements/internal/generated/AssocTypeArg.qll 9a1fef9d51764a5647e540eb5c07b00c5e4738cd12efc887f05ac74962a15a25 ac564fbd6be444faa3b675c3ec3f979b6c72ebadcdd98a92febf3d83231d8982
 lib/codeql/rust/elements/internal/generated/AstNode.qll 1cbfae6a732a1de54b56669ee69d875b0e1d15e58d9aa621df9337c59db5619d 37e16a0c70ae69c5dc1b6df241b9acca96a6326d6cca15456699c44a81c93666
 lib/codeql/rust/elements/internal/generated/Attr.qll 2e7983b2c462750065ed58cc10c62e42012ddf0dd32f5439df7c6d6bf8ff349d e8270d33a50f088a83a2dfaa5b0a63ec775a6c97c8bf3a9383ce7a1ba8fe8fa3
 lib/codeql/rust/elements/internal/generated/AwaitExpr.qll 1d71af702a1f397fb231fae3e0642b3deeba0cd5a43c1d8fabdff29cac979340 e0bfa007bdecc5a09a266d449d723ae35f5a24fbdfc11e4e48aeea3ec0c5147c
 lib/codeql/rust/elements/internal/generated/BecomeExpr.qll 7a211b785a4a2f961242d1d73fd031d381aad809f7b600ce7f7f864518bb7242 17a0388680007871748cfdc6621f700a7c2817b9601e1bd817fb48561e7c63ad
 lib/codeql/rust/elements/internal/generated/BinaryExpr.qll 64e9bd9c571edd6e5f3e7662b956b1d87fa0354ce6fe95da9caf25ac16b66c68 3fca09fdbe879db2ca3293618896a462e96376a2963d15cce3d5b1baac552fcb
-lib/codeql/rust/elements/internal/generated/BlockExpr.qll ccfbdc7bd268735a0424ff08dcf37d0e1fed61d5fe0520593c23f2490d400438 0facad59f6aba13ee0c069b691c99f52c04b723a2bfad4da226190c3c42dcabf
-lib/codeql/rust/elements/internal/generated/BoxPat.qll ec946a3e671ab7417e04b0207967adad004df512c570c4f0780ca5816d12d75f b0e64860855c4e85914042b1a51034899ff7cd1b2c6857188de89310a2726ea3
+lib/codeql/rust/elements/internal/generated/BlockExpr.qll 5a5ddbe34bc478a7bd9b0d07d3b6f017c2d1f20581d859251a963314e6514d1f 9804c30b8b279038b864c52557535f854bd012bacdfe8e5840f1f777c74e52df
+lib/codeql/rust/elements/internal/generated/BoxPat.qll 597bed52f7489e0addce3266f7bee5be7c53d2d1263eceec3a252d041ca0908f b8ccf363ca5f1a988547caf1fd266a55aec7cbf8623578deea99765d264b0151
 lib/codeql/rust/elements/internal/generated/BreakExpr.qll 0f428a8b2f4209b134c2ffc3e1c93c30bc6b0e9c9172f140cefa88c1f77d8690 957b39f38ff6befe9061f55bc0b403c2f1c366dd0cf63b874bae6f8216576d76
-lib/codeql/rust/elements/internal/generated/CallExpr.qll 23ee64e3bf643cd5e6ff705181d2bb31e1aeaffecb5bdce73836172dbf15f12f 34b280139b1f8f70d78e1432392f03c971be392e8cb68d014eb325d0c101bddd
+lib/codeql/rust/elements/internal/generated/CallExpr.qll f1b8dae487077cc9d1dccf8c3cd61fd17afe860585f17ce8b860be4859be7ca4 6034fc03778e38802cdf3a6e460364b74e92912622581b31e6179951022bbbd6
 lib/codeql/rust/elements/internal/generated/CallExprBase.qll cce796e36847249f416629bacf3ea146313084de3374587412e66c10d2917b83 c219aa2174321c161a4a742ca0605521687ca9a5ca32db453a5c62db6f7784cc
 lib/codeql/rust/elements/internal/generated/Callable.qll b0502b5263b7bcd18e740f284f992c0e600e37d68556e3e0ba54a2ac42b94934 bda3e1eea11cacf5a9b932cd72efc2de6105103e8c575880fcd0cd89daadf068
-lib/codeql/rust/elements/internal/generated/CastExpr.qll d6fbf02e9e202254666082a9116634d0eb933177866ac4c0a57b5e9c4bb4b383 477f67773492e3b82695461d56327c9db05a7d1a67e8d192406265f2ce369670
+lib/codeql/rust/elements/internal/generated/CastExpr.qll 427bfd937cd3e737c65aa121aab2a7dc166f82aaacb9a7c41a3d211d4c1dcfb0 642c8c27d4a8752744dadce45814d4e289ce02b67eb2bc2e63ff4c2e5f7825f5
 lib/codeql/rust/elements/internal/generated/ClosureBinder.qll 94c0dcdd4cd87d115659d496c88a98354bc7d4ddc0fa27028003bf7688b99987 d59d713b426dbbdb775df9092d176eea031dac1f14e468810f2fc8591399cd19
-lib/codeql/rust/elements/internal/generated/ClosureExpr.qll 70bb3d961e4dc62ad2c9b80d8cbe1e1d5792eafa00a2b0730c06cf6e8a164105 acb3c5200877fda8dffc65b4aa1d4deeb806e035aefecf4da7f0ce03e0b3a477
+lib/codeql/rust/elements/internal/generated/ClosureExpr.qll 34149bf82f107591e65738221e1407ec1dc9cc0dfb10ae7f761116fda45162de fd2fbc9a87fc0773c940db64013cf784d5e4137515cc1020e2076da329f5a952
 lib/codeql/rust/elements/internal/generated/Comment.qll cd1ef861e3803618f9f78a4ac00516d50ecfecdca1c1d14304dc5327cbe07a3b 8b67345aeb15beb5895212228761ea3496297846c93fd2127b417406ae87c201
-lib/codeql/rust/elements/internal/generated/Const.qll 40464df9d8baacbc85bd137c7d1661684c957c407b2363ea60d90946be93de4c a3316beae55f570a5ca4b1172ef8267d7acb1104cc7a5e9efc58d9fc8224500f
+lib/codeql/rust/elements/internal/generated/Const.qll 03bd9bb84becc0716e12e8a788ab07098e568c58b43b63ed0d333b1c9e227ab7 3168e7b4cb551b9fde74967847576dada05f12a49a1b19c6900e0de32651bcd4
 lib/codeql/rust/elements/internal/generated/ConstArg.qll e2451cac6ee464f5b64883d60d534996fcff061a520517ac792116238a11e185 1dd6d4b073b0970448a52bbe2468cd160dfe108971dbf9ae9305900bd22ef146
-lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll a425a7fd216d35f17a7ff239d431b349721f71f2e52722325755f43df2bb9886 a9aa37ee4f8c9d44ae49c807ac48d5a8a22f7d7d0ae2968ab50371a418ccc48a
-lib/codeql/rust/elements/internal/generated/ConstParam.qll 26f838dbbd7659cdbf464c2107304b66ad0fbd43370d6b649373c3b9fa4f6576 c658951ba92b919278fa445cd66c3b694f42d76bde49daa50a3128e5d44f647a
+lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll 7526d83ee9565d74776f42db58b1a2efff6fb324cfc7137f51f2206fee815d79 0ab3c22908ff790e7092e576a5df3837db33c32a7922a513a0f5e495729c1ac5
+lib/codeql/rust/elements/internal/generated/ConstParam.qll 310342603959a4d521418caec45b585b97e3a5bf79368769c7150f52596a7266 a5dd92f0b24d7dbdaea2daedba3c8d5f700ec7d3ace81ca368600da2ad610082
 lib/codeql/rust/elements/internal/generated/ContinueExpr.qll e2010feb14fb6edeb83a991d9357e50edb770172ddfde2e8670b0d3e68169f28 48d09d661e1443002f6d22b8710e22c9c36d9daa9cde09c6366a61e960d717cb
-lib/codeql/rust/elements/internal/generated/DynTraitType.qll da9dce6347ce385d7468986cf6960b4a6787f017ff5632612a7216ed62bdc9c9 9d0b37221674b597a21bfacbdfc7e08b54381a6adacfe544df154481cd562ed8
+lib/codeql/rust/elements/internal/generated/DynTraitTypeRepr.qll a9d540717af1f00dbea1c683fd6b846cddfb2968c7f3e021863276f123337787 1972efb9bca7aae9a9708ca6dcf398e5e8c6d2416a07d525dba1649b80fbe4d1
 lib/codeql/rust/elements/internal/generated/Element.qll fb483b636180c699181c8aff83bc471b2c416206694f7028c671015918547663 542d1b9ae80c997974c94db3655887186df3921a8fa3f565eaf292dcfdac3c4c
 lib/codeql/rust/elements/internal/generated/Enum.qll 4f4cbc9cd758c20d476bc767b916c62ba434d1750067d0ffb63e0821bb95ec86 3da735d54022add50cec0217bbf8ec4cf29b47f4851ee327628bcdd6454989d0
 lib/codeql/rust/elements/internal/generated/Expr.qll 5fa34f2ed21829a1509417440dae42d416234ff43433002974328e7aabb8f30f 46f3972c7413b7db28a3ea8acb5a50a74b6dd9b658e8725f6953a8829ac912f8
@@ -488,51 +457,54 @@ lib/codeql/rust/elements/internal/generated/ExternBlock.qll c292d804a1f8d2cf6a44
 lib/codeql/rust/elements/internal/generated/ExternCrate.qll 35fea4e810a896c1656adb4682c4c3bc20283768073e26ae064189ce310433c8 fc504dff79ba758d89b10cd5049539fbc766ee9862ff495066cea26abf0b5e0b
 lib/codeql/rust/elements/internal/generated/ExternItem.qll 749b064ad60f32197d5b85e25929afe18e56e12f567b73e21e43e2fdf4c447e3 e2c2d423876675cf2dae399ca442aef7b2860319da9bfadeff29f2c6946f8de7
 lib/codeql/rust/elements/internal/generated/ExternItemList.qll 6bc97fdae6c411cab5c501129c1d6c2321c1011cccb119515d75d07dc55c253b 6b5aa808025c0a4270cac540c07ba6faede1b3c70b8db5fd89ec5d46df9041b2
+lib/codeql/rust/elements/internal/generated/ExtractorStep.qll b83ce7f18009bdd36374260652c2a8a5cd5a9b5404a1c147bbec49ad251e43f3 e6e55595300126f9c5a6fd7bde5321b2a0026b491326114d16fcc2395a1fc483
 lib/codeql/rust/elements/internal/generated/FieldExpr.qll 3e506b5cb93793ec30f56bb637a600db869fcba6181b068516a671d55c362739 7bbf953696d763ad6b210f378f487ba85b875fa115b22c0c0508599a63633502
 lib/codeql/rust/elements/internal/generated/FieldList.qll 43c13c6e3c9ba75a7a4cb870fc4f18752001584d48b9df0734055a6ebb789331 7c51b0b13eb02f1286d3365e53a976ba2655c4dbd8e735bc11c8b205c829e1ee
-lib/codeql/rust/elements/internal/generated/FnPtrType.qll 748d766dbefd19a7d644734c57885eeede66897029bbfe1b87919517f43bfde2 5a7d80acc00e56594ed85026a8ea4923104d2e98c2e42db8c5bcd32ddd164e48
-lib/codeql/rust/elements/internal/generated/ForExpr.qll 541b62b48911d4999f9ed64ab6c8b9910073ac4add0225761f319677328cf120 976c3a91c9eedfb1e2d9ea76ac501348643b3d23c723d7a777042258d416d091
-lib/codeql/rust/elements/internal/generated/ForType.qll 3d43d044a1189281f09c55caafb6c8020a836f49e2866077086101925a573cf2 646b59bfd1b428aaf7211f574c49f79cb4c6a79ca151aa0663b2b31480298721
-lib/codeql/rust/elements/internal/generated/Format.qll 37ad20cf2bf363b4027a8913d095292c8a4eb8ccdf2a9965f2fb7d41930f9bfe 329b89cdd75ce951269273dd18897e32ff5cfcc94f451001c64143386c1e48dd
+lib/codeql/rust/elements/internal/generated/FnPtrTypeRepr.qll d490ab9f2e3654d9abde18a06e534abd99ca62f518ca08670b696a97e9d5c592 01500319820f66cb4bbda6fe7c26270f76ea934efff4bb3cbf88e9b1e07e8be2
+lib/codeql/rust/elements/internal/generated/ForExpr.qll 6c1838d952be65acaa9744736e73d9bfdcf58d7b392394223bf6fbfdcc172906 44237a248a5aa326a2544e84bc77f536f118f57a98c51562b71ddc81edfcccb8
+lib/codeql/rust/elements/internal/generated/ForTypeRepr.qll 3027879795a6be5bfb370b8c2231b579f9df8afde54345416c6ce2c64bd3dfec f871d73b36f079f473915db298951020e5a05bb5e8e4d570822063afb4807559
+lib/codeql/rust/elements/internal/generated/Format.qll df7ef61e6ba61fa0eb093f8e6b3e7a0329104e03f659c9507db9535b8b4ea759 ef8ddd98405fc84938ad8cd5f87d2858e01d06a6bb00566a785a984b60a79dc6
 lib/codeql/rust/elements/internal/generated/FormatArgsArg.qll e07a1ae310f590003f1b88fada7dcf4847c99adb9d4c838d1c88e66e1da85c5f 0ef7342451fe2cb06e765fb4b33bb8c4a9b927f5edbc8feb5c6ba3655697f447
-lib/codeql/rust/elements/internal/generated/FormatArgsExpr.qll 40d6daa7d2bafb33798a21d79774dc802cfbd7a31618ac3bd0149399ea2bf893 d1172e2151791228559004792e125fc4625f6a26ffad25f29efb0ad263bf8795
-lib/codeql/rust/elements/internal/generated/FormatArgument.qll 00646f38217a66978b8b2648cca39dddbed22ece693b26cb682f019fbfedda95 e364e085f967847a7ed21b76156a9203d64032f0f0eea357b4779885a41bf9a7
+lib/codeql/rust/elements/internal/generated/FormatArgsExpr.qll 8aed8715a27d3af3de56ded4610c6792a25216b1544eb7e57c8b0b37c14bd9c1 590a2b0063d2ecd00bbbd1ce29603c8fd69972e34e6daddf309c915ce4ec1375
+lib/codeql/rust/elements/internal/generated/FormatArgument.qll cd05153276e63e689c95d5537fbc7d892615f62e110323759ef02e23a7587407 be2a4531b498f01625effa4c631d51ee8857698b00cfb829074120a0f2696d57
 lib/codeql/rust/elements/internal/generated/FormatTemplateVariableAccess.qll a6175214fad445df9234b3ee9bf5147da75baf82473fb8d384b455e3add0dac1 a928db0ff126b2e54a18f5c488232abd1bd6c5eda24591d3c3bb80c6ee71c770
-lib/codeql/rust/elements/internal/generated/Function.qll f285ee0c771f897eba6db34a7e98f3cfb7db91b0df252ff4b37fc9d779de0bfb 07401e832565ff376acda219514c2e2bbe4ae5058c76a73b40ca6ca66f1626c7
+lib/codeql/rust/elements/internal/generated/Function.qll 6c04fffdc9de54cd01ff76f93aef5fcd3f2f779a2735523c9b1a859d394cefc9 af3c0f05c05ecd74560ab7b128a4a8e9822aa3cb80eddf304d51ea44725ac706
 lib/codeql/rust/elements/internal/generated/GenericArg.qll 464da0ba1c5ddcd1be68617167f177773d99b5ac4775ec8ea24d503e789a9099 6faa1033d59baf7c210ac4837a55781cfc054b7acbad8027faf4630dbfa6e101
 lib/codeql/rust/elements/internal/generated/GenericArgList.qll b8cd936bba6f28344e28c98acf38acb8ef43af6ecf8367d79ed487e5b9da17cb 8b14331261e49d004807285b02fca190aafd62bfb9378b05c7d9c1e95525fe7b
 lib/codeql/rust/elements/internal/generated/GenericParam.qll a0285123f974f287154b706bf6688b86edf72a4adcec57346c654d962435651b b42c3915e9564b5b5c5282229bf882aa3309de26a77721b2255d6f4235c0cc38
 lib/codeql/rust/elements/internal/generated/GenericParamList.qll f2d8945bc70cda6929bb6b652f9e3c7707e73fb5e778b21e99dbac594e71285f 7b97da5b6a6504377456bedebddc293d714f90e8fc2ce64199656666d5f749af
-lib/codeql/rust/elements/internal/generated/IdentPat.qll a1269182132b2f52c5d842e58cbfa1cee49b143fa3766ed9fcf65389bf5137eb 46009fa66065222d865fa4714dd16c0373ffb16d576da45e7bf3a06432bd3a23
+lib/codeql/rust/elements/internal/generated/IdentPat.qll 1fe5061759848fdc9588b27606efb1187ce9c13d12ad0a2a19666d250dd62db3 87dbc8b88c31079076a896b48e0c483a600d7d11c1c4bf266581bdfc9c93ae98
 lib/codeql/rust/elements/internal/generated/IfExpr.qll 413dd7a20c6b98c0d2ad2e5b50981c14bf96c1a719ace3e341d78926219a5af7 c9a2d44e3baa6a265a29a683ca3c1683352457987c92f599c5771b4f3b4bafff
-lib/codeql/rust/elements/internal/generated/Impl.qll e33ef5d3e49e64beca0ca9d5c0ba972d99007e5011eeedc11e67d3fbb569ab4a 5c5d88110864f4fd3d966b1ad973eaabd7a9c5a07adc18bff01dc09395214825
-lib/codeql/rust/elements/internal/generated/ImplTraitType.qll 3c29684f5ef386b883b79dc9758441d97f090e065be177ffc8240aaf0f3d1e7b 03ea42c2a95cf917ec73d88b7b4ca5e53e10d7b046074f59100c0ec6c2c1ed6d
+lib/codeql/rust/elements/internal/generated/Impl.qll 863281820a933a86e6890e31a250f6a8d82ffc96c8b0fa9ff3884548f89d57b5 85fdb5c18db98dd15b74fed5a7547cb6e4db58ab2b9573d0a5cf15a9a2033653
+lib/codeql/rust/elements/internal/generated/ImplTraitTypeRepr.qll a1bbebe97a0421f02d2f2ee6c67c7d9107f897b9ba535ec2652bbd27c35d61df ba1f404a5d39cf560e322294194285302fe84074b173e049333fb7f4e5c8b278
 lib/codeql/rust/elements/internal/generated/IndexExpr.qll cf951fc40f6690e966b4dc78fa9a6221aa5c6cade44759dcb52254f799292d11 1572e71918cc4e0b7e028331b6d98c9db23100a3646cd3874d1915e06ab6211d
-lib/codeql/rust/elements/internal/generated/InferType.qll 23ee25135c59ea5578cdf7c34a41f606e217e7260c3c8f404d12836585d5cad4 400da322fa1be62c4e300ebdf481eb92d4226eb6c316c668da8cc5168065774f
-lib/codeql/rust/elements/internal/generated/Item.qll 25e645cb41222c21065798fb6cb0488bfef007aeb9b89717f58913f9b29d5559 3146941e55db2ff7c51ec030b4414e20d66d154cf6854b1a3fa42e74a09dfb77
+lib/codeql/rust/elements/internal/generated/InferTypeRepr.qll dab311562be68a2fcbbe29956b0c3fc66d58348658b734e59f7d080c820093ae ca099ecf9803d3c03b183e4ba19f998e24c881c86027b25037914884ce3de20e
+lib/codeql/rust/elements/internal/generated/Item.qll 97f204f27c12689a01fef502a4eec3b587e4eaccd278ec07a34c70a33ce6119d 139af2d44f794d0f91d9aabc3d50d895107c34bd9bcb72457a2e243c14622e51
 lib/codeql/rust/elements/internal/generated/ItemList.qll 73c8398a96d4caa47a2dc114d76c657bd3fcc59e4c63cb397ffac4a85b8cf8ab 540a13ca68d414e3727c3d53c6b1cc97687994d572bc74b3df99ecc8b7d8e791
 lib/codeql/rust/elements/internal/generated/Label.qll 6630fe16e9d2de6c759ff2684f5b9950bc8566a1525c835c131ebb26f3eea63e 671143775e811fd88ec90961837a6c0ee4db96e54f42efd80c5ae2571661f108
+lib/codeql/rust/elements/internal/generated/LabelableExpr.qll 896fd165b438b60d7169e8f30fa2a94946490c4d284e1bbadfec4253b909ee6c 5c6b029ea0b22cf096df2b15fe6f9384ad3e65b50b253cae7f19a2e5ffb04a58
 lib/codeql/rust/elements/internal/generated/LetElse.qll 7ca556118b5446bfc85abba8f0edd4970e029b30d414ea824a1b5f568310a76c a403540881336f9d0269cbcdb4b87107a17ab234a985247dc52a380f150a1641
-lib/codeql/rust/elements/internal/generated/LetExpr.qll 9af0f89b294c8a0a751317e7074fe370339563d36c1df4911d1ea082a4df77fd 68272593d1feb88990bfbd0b8c222776f085e49694894384fc6d96e9464ba734
-lib/codeql/rust/elements/internal/generated/LetStmt.qll aa1852db86ec29f857a90677f0c6b4a07f0fd965fc193d4141be95ce15862fca 40f32a37c0cc161b099fe0b4c7d713da928781d3e2c3de90db991df1d9062647
+lib/codeql/rust/elements/internal/generated/LetExpr.qll 5983b8e1a528c9ad57932a54eb832d5bcf6307b15e1d423ffa2402e8a5d8afa4 8a6affdc42de32aa1bfc93002352227fc251540304765e53967bab6e4383f4ae
+lib/codeql/rust/elements/internal/generated/LetStmt.qll 21e0fadccc1e7523ef1c638fc3e2af47256791eff70d1be01a9c377659ee36ef 21ccb4821bdbde409f17ae96790e395546d6c20d2411fccf88bad6ef623a473e
 lib/codeql/rust/elements/internal/generated/Lifetime.qll 90d01c76188ce0c053122c62b41e47f27c4c7717ca5a4999a76797360043da0d 7b9feb202da5a06cd17f7770bb66742fd9e7cff0d410fefc7ffaafe710ac16d6
 lib/codeql/rust/elements/internal/generated/LifetimeArg.qll 7c1a44e3d480e75142b171eb51382c9492d393043833c0ab4a4036eba19043b8 7d8273b62794268dab6938ba1e3a3560a80a2c49cd9a9717345785dacd311059
 lib/codeql/rust/elements/internal/generated/LifetimeParam.qll bcbde38bfb99034e470634dbd32c0df34c40e1e531e2d235b7ef29c0b66f8a56 1fd15bbaa1dbc521b2ee4bf0bc1009c411aff15eac07c0842ed9883d9a291669
 lib/codeql/rust/elements/internal/generated/LiteralExpr.qll f3a564d0a3ed0d915f5ab48e12246777e4972ad987cd9deaafeb94cf407b2877 2337c3d5f60361bd10f6aeca301e88255f5dffb85301cf36cbbfa1a65bfad1cd
-lib/codeql/rust/elements/internal/generated/LiteralPat.qll ecc2bfe559abfce1be873fbf7b61b5728897c9afc3bb3f69551d8320d273da71 42196fb6a4a0ff9b570fd0bdbc920f24744b3f46772efbb46648af7fbfe1fbda
+lib/codeql/rust/elements/internal/generated/LiteralPat.qll f36b09cf39330019c111eeaf7255ce3240178342d0ddaace59dbfee760aa4dbb d58667cf4aa0952450957f340696cb2fd22587206986c209234162c72bdb9d9a
 lib/codeql/rust/elements/internal/generated/Locatable.qll c897dc1bdd4dfcb6ded83a4a93332ca3d8f421bae02493ea2a0555023071775e b32d242f8c9480dc9b53c1e13a5cb8dcfce575b0373991c082c1db460a3e37b8
-lib/codeql/rust/elements/internal/generated/LoopExpr.qll 22b755dfaf238ecea722c0c94c399992014e23481ec6fdd61f803bbec012b6f9 08731630c2dc05aa1e0ada222a6057752d9ce737329c62076708828247a358be
+lib/codeql/rust/elements/internal/generated/LoopExpr.qll db6bc87e795c9852426ec661fa2c2c54106805897408b43a67f5b82fb4657afd 1492866ccf8213469be85bbdbcae0142f4e2a39df305d4c0d664229ecd1ebdb9
+lib/codeql/rust/elements/internal/generated/LoopingExpr.qll 0792c38d84b8c68114da2bbdfef32ef803b696cb0fd06e10e101756d5c46976c 111fe961fad512722006323c3f2a075fddf59bd3eb5c7afc349835fcec8eb102
 lib/codeql/rust/elements/internal/generated/MacroCall.qll fc8988696493992cc4fdce8c0e5610c54ee92ea52ebb05262338f8b612353f50 188a2d7a484bd402a521787371e64f6e00e928306c8d437e6b19bf890a7aa14e
 lib/codeql/rust/elements/internal/generated/MacroDef.qll e9b3f07ba41aa12a8e0bd6ec1437b26a6c363065ce134b6d059478e96c2273a6 87470dea99da1a6afb3a19565291f9382e851ba864b50a995ac6f29589efbd70
 lib/codeql/rust/elements/internal/generated/MacroExpr.qll 03a1daa41866f51e479ac20f51f8406d04e9946b24f3875e3cf75a6b172c3d35 1ae8ca0ee96bd2be32575d87c07cc999a6ff7770151b66c0e3406f9454153786
 lib/codeql/rust/elements/internal/generated/MacroItems.qll 894890f61e118b3727d03ca813ae7220a15e45195f2d1d059cb1bba6802128c8 db3854b347f8782a3ec9f9a1439da822727b66f0bd33727383184ab65dbf29ac
-lib/codeql/rust/elements/internal/generated/MacroPat.qll 9e927e09d47029a3025eaad271c975e73479a80ea933c921381b6c9d751f2866 bdf5c58ca27743eb2e2dae2aeea3f3fc21f8a4f98fe1001598876455c88e8f69
+lib/codeql/rust/elements/internal/generated/MacroPat.qll 26bc55459a66359ad83ed7b25284a25cdbd48a868fd1bbf7e23e18b449395c43 f16ede334becba951873e585c52a3a9873c9251e3dab9a3c1a1681f632f2079f
 lib/codeql/rust/elements/internal/generated/MacroRules.qll 4fbd94f22b5ee0f3e5aaae39c2b9a5e9b7bf878a1017811ca589942f6de92843 49fb69543ee867bae196febea6918e621f335afdf4d3ccbf219965b37c7537b1
 lib/codeql/rust/elements/internal/generated/MacroStmts.qll cb4f3c2721a4d0c8522e51f567c675f4fc95f39bac8a2bd97e125d5553515ad2 09b5a739ccee75e6c556b34ecd6f78c7dc799029d9bc7df2e6169098d24f0ccd
-lib/codeql/rust/elements/internal/generated/MacroType.qll c462824df4a002956c036966d15cd0bce206e664888f8d0c7834dedb38b3c0bf 947480f07c40128ef3d00ad4c3a29a685472b3e20a661680c22f6bb318205ed1
-lib/codeql/rust/elements/internal/generated/MatchArm.qll 8fb740a0f2e308782d9cf390672969cd7cf6e698e5b847fb02ae3fa6c205646f 42bfe8dd94fc24ec925fbd44016df111600f99d1216c9a698631373bb6048830
+lib/codeql/rust/elements/internal/generated/MacroTypeRepr.qll 4242e253fa36ee3f7d9d0677811ff5bc4ecfb02c76d768446a6a6dcd38061f68 a676632f3bb83142a0838601ae2a582d5c32d7939e4261eb8fccf3962bb06cb2
+lib/codeql/rust/elements/internal/generated/MatchArm.qll f8c4c955c50f8398159c492d9d0a74f7b71e9510fcb8a3aab1d06e0f7e15b263 713939c7ef77ca73d95788096163c26213ab49f34ed41c6f4bc09a1ef9607b0d
 lib/codeql/rust/elements/internal/generated/MatchArmList.qll 13362680c037fe83fef4653562cc10a4429078316b5ec7c47b076336cf4aca2e 41c674293c13eceaca62134ae0c6778541f6a5201cbc5c146f0ba01b898dc267
-lib/codeql/rust/elements/internal/generated/MatchExpr.qll 689d65f690fe05bc262d0a5bfe69bb4f8a142db387c5765fcc4958a9b49989f8 2979cd2017d0538870d17b2b7592c75cc05b706bd36c9de3e5dc38fa3a957e5b
+lib/codeql/rust/elements/internal/generated/MatchExpr.qll b686842e7000fd61e3a0598bf245fb4e18167b99eca9162fdfdff0b0963def22 00f1743b1b0f1a92c5a687f5260fda02d80cc5871694cad0d5e7d94bac7fe977
 lib/codeql/rust/elements/internal/generated/MatchGuard.qll 521a507883963106780f1782084c581fbcf1179863c7c15438c4db79e30e78dd 6226feffaaa8d828a42ece0c693e616cd375672eb987c3b7ff1ca15fa23c116a
 lib/codeql/rust/elements/internal/generated/Meta.qll 38fca2c9958b4179de311546fe0850319010aca9cd17c97d57e12b521c5d0947 740f99c9d41044ceebfcc9d29baaa22f59c11a40f45502a34aa587d423c018f8
 lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll 17bffcc826851a8be32a1900b8fdf777f9bab6aed9f8268d566173c4974c1cf9 134a2860bdf16daafdb3e574c52a69d2598210653db89c2fa062ca25e8f8a649
@@ -540,72 +512,73 @@ lib/codeql/rust/elements/internal/generated/Missing.qll 16735d91df04a4e1ae52fae2
 lib/codeql/rust/elements/internal/generated/Module.qll ebae5d8963c9fd569c0fbad1d7770abd3fd2479437f236cbce0505ba9f9af52c fa3c382115fed18a26f1a755d8749a201b9489f82c09448a88fb8e9e1435fe5f
 lib/codeql/rust/elements/internal/generated/Name.qll 12aad57744b7d1b04454159536409244c47319aedd580acb58ee93ef9d7f837d 63fc67ccc085db22f82576a53489f15216a7c29d5b941b14a965eab481534e2e
 lib/codeql/rust/elements/internal/generated/NameRef.qll 4292fc7aa9ba22a7fa5bd638c38f696cc6724d8ed5e7346e7c5a52c4e4b65eec dfa8c3d4b521e43b76b18666d3d32d159c21b7b194285bac425df681544d269f
-lib/codeql/rust/elements/internal/generated/NeverType.qll 14dd3c08db1db873b365fc7f0d1cf3f5d6229b1f78bc85100c36c22d1bb8ee40 34257df0ac59cfd982ea5f30ab225c8bfece71d9fd3be84ff79cf1b0bff55060
-lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll bb17a1e1d4332225cf4bbbae4a1bab9302c2d81d191fe835f2f973915d40dd2a f9e73210b81992040a5a5a9ac3ad936159fb3475445f130c7b28f83dfb4170f5
-lib/codeql/rust/elements/internal/generated/OrPat.qll ee0487b90849c3e2a836c956ae8837f27515a9dc795bf17287cba2cf7a39d839 35117b6a3dcebab09f12665441332b6863200e206679ee97894170dd9ef7795c
-lib/codeql/rust/elements/internal/generated/Param.qll c57bf238123e8337adb1556cf788bde2b2e8841d4afa0799649db9d507b02d85 7cb580219ec9b6257735f7c53260cd2bb5533dbe342bef3b793ec7b6a65e7027
+lib/codeql/rust/elements/internal/generated/NeverTypeRepr.qll c601b228a6359f809425ad43b46c1c444c9826652b07f8facc6f9729df268285 23b53bb1d826a8b54b68bd4f138ebaabeeb2f56392c882b32417eff388aa80cc
+lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll c86eecd11345a807571542e220ced8ccc8bb78f81de61fff6fc6b23ff379cd12 76a692d3ad5e26751e574c7d9b13cf698d471e1783f53a312e808c0b21a110ab
+lib/codeql/rust/elements/internal/generated/OrPat.qll 0dc6bd6ada8d11b7f708f71c8208fc2c28629e9c265c3df3c2dc9bea30de5afa 892119fc1de2e3315489203c56ee3ed3df8b9806e927ee58aa6083e5b2156dab
+lib/codeql/rust/elements/internal/generated/Param.qll 19f03396897c1b7b494df2d0e9677c1a2fc6d4ae190e64e5be51145aba9de2e2 3d63116e70457226ea7488a9f6ed9c7cea3233b0e5cab443db9566c17b125e80
+lib/codeql/rust/elements/internal/generated/ParamBase.qll 218f3b821675c0851b93dd78946e6e1189a41995dc84d1f5c4ac7f82609740f7 4c281b4f5364dab23d176859e6b2196a4228a65549e9f63287fa832bd209e13d
 lib/codeql/rust/elements/internal/generated/ParamList.qll c808c9d84dd7800573832b63a2ca5296b5506bffdeea054893a56cde08f91560 d4599c52231f93e1260fbae7de8891fe4287fa68b1423592b7a1d51c80146dc8
 lib/codeql/rust/elements/internal/generated/ParenExpr.qll bc0731505bfe88516205ec360582a4222d2681d11342c93e15258590ddee82f2 d4bd6e0c80cf1d63746c88d4bcb3a01d4c75732e5da09e3ebd9437ced227fb60
-lib/codeql/rust/elements/internal/generated/ParenPat.qll ce24b8f8ecbf0f204af200317405724063887257460c80cf250c39b2fdf37185 e7c87d37e1a0ca7ea03840017e1aa9ddb7f927f1f3b6396c0305b46aeee33db6
-lib/codeql/rust/elements/internal/generated/ParenType.qll 9cc954d73f8330dcac7b475f97748b63af5c8766dee9d2f2872c0a7e4c903537 c07534c8a9c683c4a9b11d490095647e420de0a0bfc23273eaf6f31b00244273
-lib/codeql/rust/elements/internal/generated/ParentChild.qll b4d25c43ed44715053255c3c2f8aeb8d21826adc365f24026b2123a4f25cba86 1bc4bb0380a1a8b69055ffeac203b11b2a1b94e5ad88d1b32ff659e8feb26016
+lib/codeql/rust/elements/internal/generated/ParenPat.qll 4f168ef5d5bb87a903251cc31b2e44a759b099ec69c90af31783fbb15778c940 0e34f94a45a13396fd57d94c245dc64d1adde2ab0e22b56946f7e94c04e297fc
+lib/codeql/rust/elements/internal/generated/ParenTypeRepr.qll 40ab5c592e7699c621787793743e33988de71ff42ca27599f5ab3ddb70e3f7d8 12c0a6eed2202ee3e892f61da3b3ce77ac3190854cdf3097e8d2be98aa3cb91d
+lib/codeql/rust/elements/internal/generated/ParentChild.qll ed0af2cad8ec4d612e3c03d99548444298ae975516f2c3e909026fe5d31ab467 57801012cbe803516a093bbc0c5dcf839cb43df97a87fd2028ad2be400882c50
 lib/codeql/rust/elements/internal/generated/Pat.qll 3605ac062be2f294ee73336e9669027b8b655f4ad55660e1eab35266275154ee 7f9400db2884d336dd1d21df2a8093759c2a110be9bf6482ce8e80ae0fd74ed4
-lib/codeql/rust/elements/internal/generated/Path.qll f2b1be2f8f44001a6533533c978c4a9a8b7d64838d6f39eef5f0c0e7890611b8 d724a00a38f42429ffa8fb3bffbb5ec69e16a32ceeeb1d1f026fc7adf87424a8
-lib/codeql/rust/elements/internal/generated/PathExpr.qll 2096e3c1db22ee488a761690adabfc9cfdea501c99f7c5d96c0019cb113fc506 54245ce0449c4e263173213df01e079d5168a758503a5dbd61b25ad35a311140
+lib/codeql/rust/elements/internal/generated/Path.qll 4c1c8e840ed57880e574142b081b11d7a7428a009f10e3aa8f4645e211f6b2e0 989668cf0f1bdee7557e2f97c01e41d2a56848227fed41477833f5fc1e1d35f6
+lib/codeql/rust/elements/internal/generated/PathExpr.qll 4ff4b2ab77bce1dbfddb315e7d1ff13d6fcd6bb7c30c105402f8082d05f1d337 fbc4f4e05da75ab543af33cfb620cfe09239e2574b8312f2c5bedca8a65ea6e8
 lib/codeql/rust/elements/internal/generated/PathExprBase.qll d8218e201b8557fa6d9ca2c30b764e5ad9a04a2e4fb695cc7219bbd7636a6ac2 4ef178426d7095a156f4f8c459b4d16f63abc64336cb50a6cf883a5f7ee09113
-lib/codeql/rust/elements/internal/generated/PathPat.qll 98c9938d6a359fd717829b196eb09701d2c798e18c1f43fa7b2a9145afdf6c19 caba2e629cae08682baac90a76ae9a48cda2d7d6f9c23d506fa0ff3f292978a4
-lib/codeql/rust/elements/internal/generated/PathSegment.qll 4621597fd86246f788b8f9ca73f6b0f27929fc04261ce3ccf85da1183071431d aadda8bce386a3b7a9c53b98465eedcc4f724e37b8a904c1775af5b7ffb041ee
-lib/codeql/rust/elements/internal/generated/PathType.qll 45de78e5374d6eb0446e2112ec72d3692c2811df9fa2ad03d0127e426940abe3 622cf70408413a565a0dac58f451035ac1339c8d0ee5b24f630680201cb0aa48
+lib/codeql/rust/elements/internal/generated/PathPat.qll 4ef7e7e81257956f9ac947dad8801fb4e0daf039b495ab5ae54c72d51416732c ca0e6e58153d3aa319d5a01858bc5518a0eda2a20adeba9430bd0b91b2bc9c37
+lib/codeql/rust/elements/internal/generated/PathSegment.qll f6892724c0b516f7e04eee3878c8060c5a4c54fe2a3a3836470c86df5fddb28c bdb6b89cf037e09b395729b25117dabc86ebc8b967e39856b5e2a1f3810bb86c
+lib/codeql/rust/elements/internal/generated/PathTypeRepr.qll b847fabe7059485c5194cbc144f38dae2433057771ff10fe0b6ae9876b33afd4 ee2fdcd86d78c389a2276ebe7e889f042b7bb39c3c611f56b951591600a60e8a
 lib/codeql/rust/elements/internal/generated/PrefixExpr.qll c9ede5f2deb7b41bc8240969e8554f645057018fe96e7e9ad9c2924c8b14722b 5ae2e3c3dc8fa73e7026ef6534185afa6b0b5051804435d8b741dd3640c864e1
-lib/codeql/rust/elements/internal/generated/PtrType.qll 40099c5a4041314b66932dfd777c9e2bef90a0711fb8d7c2c2cec764c003ac4a cf8297d93557356a572223d3e8acca701837c4b1f54e8d4351ba195fb7ed27f8
-lib/codeql/rust/elements/internal/generated/PureSynthConstructors.qll ea294a3ba33fd1bc632046c4fedbcb84dcb961a8e4599969d65893b19d90e590 ea294a3ba33fd1bc632046c4fedbcb84dcb961a8e4599969d65893b19d90e590
+lib/codeql/rust/elements/internal/generated/PtrTypeRepr.qll 51d1e9e683fc79dddbffadee9015b5351bf03ce48f879da98b1f6931a61166f8 122a9c4887aa24e3f3a587b2f37c4db32633f56df3c8b696db4b8a609d9d4a98
+lib/codeql/rust/elements/internal/generated/PureSynthConstructors.qll e5b8e69519012bbaae29dcb82d53f7f7ecce368c0358ec27ef6180b228a0057f e5b8e69519012bbaae29dcb82d53f7f7ecce368c0358ec27ef6180b228a0057f
 lib/codeql/rust/elements/internal/generated/RangeExpr.qll 23cca03bf43535f33b22a38894f70d669787be4e4f5b8fe5c8f7b964d30e9027 18624cef6c6b679eeace2a98737e472432e0ead354cca02192b4d45330f047c9
-lib/codeql/rust/elements/internal/generated/RangePat.qll efd93730de217cf50dcba5875595263a5eadf9f7e4e1272401342a094d158614 229b251b3d118932e31e78ac4dfb75f48b766f240f20d436062785606d44467b
-lib/codeql/rust/elements/internal/generated/Raw.qll 5f83209cda8319c5c6c932631b60c6f2163d2d9cf7be63f63523e2206c01d004 3581039746e86365f37644e86ac2c89d67e2123aa1b039d9e0afdffc7156c96d
+lib/codeql/rust/elements/internal/generated/RangePat.qll 80826a6a6868a803aa2372e31c52a03e1811a3f1f2abdb469f91ca0bfdd9ecb6 34ee1e208c1690cba505dff2c588837c0cd91e185e2a87d1fe673191962276a9
+lib/codeql/rust/elements/internal/generated/Raw.qll bcc8cfc3843e297546ba563bbd261f48863967588dbbf445bbb0894bf4539812 b8324ce13f8a5fffdcf2c24ca6f685ac11d959eb3139bdc6f89430c83dd6ddfd
 lib/codeql/rust/elements/internal/generated/RecordExpr.qll eb6cb662e463f9260efae1a6ce874fa781172063b916ef1963f861e9942d308d 1a21cbccc8f3799ff13281e822818ebfb21d81591720a427cac3625512cb9d40
 lib/codeql/rust/elements/internal/generated/RecordExprField.qll 7e9f8663d3b74ebbc9603b10c9912f082febba6bd73d344b100bbd3edf837802 fbe6b578e7fd5d5a6f21bbb8c388957ab7210a6a249ec71510a50fb35b319ea1
 lib/codeql/rust/elements/internal/generated/RecordExprFieldList.qll 179a97211fe7aa6265085d4d54115cdbc0e1cd7c9b2135591e8f36d6432f13d3 dd44bbbc1e83a1ed3a587afb729d7debf7aeb7b63245de181726af13090e50c0
-lib/codeql/rust/elements/internal/generated/RecordField.qll 9f7840e1a2a194d5ed1d5201ab483eb01129849d49392581e0328bbc0934305c 0e019b5b8fe91bc96c7c07933c766d8a09c066d48ed96f24ae3dad303c00585e
+lib/codeql/rust/elements/internal/generated/RecordField.qll 6d4b184c85419f9282937ebd1b1d14930a263e8754124f2323953991ca0f0e59 2f8bec227f960ae98fc320a65efdfdc5dc04455cd59697e2621585e5a5f942b8
 lib/codeql/rust/elements/internal/generated/RecordFieldList.qll d7bb2677338cf420b0d6371aeec781aacc2272c73413ea96b7418177ad149fb9 5ef52074b9f4ec31e7422b70efdb2e650d673b2625efdfec18a4e48c30e35cf6
-lib/codeql/rust/elements/internal/generated/RecordPat.qll f5f9904fcd8b8fa5fe65b46a68f830021a5e4a68f95ff403151565c3ec770477 56294ed2ff753d8be7742a501b15b5f3f5f20afe0f8171ee6771d049f26489e4
-lib/codeql/rust/elements/internal/generated/RecordPatField.qll f17b1aa265091fd8309fd90d5c3822d170870e304f160225327de5a844a9aed4 0458e39dbe88060b4b664692cf0b41ebf4364de268d9417658c14c883c9c1b33
-lib/codeql/rust/elements/internal/generated/RecordPatFieldList.qll 08d4740bbb519f15ab20b694b3c45e396a2a59cce0f68fa4b9698348784cae43 99919809607ae61c707f591ee609c50bcfb90d5b4f9c263f6b8e78658d21b605
+lib/codeql/rust/elements/internal/generated/RecordPat.qll 6a440e2c31ff8ccccc9cc03e3464e3916db637559c43cbbf7915ced5d31ceb5b eb46cf20cfe8d612d2222bea8535922a458ebe1f9e10db1a5afd6954a420a1f6
+lib/codeql/rust/elements/internal/generated/RecordPatField.qll 5bf624d22903fb874e6d03541cf453493badd382b6910ce950ad0d34dd580e9a b9ec89b69a58b9c418405efa9b0e6ee7b07616f5696a0858583a339d657b5855
+lib/codeql/rust/elements/internal/generated/RecordPatFieldList.qll a6db0cdcc3da667c52862ed940597d899383ccf2bda9bb3f62b8ce9f48119307 99fe972c80db8f28e2a6f56cf2a11c98183244229da117320cc86c7ade62bd0b
 lib/codeql/rust/elements/internal/generated/RefExpr.qll 7d995884e3dc1c25fc719f5d7253179344d63650e217e9ff6530285fe7a57f64 f2c3c12551deea4964b66553fb9b6423ee16fec53bd63db4796191aa60dc6c66
-lib/codeql/rust/elements/internal/generated/RefPat.qll 5c4d908f851d89f42cf765007c46ac4199200f9b997f368d5b0e2a435efa82cd 42fd637bc98b5a9275386f1c5fb3ae8c4681987289a89b060991416a25131306
-lib/codeql/rust/elements/internal/generated/RefType.qll 3603a3e000acc25c5e675bd4bc4a5551b8f63851591e1e9247709e48d1769dc5 91bea4a1d5ef0779d575567253cd007157d3982524e63a7c49c5cae85cb42e5f
+lib/codeql/rust/elements/internal/generated/RefPat.qll 456ede39837463ee22a630ec7ab6c8630d3664a8ea206fcc6e4f199e92fa564c 5622062765f32930465ba6b170e986706f159f6070f48adee3c20e24e8df4e05
+lib/codeql/rust/elements/internal/generated/RefTypeRepr.qll 3d8c0bd296d33b91a81633f697a43269a6538df06d277262d3990d3f6880ef57 13680f39e89bcd8299c218aba396f3deec804597e6f7cb7d4a7e7c748b6faa77
 lib/codeql/rust/elements/internal/generated/Rename.qll d23f999dab4863f9412e142756f956d79867a3579bd077c56993bdde0a5ac2f1 9256c487d3614bf3d22faa294314f490cf312ab526b8de0882e3a4a371434931
 lib/codeql/rust/elements/internal/generated/Resolvable.qll c038fa24b121ee3e7f6060bce639e7483ea1a14bb552e459b6c67663732dfd6c 4025f2ef318793913e6cfc5d8984e538f402bc062865dcb5496563bec64a2ea9
-lib/codeql/rust/elements/internal/generated/RestPat.qll b3a4206e68cf67a0310a466721e7c4b3ab855e65490d589d3d856ad333b3d5e8 30b471bec377784f61d73ef93e74fc0dcec7f512ac4b8791d1ca65f2bcea14b8
-lib/codeql/rust/elements/internal/generated/RetType.qll a26860cd526b339b9527c089d126c5486e678dd080e88c60ea2fe641e7d661fd a83c1ce32fd043945ad455b892a60c2a9b6a62d7a5aadf121c4b4056d1dfb094
+lib/codeql/rust/elements/internal/generated/RestPat.qll 234bbaa8aa37962c9138baf5b1f4406c3d78f4131b4b8dbb30fc1343d15873d5 653ee6bea4d3cf9454b2834bc4233a8f275295f19635c37a0bca69a587e1eb20
+lib/codeql/rust/elements/internal/generated/RetTypeRepr.qll 173fd722308161f9405f929a13718134f8eaefe9fce1686048860b7c8f4c29f7 30bbaada842369dac5618ae573999f59979597c6a3315c6cce04e5bed0b38c87
 lib/codeql/rust/elements/internal/generated/ReturnExpr.qll c9c05400d326cd8e0da11c3bfa524daa08b2579ecaee80e468076e5dd7911d56 e7694926727220f46a7617b6ca336767450e359c6fa3782e82b1e21d85d37268
 lib/codeql/rust/elements/internal/generated/ReturnTypeSyntax.qll 34e32623d2c0e848c57ce1892c16f4bc81ccca7df22dc21dad5eb48969224465 ccb07c205468bce06392ff4a150136c0d8ebacfb15d1d96dd599ab020b353f47
-lib/codeql/rust/elements/internal/generated/SelfParam.qll cf6837c2731b45632f04092079d295eee3e02d19f73c73b3ccbce1abe12203bf 87eaa9d982506904c42030f7173dd01fd52f3edd9d2c8d19b572f6d5454f769b
-lib/codeql/rust/elements/internal/generated/SlicePat.qll 8b1463758d7b15a0303384c8136a48a8e71ce27da4ba6e421272b9751a988e64 7562d47308f197bc63ade0f114cd23a17e7f60fa696716f6a30fc7b7411642fe
-lib/codeql/rust/elements/internal/generated/SliceType.qll 98ee8b566be28f392ab9c9507600e8461ad0b48cbbbd422d22548aca691f8330 528d6eabddf49b9dc474971a2f3a6ddb6f2d77dc7f8449140ef54646c1ceb822
+lib/codeql/rust/elements/internal/generated/SelfParam.qll e1d994dea58a406dbfca3ea0c724ac48be66ac4380e7270e4037ca2714eef722 90f8ebfac723eef259e13d3c8a7ef6b886c2831d4f436a742144b96db6b6fc92
+lib/codeql/rust/elements/internal/generated/SlicePat.qll 722b1bd47a980ac9c91d018133b251c65ee817682e06708ad130031fbd01379b 7e0ce13b9de2040d2ef9d0948aab3f39e5fdc28d38c40bfbee590e2125dbe41c
+lib/codeql/rust/elements/internal/generated/SliceTypeRepr.qll efd28e97936944ce56ab5f83aa16cf76cc1b42a39c123959d3a878ca13ceb84e 3435ea66d467f4234b9644ce63fa9072a7e9ac86e23d464ba18aea7802fc03a7
 lib/codeql/rust/elements/internal/generated/SourceFile.qll 55d44c9f09c5ff28c4f715f779a0db74083e1180acaf0d410e63ca07b90d1cb5 78c0af48b0b64aa377413ea4799dfe977602a111208e1d25e4bdfa920dbd7238
-lib/codeql/rust/elements/internal/generated/Static.qll 5fbd6879858cf356d4bdaa6da475de729c12d44ee99aef12bdefe657fdb885e0 0c8e9ef7a93c59b9346265338e38ae3f2e1265981f2d81aab49bc36cf0589382
+lib/codeql/rust/elements/internal/generated/Static.qll ea22838e0b7d9796dfaf5deda5b42f0187cc4fd30791a9dbe378b364d9485978 2496a208a702295984f3a29a9c3c3c19d5b1a6b16267e3dd4e6f3c5930e5faa2
 lib/codeql/rust/elements/internal/generated/Stmt.qll 8473ff532dd5cc9d7decaddcd174b94d610f6ca0aec8e473cc051dad9f3db917 6ef7d2b5237c2dbdcacbf7d8b39109d4dc100229f2b28b5c9e3e4fbf673ba72b
 lib/codeql/rust/elements/internal/generated/StmtList.qll a667193e32341e17400867c6e359878c4e645ef9f5f4d97676afc0283a33a026 a320ed678ee359302e2fc1b70a9476705cd616fcfa44a499d32f0c7715627f73
 lib/codeql/rust/elements/internal/generated/Struct.qll 4d57f0db12dc7ad3e31e750a24172ef1505406b4dab16386af0674bd18bf8f4b 1a73c83df926b996f629316f74c61ea775be04532ab61b56af904223354f033e
-lib/codeql/rust/elements/internal/generated/Synth.qll 1ba88215c3f0640558a644534b954e4b93acb15a0f51a1e4887230f451718aa9 747eb3bec1c7245e59ea2b500604f5b4e614e4f061473d1a22fa398ee48ba080
-lib/codeql/rust/elements/internal/generated/SynthConstructors.qll e929c49ea60810a2bbc19ad38110b8bbaf21db54dae90393b21a3459a54abf6f e929c49ea60810a2bbc19ad38110b8bbaf21db54dae90393b21a3459a54abf6f
+lib/codeql/rust/elements/internal/generated/Synth.qll 839aa6b03b461ed9c79192d905969c63c99e7a12074e3487e74d2163d20ee499 44b8caba3186aaeb6d6b5759610627f8bc791e62001acfd1a66324086c17536f
+lib/codeql/rust/elements/internal/generated/SynthConstructors.qll 3ceb5f6ee40b94955ce5f47feb454cc9129941aad3cdbe6e337bbe41e76a8a23 3ceb5f6ee40b94955ce5f47feb454cc9129941aad3cdbe6e337bbe41e76a8a23
 lib/codeql/rust/elements/internal/generated/Token.qll 77a91a25ca5669703cf3a4353b591cef4d72caa6b0b9db07bb9e005d69c848d1 2fdffc4882ed3a6ca9ac6d1fb5f1ac5a471ca703e2ffdc642885fa558d6e373b
 lib/codeql/rust/elements/internal/generated/TokenTree.qll 8577c2b097c1be2f0f7daa5acfcf146f78674a424d99563e08a84dd3e6d91b46 d2f30764e84dbfc0a6a5d3d8a5f935cd432413688cb32da9c94e420fbc10665c
 lib/codeql/rust/elements/internal/generated/Trait.qll 8fa41b50fa0f68333534f2b66bb4ec8e103ff09ac8fa5c2cc64bc04beafec205 ce1c9aa6d0e2f05d28aab8e1165c3b9fb8e24681ade0cf6a9df2e8617abeae7e
 lib/codeql/rust/elements/internal/generated/TraitAlias.qll 0a3b568100baaca129a12140b0742a1c8e507ef5b2f2c191ff7452c882ba4064 c32e74569f885c683f8d3977682fcbc8b7699b00d5e538cc6b08acdfffa56bc8
 lib/codeql/rust/elements/internal/generated/TryExpr.qll 75bf9fdda5238155d2268806d415e341fa57f293dcadef003b4a11562c4cd877 935c746f822cf183cdf36bef2332f01e7ce38aa09aa8476d64c1062c5e8f13dd
 lib/codeql/rust/elements/internal/generated/TupleExpr.qll 75186da7c077287b9a86fc9194221ab565d458c08a5f80b763e73be5b646b29f 0250d75c43e2e6f56cdc8a0c00cc42b3d459ea8d48172d236c8cdf0fe96dfed2
-lib/codeql/rust/elements/internal/generated/TupleField.qll d2580e046a576a1a7669463956c929912e383de304854a86eea5e45807a0a882 b41cbc48fcbb56543705e6bf708b72156307c71735d2ed42b97d8bf3c1099dd1
+lib/codeql/rust/elements/internal/generated/TupleField.qll b092db3eb240c9e15bcc27aa64bee80b48dced34398e7220d41bcd1a6676b1f7 4e152fb623e4cc8da57733c7c85c11dcb082fe395b337f92cc8b55da1af4c682
 lib/codeql/rust/elements/internal/generated/TupleFieldList.qll 9d4981d04c2ee005e41035b9699f03bff270c4e0515af5482d02e614a0b1a875 4e60b857fbcb668fa1a001e0eff03f1aa3a7465d32ce68e23544b705fa54fc5d
-lib/codeql/rust/elements/internal/generated/TuplePat.qll d61163a380f3f2c1709080e2df69a90764509af060e607e27e832862e4dae18c 108b7db493a21fe1fa0db99fceee952aabb0a128eac41e050877ab9136407403
-lib/codeql/rust/elements/internal/generated/TupleStructPat.qll 87e0acfeb51d48c55648d5af783f5ea006aaeccce990ba26458c6935fbdf7c11 7c761e66ddacb51307e653c6ad45bec3fba8315049fbe6c4503ed19241204d41
-lib/codeql/rust/elements/internal/generated/TupleType.qll 7fae8e881157a24c4ce4f960269ba8010e227a81d3055b571f861f7196f868e2 18085a19a102df8e2cded938b49709225e89f0ce68b4a003310647bb259a6bd3
-lib/codeql/rust/elements/internal/generated/TypeAlias.qll af02bb172b6f2d7f5eab8645a5a219eee8a4bbc445838f5739f18ba217c7e608 6d871471d673adae99c8b146f6f7ab204f24d52b5013b4582037a42b279c9f05
-lib/codeql/rust/elements/internal/generated/TypeArg.qll fe4441b3faa44e542c43a85353347df23d3f74da0c4b17cb0fdc60f5aca9dee7 1473d044e979e7cb6628525ffd454549cd8a37560488c695f534243946cf83bc
-lib/codeql/rust/elements/internal/generated/TypeBound.qll c4e5a5a919a30f4b334e8218b69fae887bf43e3b87bc63863b2c891beba14ba0 c9d394f31a7cbcfae95d511ad030ed515f51e87697233643b9ac12d6ac61ab18
+lib/codeql/rust/elements/internal/generated/TuplePat.qll 4e13b509e1c9dd1581a9dc50d38e0a6e36abc1254ea9c732b5b3e6503335afeb 298028df9eb84e106e625ed09d6b20038ad47bfc2faf634a0ffea50b17b5805d
+lib/codeql/rust/elements/internal/generated/TupleStructPat.qll 646847d866d6b999b084837f2569035c471c777fc4b1f483ce70d5d3fc5dc5ea 2cd1a4020876485635ae28e3d81eca0e596d77123d8ed40a2b18043adc6c69e7
+lib/codeql/rust/elements/internal/generated/TupleTypeRepr.qll dc494a783c495c96f2498230d160b59117cfa96d927861cd9d76676fefac8fb2 47da01697f143d4077978594b0c2f4c4bc5e92823dfcaad3ce8ab91725a536a3
+lib/codeql/rust/elements/internal/generated/TypeAlias.qll 56162d01356f018a3acf20b79dcc49a939ebf4f422939fae6a20b91cbbda8564 903b61117f4caa362a350a9cbec701aa59eb2052aff848999ebfaaf574e02352
+lib/codeql/rust/elements/internal/generated/TypeArg.qll e76ea103f7e9ead3be2c34718270d6893ca1980ee31e32ec19a92381e0040d73 9f2ea2d9434d57d7e3223e5d9d7662047e38bda26112751e122e2c1d03549eb5
+lib/codeql/rust/elements/internal/generated/TypeBound.qll 9d956fa99bb8153f575dd2959da021bc1a9207a78910a648f4429ab45f58175e ccf59e2bf4bea133335ae57acefe03d5650dcdef19960eeb00a9e3e4e3a3ef30
 lib/codeql/rust/elements/internal/generated/TypeBoundList.qll 31881cae2f71df5adf7a427357565bc0e7ba58c6a774a9d5835560a34c4db30f 1ff36ba34dd966d945d743781e3a1cccad4bb9fd5d32902dfd0bcad537501a85
-lib/codeql/rust/elements/internal/generated/TypeParam.qll dd57c5c370b4e3ed87c42c4fccf71b554cf1c588de1a1d1ac4ed5edbc1fb4664 09cd09537c1196f0a84850f654d324c6ad8aeaf9debcc3d9879e23a313ed93d9
-lib/codeql/rust/elements/internal/generated/TypeRef.qll c4c3bdafe3deb05338f5031c798fa6e72b58301ee7737a785314e72c9c4f091c e6ec0c680bcfe61ff79468de485241a75fbd795b2d501004324b66b003fddbce
+lib/codeql/rust/elements/internal/generated/TypeParam.qll e0c6b029113c6ba99513ef903bbb1e8f09741d1a1c45dc31d07bb91edcf05657 a31402aa6128b1e7da79148e59ce065041c9f274cfc59937252725e21e63330c
+lib/codeql/rust/elements/internal/generated/TypeRepr.qll 1e7b9d2ddab86e35dad7c31a6453a2a60747420f8bc2e689d5163cab4fec71bb eb80e3947649e511e7f3555ffc1fd87199e7a32624449ca80ffad996cdf9e2f3
 lib/codeql/rust/elements/internal/generated/UnderscoreExpr.qll b3780c99c5d57159bef4c6bd2fd8ec44ebd1854c892c1ca776c740f71249e58c 2fd451cbf0a779e8042e439882e7d9cadc19d1e596df3bbb086d16f2596407c7
 lib/codeql/rust/elements/internal/generated/Unextracted.qll 01563dfd769d6dc3c6b8a40d9a4dc0d99a3b6a0c6725c180d2bf4d7633929a17 a93ce90f8c03f4305e59de9c63f089fc7935298fc9a73d091d76933cf63e790c
 lib/codeql/rust/elements/internal/generated/Unimplemented.qll a3eb304781991bff1227de1e4422b68bf91e7b344e4f6c9e874b324e82a35e60 6bc4839fda3850a56dc993b79ef9ba921008395c8432b184e14438fba4566f21
@@ -613,38 +586,41 @@ lib/codeql/rust/elements/internal/generated/Union.qll 06a602aa7c7097e72fff6ea33d
 lib/codeql/rust/elements/internal/generated/Use.qll d42ccf3516a9f79ae8766f93ad5f09d3cdcd7b96844d4c9de64189b56018a7b4 70a9553a8f71f6cbfdd0f59a4b42292d13177613ceb0542436436e0ac2e1f8ee
 lib/codeql/rust/elements/internal/generated/UseTree.qll b39cbc96e473802372726d580febbfa7d73668ba476095aa4a61fae914865913 40ce6515b7df068fa8c0a7e5ae8984f50b71f6f96d625d631b28d525e3e868b7
 lib/codeql/rust/elements/internal/generated/UseTreeList.qll 829441cf309f008a6a9d2e784aa414ab4c11880a658f8ee71aa4df385cd2b6a8 ced82df94fea7a191f414f7e6496d13791d2f535046844b6f712a390663ac3d0
-lib/codeql/rust/elements/internal/generated/Variant.qll 2e3d8e7a7a97f2f33d6cad458ec0ded498c17a14b697722a96fffecd50c83097 46149bb257c08d5cd9139198b6519d7ad3fd25cc9ea6bfe99deea66f5f1ef201
+lib/codeql/rust/elements/internal/generated/Variant.qll e40dbb23e07c5b70adc577efdf7a064e773207f216cad8fe8905882b1da9f4a9 13f7be36d043afcfc156d2c01bb828de882df69aa732f284aa76c5f00b063544
 lib/codeql/rust/elements/internal/generated/VariantList.qll 4eb923ca341033c256ca9b8a8a5b4e14c7eac9d015be187fd97eeb25dfb1e18e e7865e975c35db49cd72cb8f9864797d3cfed16c3a675b5032b867ced2bbb405
 lib/codeql/rust/elements/internal/generated/Visibility.qll aba81820f30bed0fd2cd06831f7256af15ae32525b2a437896420b4cc067ea38 d6aed90b27124b812daf2ddd14b4e181277cbe638b4ccaab74e27681ac30e4ab
 lib/codeql/rust/elements/internal/generated/WhereClause.qll d6c8f72bbec5d71c024f0d365c1c5e474f4d24ded0d34c56c1f66b1e4a384e9d ed14311d140eee00d3b26a4972f53e20d5af1bddf88fb5618e7e2d3ae1d816f3
-lib/codeql/rust/elements/internal/generated/WherePred.qll 342050e824ca6eb6116488d46cfc03efa79193b4de6049e1f5d4a9fe527b3036 ed07a81de7d63f853c93cbb7291eea3d7169953e34c2f2f98b570028dd1f8cd9
-lib/codeql/rust/elements/internal/generated/WhileExpr.qll fec8a9211b82a80601bf731db17409c5de6bf145295623bd86e28f96452fd91d 3916cf0c0e3b82b834727fc37809dd3e158f395bdf39971abe40b98e5f95a4d2
+lib/codeql/rust/elements/internal/generated/WherePred.qll f5fdfd692c0d781d58847b86e389ba79489e8ef84e873e2b01d1d4e660e938aa 88dd90e1669487c023a74e48928162dcad7d122296fb065a23376e944d7989fc
+lib/codeql/rust/elements/internal/generated/WhileExpr.qll 7edf1f23fbf953a2baabcdbf753a20dff9cf2bc645dcf935f1e68f412971a8f7 d2fa7ada1f48f6b4566c75747584068e925be925d39d6e6ebf61d21bde3b6522
 lib/codeql/rust/elements/internal/generated/WildcardPat.qll d74b70b57a0a66bfae017a329352a5b27a6b9e73dd5521d627f680e810c6c59e 4b913b548ba27ff3c82fcd32cf996ff329cb57d176d3bebd0fcef394486ea499
 lib/codeql/rust/elements/internal/generated/YeetExpr.qll cac328200872a35337b4bcb15c851afb4743f82c080f9738d295571eb01d7392 94af734eea08129b587fed849b643e7572800e8330c0b57d727d41abda47930b
 lib/codeql/rust/elements/internal/generated/YieldExpr.qll 37e5f0c1e373a22bbc53d8b7f2c0e1f476e5be5080b8437c5e964f4e83fad79a 4a9a68643401637bf48e5c2b2f74a6bf0ddcb4ff76f6bffb61d436b685621e85
-lib/codeql/rust/elements.qll 173d5ffbcc2874757033caab37559e84dbcbfed319730f8e41a4e9e10b146835 173d5ffbcc2874757033caab37559e84dbcbfed319730f8e41a4e9e10b146835
+lib/codeql/rust/elements.qll a055d1f5bf70c9f8f6d5e34087146e813f3452b225b07b64f087d6e61f52a3b3 a055d1f5bf70c9f8f6d5e34087146e813f3452b225b07b64f087d6e61f52a3b3
 test/extractor-tests/generated/Abi/Abi.ql 7f6e7dc4af86eca3ebdc79b10373988cd0871bd78b51997d3cffd969105e5fdd 2f936b6ca005c6157c755121584410c03e4a3949c23bee302fbe05ee10ce118f
 test/extractor-tests/generated/Abi/Abi_getAbiString.ql a496762fcec5a0887b87023bbf93e9b650f02e20113e25c44d6e4281ae8f5335 14109c7ce11ba25e3cd6e7f1b3fcb4cb00622f2a4eac91bfe43145c5f366bc52
 test/extractor-tests/generated/ArgList/ArgList.ql e412927756e72165d0e7c5c9bd3fca89d08197bbf760db8fb7683c64bb2229bc 043dba8506946fbb87753e22c387987d7eded6ddb963aa067f9e60ef9024d684
 test/extractor-tests/generated/ArgList/ArgList_getArg.ql c07c946218489a0ad5fe89e5fd4a7f0ad84a73dc2e650729f48a340cb133be84 ff2382c0693f47e5eb1290aca325290e60c19d877b25b1d7e2ee96009f5fe934
-test/extractor-tests/generated/ArrayExpr/ArrayExpr.ql fd4e504678714c99a987069e5013bda04313573cec2bab31b74bc4559bb73d7f 0b63120b61964a215ec451793a1b5aef525882484ad62193d7635b5a370881d4
-test/extractor-tests/generated/ArrayExpr/ArrayExpr_getAttr.ql ce143c8b416c35270cca839848baf6d8cda74251f3717314e0f332fcb74a9259 c86d282153feee3facad752ed0fc1638be0cbaafca4ec620f337ad61b694cade
-test/extractor-tests/generated/ArrayExpr/ArrayExpr_getExpr.ql e8b7e24db6fc6098131fea1053430920b2e2f33d2aa52b10d2ff29b9efd70a88 a52b6b2476104695b395d86bbd1a99068372ca56989ea94b150055e664ba034a
-test/extractor-tests/generated/ArrayType/ArrayType.ql d781ea647d60218777261d82230bd85f989a4768a043e736d268363b5a777390 b5c7fa0aa1b8b1f3a82b8af7254bf20efd3477bba83ad53530959d1733636604
-test/extractor-tests/generated/ArrayType/ArrayType_getConstArg.ql b6a250873bc2d553219b8301a15bd19a4044f590085992c532a800bf3ab744cb 5e6b9dbbe2d3ea7f6fa3fba4811517a528d5eb58169b69d1b9113e1508c6e627
-test/extractor-tests/generated/ArrayType/ArrayType_getTy.ql 1c23613e509ada3ffc1f727d0db7c5955dbc104d886fe5f9d8f39413b54d16b0 a662d234e1e54159d931a873f20ed8953d9b27778c7a6ca898f86b31d1dae0cc
+test/extractor-tests/generated/ArrayListExpr/ArrayListExpr.ql e6f9fe0dd6af5a1223e1e59827346aa2975bd665aeda36e8844ffb3a79c5e532 38576b6f7257c119917442e4f54fc883480e4da86d2542a1ac16d723ebbba039
+test/extractor-tests/generated/ArrayListExpr/ArrayListExpr_getAttr.ql f1ca0521f641bed17581121c0f07c7f8737d9891acdde2c68de59a0684e86a34 496da6513cfee28a31274a2e72b5a58d843407ac5e4870296da0f0b8e7fc85c1
+test/extractor-tests/generated/ArrayListExpr/ArrayListExpr_getExpr.ql 6920b532623e8c919701a83a059d9b1aac9e8673e7fdbe26e0a8af5ad6a34b8a 601137c715ce947d79f39d5b131d7ab167a16d29477eacdb1380cd647c4ebac4
+test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr.ql 60a0df80fd34ca5c960b5e060c7090f8bbb8af83aba7099aa298a80e19a13346 c41f80601c7f50eee01c0ed7587e0198296d6a8a5b95c98dd8f865901d34ba5c
+test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr_getAttr.ql fc6ca212aa633b73ee21f7564631c9ad345f15839656d88940dc686cf076a344 d580a367305adbe168996a294329b1adec36956a500ae9717a4af78cb2bef4e6
+test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr_getExpr.ql 6b00037350fc36cc46345a290bda4c4d4ff99050b970d23eb94294313046a884 0687638b46e43bba9dda35d78ff7b40f976e5e38271eec77e7a21c28349dc42c
+test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr.ql cfb831ccbc04092250931e0bd38c7b965fe0fd868081cd5f49fb11cd0da9aa0d 51e05a537928d7fd0aedd800f4d99c1f52630d75efe78bf7b016f1ad2380583b
+test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr_getConstArg.ql 38db5e08b7a78f52247b9894fe2f3dd80b89efd2a3ddce446b782f92f6e2efad 8a4d38deac59fff090617e928fb698fc3d57f3651f47b06d3f40dd4ba92b2c93
+test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr_getElementTypeRepr.ql f74222b11cc52d3ac79e16d2943c1281c574fee954298752a309abc683798dbb 9701ebe468d76f72b21a7772a9e9bb82d8fd0a4e317437341f31f8395780dc33
 test/extractor-tests/generated/AsmExpr/AsmExpr.ql 1273efcd8aab7de2a04ead74075d25c8a22afc9f0e6a3fb4322e3508a2cb6f84 cdd5389a269c048f56afaf3e93a0fb076ba1f445d6dcfc6621d8a324cac2f421
 test/extractor-tests/generated/AsmExpr/AsmExpr_getAttr.ql 93e644147ddc4de00c882c32d17ff3c22822e116b67361d52217619153b7d4c4 4c0c3f72707f41e879426ff75c5631e9283dc0507316740bec22216c5feb04e9
 test/extractor-tests/generated/AsmExpr/AsmExpr_getExpr.ql 4a37390e948fe336b592342b0c2b63afeac3000ce1416f5875cc9b0ce5a826e4 d32df64ddc3ce1b0536018ddcff30a24d9099c67e6bcbe9a4693ffb6e478361d
-test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.ql 2bf498a1e318cadf66f9f6341b41247c09070dbbab6d15ed4d3cd986a7f7da85 24d62bb3cb0a97c0e6180221e6cc8be86d9616021f8ef53175bbeabb5151a613
+test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.ql 31b925ef046811d8f02253619b4346ed4998fc32230c025edd971d3167c15e39 f7974a74e5673a6d7665d48796561ca4b3231a06690d3544186078da467c86ff
 test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getConstArg.ql c81e25fd7885f13c0500e8f9b84195876e70f2b25ad604046f497818226c8542 62ac0e7c82da169c248e4f9e0e8f866d2f4e599b03a287c2bd407b95a5d9efc8
 test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getGenericArgList.ql 4d20375752c000aab8d2e4988fff1a5c95689d114c8d63f37b389b95000ee873 957e360a4eeefa2536958770a7d150fda610d1d45c09900dbe66e470e361e294
 test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getNameRef.ql 0fbb10321c355b15a9fdb2022af254d9d50b084117e47abf4c03bacc6189c9dd 084624f77b21062822fd16441e0c05e7820140bd2e468aac624782f0c4474e26
 test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getParamList.ql 586cb26683e522469a5094d359be4d8e5c6a3a74c1621a059bfcbbbedc0e34b4 84784b38c24313f3ffc88371421550922d9deb44d09ca7727ca77e892a672dc9
 test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getRetType.ql 3e18791a74c12d93ac8f786aa76bd836876052837bb9f0b25222cde47c55e419 b53bb52ff98c1ca0ba09ffce034a97ddd86e32828df7acb9bf34e20c4fb19664
 test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getReturnTypeSyntax.ql 37252b5cee5ae64c36612aea57a6766bd34254ae35b9774642a36a8222aecfe6 c1f587d52b39c8aa66b9e6e4f36f40bda17dfcd72714ff79a262af99f829f89d
-test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTy.ql 6973aa12e00987ad1482401fbc0855a5fa585df5b3d44e2db4e81a84e5af46b1 791822b44c21f78801c8360e2ee4651352719204d9b3ce75bd2d77e5f805f509
 test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTypeBoundList.ql 7e006ac8e8574c66a312b1389c7a85a83561b946e060575cc7234ef523b1a3ba 6123b375796c014a0bc96d39877b3108c13eff34536aa68402bda85511da18da
+test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTypeRepr.ql 0e41d63d34076111cdd00ba08e93da36411491ea6eafa2e61e94ea6d05e6bfa6 7bf0e678fe310f9085199877ac2b0817109cd10d26a3179715493b54a2cea649
 test/extractor-tests/generated/Attr/Attr.ql 028ac0a387f674205c5ef903238872ab1b6b7e2201f58c31776cdf740daf437c cb56a22887e0737d28034b39d7c3fb37a3d6eb1f34ce3d112bcea2f0affb3b13
 test/extractor-tests/generated/Attr/Attr_getMeta.ql f1e2df2bc987c670e31b454ab51b3028efc1018fbed2298a8c97f554eb1862f0 a9115ced872c89edc398bda1cbd54068f9065debc14ea5ac887ba13ad8f4e3d8
 test/extractor-tests/generated/AwaitExpr/AwaitExpr.ql 8dcc94a553fbddf17dfc619fbac563a9dc4fc6029860e10703e9ae9765d9ab66 52e7f0c98e6ab5dcef04b2ab5283ecde76e61a2297aa2080d16998f93dc923b7
@@ -658,7 +634,7 @@ test/extractor-tests/generated/BinaryExpr/BinaryExpr_getAttr.ql 26d985ac4b668d78
 test/extractor-tests/generated/BinaryExpr/BinaryExpr_getLhs.ql c3f19d8a60066ad6b1810291a669473c75b659cd2f6ac3ab9ed3db2203d4145c c05c5e0226e30f923155669ffc79cfe63af1ca464e8dfc85888dda5f7049711b
 test/extractor-tests/generated/BinaryExpr/BinaryExpr_getOperatorName.ql 33612159be1c111e3306009d0b04579450fc962a81119b6ea4e255d3c409b401 1a0995b298f50242217cfef81dca8ac978e19e06f90a5f4caadcb6f84460fec2
 test/extractor-tests/generated/BinaryExpr/BinaryExpr_getRhs.ql 3bcd36b678e87d5c29a43b69c54c80468a89aefa7e69481b48158ae794a53160 a629dc1472b3f6fd7c608ff760e83d8e1363db81dfe9a4b2968690c2ba4925ca
-test/extractor-tests/generated/BlockExpr/BlockExpr.ql 0ab66b190d4e2aa784e61088c4779ef4d08cb4453677ea087c4f9aa369494bc2 1c3b5794008114d1297695d82590220929e3974e27836b2c6062d14b73379a40
+test/extractor-tests/generated/BlockExpr/BlockExpr.ql 19caa39aaa39356219dda740b7152f85e43a4f8d6295841e2c535c7e3bda7a5a bd668574ba41021e758e391d4790b871439badb2486ccf6a5aaf788ad6ae4142
 test/extractor-tests/generated/BlockExpr/BlockExpr_getAttr.ql 15d4d9853d3262ce6ec629c075c60a76eb112dcafe34b71df0e09b39282223cf 792c498bc7079bb5b93034b8a87db3b275a591d78954e844821aeacffe4258ea
 test/extractor-tests/generated/BlockExpr/BlockExpr_getLabel.ql de3c28a2677ed71ebd95207aa43ce270765f7f556283f095f1f6296622b80cbc 414ebbb2bfbe4350f933fc3d3636b49a6bb8242e200180780caf95ab8523adb0
 test/extractor-tests/generated/BlockExpr/BlockExpr_getStmtList.ql 8c391dfeb69bd92c547a2417bf231cc960a8f34845802722214294728772316a f3e847fa594e9d9cf25d09a0396a10176aad1100c1977a24756ff6287a79e69e
@@ -668,14 +644,14 @@ test/extractor-tests/generated/BreakExpr/BreakExpr.ql cdde2855d98f658187c60b9edc
 test/extractor-tests/generated/BreakExpr/BreakExpr_getAttr.ql c7690a9aab1923bf3c2fb06f0a1d441d480b3c91ee1df3a868bbbd96c4042053 c592dd077fb6e22b2d6ddcaec37da2c5a26ba92d84f5d1ae4c78a615b9013765
 test/extractor-tests/generated/BreakExpr/BreakExpr_getExpr.ql 0358f4fe6a66da56177703cf0e991042729c5e34ae8b6dccbb827f95fe936c72 1cb2dd778c50e19fe04c5fdf3a08a502635ea8303e71ff38d03aa7dc53213986
 test/extractor-tests/generated/BreakExpr/BreakExpr_getLifetime.ql ad83cc0db3c0f959fef6bb7ce0938d241a877e8cf84d15fb63879be2fe47238c 240b2fe2156b763d3a82fc64159615872db65b65ffb9ba2f3fd5d1ebd6c60f34
-test/extractor-tests/generated/CallExpr/CallExpr.ql 69d88b3c799f6e81fe53fe04724ed6c1cbfbfcc21023dd62aed3a3f852c6a2aa 0caa94802919d30bf2749d8a1c58545163e2b1cad5490f19158b5e5063806443
+test/extractor-tests/generated/CallExpr/CallExpr.ql ffb0cf1cb359a6dcbdf792a570c281e2d300779dca2dbc0f324990652adb972f 978a9e6c82758f9e8b334a682a02d6b893a6bf1db3cd85e9535839a9696b09b4
 test/extractor-tests/generated/CallExpr/CallExpr_getArgList.ql b022e7b6b6db9932e787e37b7760c6a09c91140a0368940374a2c919688e0488 c20849c96b53c96f6f717efff5e8b4c0e900c0ef5d715cfbaf7101c7056ad8f4
 test/extractor-tests/generated/CallExpr/CallExpr_getAttr.ql 1ace458070875b9ff2c671c2ee18392ea7bf6e51b68ee98d412c8606e8eb8d33 4c35da8255d2975cef4adee15623662441bb8f2e1d73582e4c193d1bc11cc1b5
-test/extractor-tests/generated/CallExpr/CallExpr_getExpr.ql f680f04423ece282c459d5908e5aa0bc43ca072ff0e605587dfa94210da1d06d f8a709015b8317b8e2dcf3b3ee9370e2c3a655ef7e3c6034b1b90f4d75ebdda2
-test/extractor-tests/generated/CastExpr/CastExpr.ql 2ffb22ebc6e47953a49162488b3605d36b9d89330b1e71187066e7bbc40a22ad 7621a39d49f573b9862b9a4e1021d53205670ee59b49e4d81128637926f76485
+test/extractor-tests/generated/CallExpr/CallExpr_getFunction.ql 060a6c8b5b85c839b14fe96f9e50291a7a0e5662a945f4f337070f782ec76715 e9a1e44433936146d87be939aa160848b9a7d7333c36da601fb7d1a66d71eb59
+test/extractor-tests/generated/CastExpr/CastExpr.ql f8d889de678f09c32b8e999a1667aaa38366a005d37a537883bce7ea576aad66 488f8285d6af8644968c19488ada65c8f4b7fd82f57271cb290b4896a675d2d7
 test/extractor-tests/generated/CastExpr/CastExpr_getAttr.ql 5d5d98172e495cdb8b5cea9d6588c4c245107b441464e3ffd6c27668af11ab4e 5820bf083aaa4c3275004a2cd9eeecc4b45ab96916cbc0655a1b42611c540715
 test/extractor-tests/generated/CastExpr/CastExpr_getExpr.ql c37186b8f3e3dab8ae28c0da7263ff7272c40501beb16736ec0fb8990d285e22 59d50d7349234afcf84986b7570db9dcd342e16812f7c46199d4736cdfa5462d
-test/extractor-tests/generated/CastExpr/CastExpr_getTy.ql ad5d6e260e1495ba360bd2ade3b60f09705a86a08d618acf8c4aff342c8ee200 c02c1dc65ba9160bc28827e40473915de5403bdc91c16d9d8b6778aa97314a1b
+test/extractor-tests/generated/CastExpr/CastExpr_getTypeRepr.ql ab6b0a61adc404c89c0e2e1962236a8e703fdc5092512bb4a5d9995af8e13c7b 4e7f6b6f58a1ef34ed45e31e35154dd8dc59054ebedcaa87200c84cc727ef1dd
 test/extractor-tests/generated/ClosureBinder/ClosureBinder.ql 42516df87ac28c814d65f6739b2ede6eaa41c505d64756a3b8c7e0ca79895230 8b840f92ec033a4ef5edbe52bed909d8be0fffddf6d3e4bfaf9a8bc174fa2f2c
 test/extractor-tests/generated/ClosureBinder/ClosureBinder_getGenericParamList.ql 71010c43a78a7abe8e63c94353f4b7eb97aca011755d200e7087467c1e3b7a68 2c834328f783ec5032544a692f7e23975bac0228b52b9f8fde46ef46a5f22a5f
 test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql f25f9b32e5c0cd61e4b75053a5af4640a08b115ea5a4310ab95df450f6dfe1c4 9b731218857fa16776e29bce084c2ec1526b24e15f46d4f24047917d77d4646a
@@ -685,28 +661,28 @@ test/extractor-tests/generated/ClosureExpr/ClosureExpr_getClosureBinder.ql cbfcf
 test/extractor-tests/generated/ClosureExpr/ClosureExpr_getParamList.ql 68ce501516094512dd5bfed42a785474583a91312f704087cba801b02ba7b834 eacbf89d63159e7decfd84c2a1dc5c067dfce56a8157fbb52bc133e9702d266d
 test/extractor-tests/generated/ClosureExpr/ClosureExpr_getRetType.ql c95bc7306b2d77aa05a6501b6321e6f1e7a48b7ad422ba082635ab20014288ae fe72d44c9819b42fff49b9092a9fb2bfafde6d3b9e4967547fb5298822f30bc3
 test/extractor-tests/generated/Comment/Comment.ql 5428b8417a737f88f0d55d87de45c4693d81f03686f03da11dc5369e163d977b 8948c1860cde198d49cff7c74741f554a9e89f8af97bb94de80f3c62e1e29244
-test/extractor-tests/generated/Const/Const.ql fff4c81591a1f5e691f2ad242e8fe8e2b0d6b0f974e312a2a0bdb7de80b985b5 0cdf3eba64d5d66d5069727bad08cbeb1266456f61b3967d27f542412cf56d47
+test/extractor-tests/generated/Const/Const.ql ef2d2730e08ff6c9e5e8473f654e0b023296c51bc9acfbffd7d4cc5caeed7919 906f8624b10b3fade378d29e34af8537f86d9de16a22a188887ecfc165f5ded9
 test/extractor-tests/generated/Const/Const_getAttr.ql bd6296dab00065db39663db8d09fe62146838875206ff9d8595d06d6439f5043 34cb55ca6d1f44e27d82a8b624f16f9408bae2485c85da94cc76327eed168577
 test/extractor-tests/generated/Const/Const_getBody.ql f50f79b7f42bb1043b79ec96f999fa4740c8014e6969a25812d5d023d7a5a5d8 90e5060ba9757f1021429ed4ec4913bc78747f3fc415456ef7e7fc284b8a0026
 test/extractor-tests/generated/Const/Const_getCrateOrigin.ql f042bf15f9bde6c62d129601806c79951a2a131b6388e8df24b1dc5d17fe89f7 7c6decb624f087fda178f87f6609510907d2ed3877b0f36e605e2422b4b13f57
 test/extractor-tests/generated/Const/Const_getExtendedCanonicalPath.ql 3300b902e1d1f9928cfe918203b87043e13460cfa5348a8c93712d2e26d61ced 71e7b80d3290f17b1c235adaca2c48ae90eb8b2cb24d4c9e6dc66559daf3824c
 test/extractor-tests/generated/Const/Const_getName.ql b876a1964bbb857fbe8852fb05f589fba947a494f343e8c96a1171e791aa2b5e 83655b1fbc67a4a1704439726c1138bb6784553e35b6ac16250b807e6cd0f40c
-test/extractor-tests/generated/Const/Const_getTy.ql bf9abfd2be9d22193bc6be9916c7171d79ae7fcdaabf1fc9659997d11d2f074e 133348f60312055fe112eca3a0ef2e1e210b1690261dd9b06979214908d59097
+test/extractor-tests/generated/Const/Const_getTypeRepr.ql 87c5deaa31014c40a035deaf149d76b3aca15c4560c93dd6f4b1ee5f76714baa f3e6b31e4877849792778d4535bd0389f3afd482a6a02f9ceb7e792e46fca83e
 test/extractor-tests/generated/Const/Const_getVisibility.ql de6b2e9d887316e279b45fab7887980ca7d93fd32c2259f3a06de2b6e2957c12 2f135cdbbb84b43d282131edb7eb4df6caba61bf7421881a49d4679f0f44f661
 test/extractor-tests/generated/ConstArg/ConstArg.ql f1422b216eb45819ff41f0c19e0f88aa184ddd3fa2984ba22ec46df398147fc3 d2e4f367848c2bc4f6aef51c1dd8180035c39919430082c83f18a3f324228df3
 test/extractor-tests/generated/ConstArg/ConstArg_getExpr.ql 317fd83ad51acc3ff3dfab71ebb1385b67d49404c1d7b3804a8ca3c099b84e99 91ecf5ebbfc1aab286dce708680f0be97417f9755676db7479fa6836e50be845
 test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.ql ee17b4deba9c503130e3ce565102bc8e181770efcb1309be9c822f0a7ba6fc17 638ed17b5c009e71b31f580c4060ba763bd4208c3984b6c032183ab46a4dd43d
 test/extractor-tests/generated/ConstBlockPat/ConstBlockPat_getBlockExpr.ql cc06e762e1652e467c7cf02c34f17c621fb3a938f294ee527fa04ed78c8701ec f863f8f6bfc9d169b585ae56b4e4ac0fc1603fd14775450e950cca4d5ea28e8a
-test/extractor-tests/generated/ConstParam/ConstParam.ql 1c2ec1a00ffc754ade227536f3efe789cdbee714fa003abff5e0221b9b53d08a 6f24ef0b280b18603a6efd217c691c4249898be95dafd5ff5a586cb2f2ecdf40
+test/extractor-tests/generated/ConstParam/ConstParam.ql de4a92306dd3f65e0d308d34715f388815dc70955b819c627f5839cbd9d8b464 ff98827d3ab57bfc48356072de0172e8e1c2374dc6a086b1ad721b6d9e6038e6
 test/extractor-tests/generated/ConstParam/ConstParam_getAttr.ql af8949f1ea039a562a3b3561185a85f7f8a871bf27dba0580782f81c62b6508c 2874783b84fdce47b809f953e02c36473cad6a2d3dd1c0f1a9cb14a3e28b9c30
 test/extractor-tests/generated/ConstParam/ConstParam_getDefaultVal.ql 021630468422c30e7aa623bdf4e97f3076e68087991723c624922b1ee608d173 9fd78738cfd0455be2c655852f6c618e901af80c6b6791396d9683c118a44e91
 test/extractor-tests/generated/ConstParam/ConstParam_getName.ql e2e9b75dd7ce501793efce75079aabd3851b91aa4d437972693bacd7b04859d8 4d2326b39af870a2ef8b37448f78395cdb5c1e94df88f137ef71f8fd3548cd8e
-test/extractor-tests/generated/ConstParam/ConstParam_getTy.ql ad3f1ee12d3ba8e851856cf3e75566791218e40649a8bf54b1f08764c8b5feec f4ed7f40f83f59df8dd2f53073f73ee94c2ef6f6f77963f81ac8c62dd88244c9
+test/extractor-tests/generated/ConstParam/ConstParam_getTypeRepr.ql f25a4695e06a6410264e979c7a4421253437cbab5837afafffbe69ecb384ce55 4b7ead1298ea0b5e12dfa2d75aa4732e1070c6880982a9cbaccc8d129956a232
 test/extractor-tests/generated/ContinueExpr/ContinueExpr.ql 971ccb238aec663855745fa2669d5f8973a4e6c76bacdf0deaf23522ec1cf80c 4e3ceb4c4cd833ad8311bb02e5cda18163082e341cd8a3def60734a53cca8929
 test/extractor-tests/generated/ContinueExpr/ContinueExpr_getAttr.ql acb261869d3b3c65e364e7b6fbd7afdf5305806d4417b05044beed9a81e66ea4 af35ce0aee87ddc7a0cd34be4a480c619940d036d5cecce0e4e1fcd75b7c553e
 test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLifetime.ql 39dae9872d92fa9b15343c93da545c2b0e15b4f27f2296c200fd4611b68858d5 52a209022e3b83260b4ef5513ffbcc1ca1f7c21bad2c721a0d3698793d2161d2
-test/extractor-tests/generated/DynTraitType/DynTraitType.ql db4cf318a76eaedaa9a9deaf11009a24497b88557439c2e0560290efe950ca05 e0fcd8be6bbe2e305ac16e25925a50206f36cba25cb0bc4c7e9b166d2ee6b19f
-test/extractor-tests/generated/DynTraitType/DynTraitType_getTypeBoundList.ql d04a1836c28f14884771f5868d5a3f551d9251c3c3a6c07a4dd9dbef6b764875 9c590f1ecd375c22fbc0ad5657243ef40fe7a7684ee81e57e7efbb73544d4398
+test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.ql 513d64b564f359e1022ae6f3d6d4a8ad637f595f01f29a6c2a167d1c2e8f1f99 0c7a7af6ee1005126b9ab77b2a7732821f85f1d2d426312c98206cbbedc19bb2
+test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr_getTypeBoundList.ql b20720ff0b147d55cea6f2de44d5bf297e79991eaf103938ccd7ab9d129e9656 eb8c9db2581cea00c29d7772de0b0a125be02c37092217a419f1a2b6a9711a6c
 test/extractor-tests/generated/Enum/Enum.ql ed518d828d8e2e4790849284de1d0d5e728dbc2fe5e9f187e8ebfa2d503efd5a 7092b963eb133371e1cbc09d45f8c2308d7093523140b351d67073a8d258643e
 test/extractor-tests/generated/Enum/Enum_getAttr.ql 8109ef2495f4a154e3bb408d549a16c6085e28de3aa9b40b51043af3d007afa7 868cf275a582266ffa8da556d99247bc8af0fdf3b43026c49e250cf0cac64687
 test/extractor-tests/generated/Enum/Enum_getCrateOrigin.ql 76d32838b7800ed8e5cab895c9dbea76129f96afab949598bebec2b0cb34b7ff 226d099377c9d499cc614b45aa7e26756124d82f07b797863ad2ac6a6b2f5acb
@@ -738,26 +714,32 @@ test/extractor-tests/generated/FieldExpr/FieldExpr.ql 1b45da610feb62cee42f7a3866
 test/extractor-tests/generated/FieldExpr/FieldExpr_getAttr.ql 609c4f1e275d963cf93a364b5ec750de8cb4790abdaa710cb533ff13ab750a4e 8c2aa84b1ea6ef40a7ee39a2168baf1b88323bfbc6b9f184e7b39631765a48dd
 test/extractor-tests/generated/FieldExpr/FieldExpr_getExpr.ql 57df2d733faf3e3e30ae106d8423aab612ab0ddf8659da008e384130cf1e8023 1e240bee8e83dc26f78d2c55464ca1fb88d773691d47aee9a2182c90f57eb8f1
 test/extractor-tests/generated/FieldExpr/FieldExpr_getNameRef.ql 8631f5e8bdd72443a1ee3d667ee9136a51ad49dfd206612a36b79686da1beb19 692aef607108b8e3eaa78b8c915f2fd1d310905f8fea770b9694722a9a2a6232
-test/extractor-tests/generated/FnPtrType/FnPtrType.ql 50b76d678582cd0b8d7cc4a7658d5009d660bafcec6bd9968c9f60a7f547fa23 5bbf2504eb835e231a2355bc5d099322423c49c6af371902cf20a150e360cea7
-test/extractor-tests/generated/FnPtrType/FnPtrType_getAbi.ql de1706382c2980c02dbdd295e0a2320c992afa3f19af0c2378b9980a7cd0c481 a3fa36711949d9d5ac53cc5dd39cb19b397c3f2e47c1d457df470c6e5142f9be
-test/extractor-tests/generated/FnPtrType/FnPtrType_getParamList.ql 9ea393acf37919e2fd1bbc16e738440e00a56552bf80baef9bfd2a9a405afb93 3b4237b22eea569cef0081eb3ea16b2d0f01f8f070f21e16390267e9cbe0cf57
-test/extractor-tests/generated/FnPtrType/FnPtrType_getRetType.ql 57f662e4778e1bf4103f061bb8085def0708528f94045c9ff4a95ce802fff13d 924b924c7d766458e956afa0963e6eb1bfc083e5f9aeae64cf2d08929f79612c
-test/extractor-tests/generated/ForExpr/ForExpr.ql eff335a301b9a71292bb6da0dffdf901c7a51df9960e9250f9eb980aaaa0c7ae ce7ab100c21c6fc334a4445b2ee311ae6c67992ef659ca32c94d60ac884936e3
+test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr.ql 277dc617dd193f414c777e85db358f6dc5ebd7c029ac321d92fc6f1036da6abf 2c1a245975852e010552b0e0157b0daac7137cb25aa059fa5cc3adb43544a52a
+test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getAbi.ql c4a7519f9ab86de609a0155d41a0fd6cdfab6bbd7ffc41f3d5ef49565bdb5825 a0404f9a702f007d78f24291e80e939ce3ed2b603e436998dd1337f978499137
+test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getParamList.ql e097544fa9a1c173a996f323a90aa2b82aa6f12f30cd602fbcf0d4bfaf136311 6b5f8a4e4bee41343d075561005442c89b2b16ba547226f54c060c206b0b9e26
+test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getRetType.ql acd208155569ff3e9f4560f274560f1fb08585f18bfde74f3a011b469a492096 fc624e3dbe69fbda31ffcf86398213423cfabc4da33ae5099caed1f3751dad25
+test/extractor-tests/generated/ForExpr/ForExpr.ql 1f8b7a9bbe7a8c077864be64dc51d91ec267c4f34f1cad80fc79902cc0af04ff ae999fb206b04ed81fa08bdd7617cbfe932c5e4109285e10108613cdebba8f7a
 test/extractor-tests/generated/ForExpr/ForExpr_getAttr.ql d3399b7453e10ff48efc79ec38dd9b6e06bb472b9c39f559242d003e7f63b1d9 ba37e6bf129e1c2f9094e093bbfbf41864f2cb7725a64334f9443270dafdbfdc
 test/extractor-tests/generated/ForExpr/ForExpr_getIterable.ql 90a6540f8a91cfe3ed1bdde1e680786ce5a00edbb797a8fe70bcc0507c438fcc 65c67ad5890aa502628ee73efd26bcbd4597a8bdfc9839233ede9e26393638f8
 test/extractor-tests/generated/ForExpr/ForExpr_getLabel.ql ce90da75e040f448d524187357f3ceededba72407a84c1dc8e1498ed9788044d 0e23d43e0b3412fe90c6a5a4331f8da85eebe19e05b8c7d9710056857280797b
 test/extractor-tests/generated/ForExpr/ForExpr_getLoopBody.ql 21657e470752bd83e05e176c2ca9371ba0f7ca3d1f97f764a42dff3caeb46ff2 0cafad7adf79ce90f475465b4a144e6529c6345504282b1ba3c6a12ff2e99892
 test/extractor-tests/generated/ForExpr/ForExpr_getPat.ql 1e0205a9b3a58fd2ddba49ef1b13a82c812519604d4c5bc02f23cbb6ce960016 d00efc63d714b1c76e4b0a67195d4e605f43a1e49d469f4f18bfa18d12280b63
-test/extractor-tests/generated/ForType/ForType.ql ba930d0c4fe52d57449ce4025b1c3e49c688afc5ef18ee8ac1ed7a9fd3eb8d41 08e9aa0301a942f6f9564ddeddc69606f3e2916e1b551cc56ae3b6048c56ce61
-test/extractor-tests/generated/ForType/ForType_getGenericParamList.ql e25cd79737bbae92d8f417c6bbf6fb8ae660976b8005cd91d0900c7076fdd827 b1e32b7e3ca9f29a4564f83e37ae53de6baf04837a393e6dedc64a01cc7d10e8
-test/extractor-tests/generated/ForType/ForType_getTy.ql e932d3412828bb83afc42e2dc1a4cbe9fcf25ec9a9617ec138722f834091a61a 298fc9df34b2cb436c8f180c4d229341ee4a73e3c451b905f017f32a6f65056c
-test/extractor-tests/generated/FormatArgsArg/FormatArgsArg.ql a521903c73f79e2616f7b8ef76790e11cbf432f8437825d52d117da232022b9e 4cb195d09ecb51e5bbd5c1c069ec1720f74fc074efc88b0f5c07cfc140167775
-test/extractor-tests/generated/FormatArgsArg/FormatArgsArg_getExpr.ql 7e1a7f902fb661660760d2a2f3f4cb6818a0c9f5b5061ede6ae80223774e4e09 8a50f64cba6f56320631206c801160201e3c98e74367bb035d689baaa9b4e411
-test/extractor-tests/generated/FormatArgsArg/FormatArgsArg_getName.ql 0e2f24388d516e14d195957163a2d5d97029c9e11a83ca71cf69e00ecc0bb2a8 dab2969f5ae6a15ec331c0152e7c116d1ee2c3d073b2d4da59ffbcb83404c65f
-test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.ql 0cd439f61569ecf046e9548c458329647f331bfa034ae8b3d4f7628595881287 013a948607e1ac96100ea9a8cd3c8f357e378ac21baa015dcf4927022c2bdafb
+test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.ql 38fa18958dc8c1564abf0c38ebc7e76bc64904f9774a99e46504f903e9c19379 8384e007868981dcd8120f4ef52475ca99641a530a487cd9dc7eba98b9391060
+test/extractor-tests/generated/ForTypeRepr/ForTypeRepr_getGenericParamList.ql 33535c02c7000e89e4d4e4560499b9512455fae407e72e05615b38f9e950c6bf 35a6aa7de0f627fb96ca7f4f2134b060a820327a3de4970fa2790c8fbea28a2c
+test/extractor-tests/generated/ForTypeRepr/ForTypeRepr_getTypeRepr.ql f24d02c57af9f4fb4f5c3058e236a8d9b4c4f6f2aff84e65497f693309bdf93e 1c93d6214ee0a89e2bd5d0e02800e29e8a14ebd7efdb6a62380edb97dc902def
+test/extractor-tests/generated/FormatArgsExpr/Format.ql 25268dd7ad2a58b071c3a38164944c1b7389dfdda01c99ef2694a475596341b4 0a3f674d5a4f005835b9a5ba11a6e8bf58477829258f30ae7d8f76f8986f7b7f
+test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg.ql a521903c73f79e2616f7b8ef76790e11cbf432f8437825d52d117da232022b9e 4cb195d09ecb51e5bbd5c1c069ec1720f74fc074efc88b0f5c07cfc140167775
+test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg_getExpr.ql 7e1a7f902fb661660760d2a2f3f4cb6818a0c9f5b5061ede6ae80223774e4e09 8a50f64cba6f56320631206c801160201e3c98e74367bb035d689baaa9b4e411
+test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg_getName.ql 0e2f24388d516e14d195957163a2d5d97029c9e11a83ca71cf69e00ecc0bb2a8 dab2969f5ae6a15ec331c0152e7c116d1ee2c3d073b2d4da59ffbcb83404c65f
+test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.ql 7b6f09b23d0dffa19b8dddf7f5cfe53068f8a8e5279e235c6d54e60616bd0822 47db74f035770ce708a00355acbfd4ae99152b7eb29cf28001985806a4efe5aa
 test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getArg.ql 8f692486be1546b914b17abdff4a989dfbaa889bfa1fc44597f4357806c1a1dd da9fd237e31e9c8dd0ef0c3c968157815b87d3e8dcdfd74674c988ce2ab6d270
 test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getAttr.ql 1f9bf1344f942e65c3a3591b6ae04d3f5a2a1a65459bce0d976698de7d8a5958 02acb861d8ab4d32cf144c589881a888c3da5e2ade27e8c85fec3ae45219bb3b
+test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getFormat.ql 02d3fad540700966488b24c62dcf200548154a2f10f578ee2995d8c4ebe32287 cccfe779b9804c2bb968a2b1f54da8a72393805c2c8b31d7160e8538f2f335f2
 test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getTemplate.ql c912ac37275cbe7b3b29607bed1a3190c80779436422c14a475113e1bfd91a54 ef90f67a9b952a38ce557b1afbf0b5ce8551e83ddfaad8309a0c9523e40b5ea7
+test/extractor-tests/generated/FormatArgsExpr/FormatArgument.ql 7a7ee3a3322b4af8cb3b525cfed8cc9719d136ea80aa6b3fb30c7e16394dd93f 5aa8a77d7741b02f8ceb9e5991efa4c2c43c6f1624989218990e985108dae535
+test/extractor-tests/generated/FormatArgsExpr/FormatArgument_getVariable.ql 7bd4ec3dde2ef0463585794101e6cc426c368b0e4ab95fbb1f24f8f0a76cf471 e7b01e8b21df5b22c51643e2c909c6fc4ca96fda41b3290c907ba228abe8669b
+test/extractor-tests/generated/FormatArgsExpr/FormatTemplateVariableAccess.ql 2793ba1ff52182dab992d82d3767a000928f6b2fbfdb621349cafc183f0d2480 c3777d03214f7feb9020de3ce45af6556129e39e9b30d083de605b70ab9a0a12
+test/extractor-tests/generated/FormatArgsExpr/Format_getArgument.ql 26d592398a17795427b5b6b51ff4a013ee15c31443e732a000baca5f2e65acca 7940a864b84b89e84d7fb186599cb8b6bcbead7141c592b8ab0c59fcd380d5fb
 test/extractor-tests/generated/Function/Function.ql c1c2a9b68c35f839ccd2b5e62e87d1acd94dcc2a3dc4c307c269b84b2a0806e6 1c446f19d2f81dd139aa5a1578d1b165e13bddbaeab8cfee8f0430bced3a99ab
 test/extractor-tests/generated/Function/Function_getAbi.ql e5c9c97de036ddd51cae5d99d41847c35c6b2eabbbd145f4467cb501edc606d8 0b81511528bd0ef9e63b19edfc3cb638d8af43eb87d018fad69d6ef8f8221454
 test/extractor-tests/generated/Function/Function_getAttr.ql 44067ee11bdec8e91774ff10de0704a8c5c1b60816d587378e86bf3d82e1f660 b4bebf9441bda1f2d1e34e9261e07a7468cbabf53cf8047384f3c8b11869f04e
@@ -793,13 +775,13 @@ test/extractor-tests/generated/Impl/Impl_getSelfTy.ql 2962d540a174b38815d150cdd9
 test/extractor-tests/generated/Impl/Impl_getTrait.ql 3319d2649b4a7f3c501c8e16a1a3e5d74057c94c02772d33f19b4030daf934d2 3acca9d040c3f1d90ed26b159dac71625bea689221e180c856a75c2bab95d286
 test/extractor-tests/generated/Impl/Impl_getVisibility.ql 2497bb8c867297e4c398473ee7f0ec3693f7e894b84819f6336d69bebcd3af5f d8be2e9535b06471fa873af13b0223cc79d30d63a3f5e27a0f64874d60dbf07d
 test/extractor-tests/generated/Impl/Impl_getWhereClause.ql 269d4b0639db28a7535b2d745b11cda0885da7369f9cf4c4973a6ccc20c9960b c4baf89f68a173c1415baf90ddd9195e29784997a5ce45a36171485f6bb44c03
-test/extractor-tests/generated/ImplTraitType/ImplTraitType.ql ec1474d83239bf546fcace59188d7ea42f64345b92cf2364117da05f1827fa55 7d352e1cb65bb80c479c7eb90da08745e51252a7e7fd20e33d892b351b5304e1
-test/extractor-tests/generated/ImplTraitType/ImplTraitType_getTypeBoundList.ql dfb41cb9140f96bad398278294ecf20909c0fbc32b361c3dfc97aef2b8b9a5a8 17c9e4687345a5a788b01fcd708e700195ca28524467a3144708f1dc4c6471e5
+test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr.ql 309d5bed6a2bee9f728727338401c9c48841bd31d917dabb837bd88b78289ece 223060ef89358483a7aafed567a7b657d37eee023c49032aa55ad08a17c9e31d
+test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr_getTypeBoundList.ql 5e3561412a8f990e7f32fb99d40b82690a9281c850226fd301b9f656f7b9ad2d 4e23068d2635056a74f40bdfa809878e31a8172086f115985ca027055e8317b8
 test/extractor-tests/generated/IndexExpr/IndexExpr.ql 0a93213b755faaab84b7eccb5b8f3d8f8ba87910ad661f194e06917722dbf6a8 46497b3e92523c6c015373fe122678846618b45412b903323ff3644e37f2c52d
 test/extractor-tests/generated/IndexExpr/IndexExpr_getAttr.ql 360dbf8e7d69c691a1f4c9bb0aaa7860a6b0f09b21a1d1a6db908ec7a7d7561a e50b942f7592cb944f607bd64f8e4d4abac30bdc53f73b4dc851e689dce61be9
 test/extractor-tests/generated/IndexExpr/IndexExpr_getBase.ql 841cacda1a1cd976229f2bd18dcee4315506105c2cb3789c30a7539fd6d49d0c 37a92e9151f10cf971b24f5af6e2ca6dccf87b6e0e0b2237a0564f97719a0d66
 test/extractor-tests/generated/IndexExpr/IndexExpr_getIndex.ql 1aa934524dd44009297ef89a657d1ba99304f6590514a0b0b51b2769780f8c20 a42f25640f0331318bbc8f44af133095580b8947309628511bf0b3675149506a
-test/extractor-tests/generated/InferType/InferType.ql ee94ff7a5d84299fdd6e52583fb2f548cff364cd3b5fe385707a2da8958bf641 9532163987d0c9f11456790d8c5a8249cb02f13526911bcfd4fc726db2e1aaef
+test/extractor-tests/generated/InferTypeRepr/InferTypeRepr.ql a9c92ce8e20e427de3651fe59e6cbbe1b7efa8db9ef9d836da254cf07509e4ef 5ee2cb6ffcdc1fd2a7c190b1a98bb7369c114d837f7e232d425563255b71ce3c
 test/extractor-tests/generated/ItemList/ItemList.ql 6c1c8ef6da0fce64b1a5edbec98fe18910b0ecc390d1219cc08124ab51b13bf6 e94e5c8d1639c1ed2ba543a521a57a026e15ea6b339b6c6d4409dd30ae67a51f
 test/extractor-tests/generated/ItemList/ItemList_getAttr.ql 24d7a764d4f8997bb77e93c21e6e5ba7256ed11657bd6479bf42458b8e89b52f a6b4df0cc6bf79ab3f98c93eabbbd3aaf11ec2506a0e894fa1f51be90191d71c
 test/extractor-tests/generated/ItemList/ItemList_getItem.ql 6e129499f77f7dba287b2b31b58fe6d834559e27214797807bb29b2a401f1f7d e406c07421dd6382ea73308d9124c30e971591c9e4c797b3115955f22c93589f
@@ -807,16 +789,16 @@ test/extractor-tests/generated/Label/Label.ql 6a92a27d615dd9c380cb9d889eecf827fc
 test/extractor-tests/generated/Label/Label_getLifetime.ql 3d6ddc3b44182e6432e938d5c1c95e0281575e320d517e431f6bad7748efb93e 56d07e485cb5e4263443eb5a0d62d7d4456bb0c2748331b371e519bfe14d3b81
 test/extractor-tests/generated/LetElse/LetElse.ql bdf2b17d5efe6b9cb5bb4fcfe854a5fcd72443d39ae1e7981d2a0459c481e394 a14a611d0783ae38d631600c2bde7409f4e739ba2f284314b90ec9a21c23ab3a
 test/extractor-tests/generated/LetElse/LetElse_getBlockExpr.ql 32c21ad843884944738a735f01e272032a347d1860fa6d27d17652c549f941b0 2bfd8a5e3d42eb1c73eb679ada847dd29f2f0657a0ad8ef15da126e54fff5ef5
-test/extractor-tests/generated/LetExpr/LetExpr.ql a25072a00cfe1242dc846b38199c000ed7217d33fdd50d2763237fdfda7b9449 8c9367af79d9fbc98ed2fe62450929fa876512f1c999615b5c1ecff082fdc7bc
+test/extractor-tests/generated/LetExpr/LetExpr.ql c76a0c4aaa73f4064207dacc8d2c649d3a5f8046c0f6e1aae985d2402a342e73 c5abe3845d4975d05c98ee6496732da384cdaca60ed49235776338e6dbe80b3d
 test/extractor-tests/generated/LetExpr/LetExpr_getAttr.ql 911b143afebaa0a487b13d533f089c5b0eaf336a44a4cab42147c284338484ba 625c91fb6d8c2e3a9f13e5679cc0cd29329c6c2b213d2e1191e23db2b65841dd
-test/extractor-tests/generated/LetExpr/LetExpr_getExpr.ql ccabfaa15cfc8685e86cb950cb62b7f2fec278f28906ab34deb97b308f160cc4 e0574537d47a77f1be85090970f3e1263858174479002fd4de3f85b777ee4336
 test/extractor-tests/generated/LetExpr/LetExpr_getPat.ql bc0363f77bc2ba583619ab7d309293ace0ed6a851bfb9b886f75729f96eb40a8 bc0cd9233b7904d8cc7f9021377120f5f4bcc5c7aa28b1b55f17bc738c434d78
-test/extractor-tests/generated/LetStmt/LetStmt.ql 02db64303bfe87a11a85663e4c79bdabd9ca13693f146c7923b47c4c92850fcc 9ec1326b8bc58b270b178a4c02621b1650d107de7c02a9408d97c59f0d8a6178
+test/extractor-tests/generated/LetExpr/LetExpr_getScrutinee.ql ee33d3bbaf0ee7cdf9bd7b800e9684b5ac7ce8cf1939378cd460cb0c5ea11742 5d69e727b3e9d1ab4ce9eef702a7b1911515469625056bce87fac1d27ba863e6
+test/extractor-tests/generated/LetStmt/LetStmt.ql 9f8cf125eae91b190e6f534541b5fb0a0ee2391803266e9d02ef5d605bcfed81 e5cb251e9fd1a0d22553fb9180f95c697d780f51f93121d2fd654210477641df
 test/extractor-tests/generated/LetStmt/LetStmt_getAttr.ql 68f69c4c054514140c0f0833a170e9f3facf950bd7af663ac9019f6c88ba0ea7 ca54d25cc052289458c7e34e40f0304bca2c412cecfb407f31279262bd74c15a
 test/extractor-tests/generated/LetStmt/LetStmt_getInitializer.ql 6a5f0eed3ce3e8cbc57be6ec2b4eed732f00e084108d21a61d9ab28b65e494ca a48b426b97a6c347ad04fe2e592cd25b5c66b2a6a299cbf8c0da03e14304fd70
 test/extractor-tests/generated/LetStmt/LetStmt_getLetElse.ql 21f8f1cbf725399da80c24c4d3ca27072758b76cbdfd726a7f1e851ea12e58fc c01a4eda22088184357288910fa41692f52486d60fbf7c0bc3b5b01f8f67fe07
 test/extractor-tests/generated/LetStmt/LetStmt_getPat.ql 978e4f7861c7b03e6f2a3a2f7ae82e9b72bb5ef000f111127cb583a04ea6f971 3c92dbb765dfb01c290413e538290b0b2bee5a83bcfee383d081f56202a784fa
-test/extractor-tests/generated/LetStmt/LetStmt_getTy.ql a13e89ca2f87aa6e5e0cfce296b9515656f4bc9b5291337cf18c2bdd7a04c4e3 7c7c8ac2cc5112d74081a5c239358d62e082b48b361e757cea23022f5ffcf04f
+test/extractor-tests/generated/LetStmt/LetStmt_getTypeRepr.ql 8bf8a99450b27bc97db90a323b19ab13cb266c0b6c4e7d0ccda80952f8f7987c 70227445fb87ea1afae10ced988bdfeff4a1edd3d9d787367a17ee121d31db0a
 test/extractor-tests/generated/Lifetime/Lifetime.ql 07b093285b08fddc149cbce3047700072874efb29d55e591c86d53e6432a10a7 29437b1b20f6321870837c12348d165729312e164ac4fac1029c1000e48d311a
 test/extractor-tests/generated/Lifetime/Lifetime_getText.ql 7b06b940145c3d1a1bb3aff67e8e106f902a737edf61ed91577cf3ca94606936 c70d6186c500fdf6bc9d9d028cf3ec093914e20ba9547a391203ac8c5df1d727
 test/extractor-tests/generated/LifetimeArg/LifetimeArg.ql 4a0c2166d9ba79c99d6be430a28f79d3e7e971dcd96777e02c3fec56cec3ffeb 158bbf0f06ad36c81704d11f6318f80a0f7dd9c1a71409980ca60cac49dbe9c4
@@ -830,7 +812,7 @@ test/extractor-tests/generated/LiteralExpr/LiteralExpr_getAttr.ql 6e76da2bb7858f
 test/extractor-tests/generated/LiteralExpr/LiteralExpr_getTextValue.ql 7049fec0bbbf0e048af1ff318f42f43d0f8a7354a5638dc21174c4ea725b54ce 2edc94cc0a7f58ec9808b63ddb4d20a3907c88e50bd9ffb14f0281b433f5621b
 test/extractor-tests/generated/LiteralPat/LiteralPat.ql 3d3db6cad0eb13f84b69efa24a9f9a32d35c62582274d2751cc3ac54dca3b538 7feb64af87546ea64c139c61ac20176a99ad40b9949b361742a424b164fe6d54
 test/extractor-tests/generated/LiteralPat/LiteralPat_getLiteral.ql 2cb03a22220e99237d4f3cd94d5090757cd6e57df708d32e80bca3964507651f 4dd9a6c1e23ad9851d9aa8c42c79535f7a2c7224bbaaff286eac7fd04b39c6f0
-test/extractor-tests/generated/LoopExpr/LoopExpr.ql 636c28bff5f8c1ca0fb834f614b3215e02bdb00826fd8be26f9c4fa22c68a79a 1694c27850419d4edf366fe3f1d60fff578094adc3aeeb9691a3d6a8ec0100e1
+test/extractor-tests/generated/LoopExpr/LoopExpr.ql 37b320acefa3734331f87414de270c98ab3309fe069d428550738197e3498a8c e744c25640b5c46aab53ce5114b789e13319572b0c99d0f2bc3c177849e61541
 test/extractor-tests/generated/LoopExpr/LoopExpr_getAttr.ql d557c1a34ae8762b32702d6b50e79c25bc506275c33a896b6b94bbbe73d04c49 34846c9eefa0219f4a16e28b518b2afa23f372d0aa03b08d042c5a35375e0cd6
 test/extractor-tests/generated/LoopExpr/LoopExpr_getLabel.ql 0b77b9d9fb5903d37bce5a2c0d6b276e6269da56fcb37b83cd931872fb88490f c7f09c526e59dcadec13ec9719980d68b8619d630caab2c26b8368b06c1f2cc0
 test/extractor-tests/generated/LoopExpr/LoopExpr_getLoopBody.ql 0267f54077640f3dfeb38524577e4a1229115eeb1c839398d0c5f460c1d65129 96ec876635b8c561f7add19e57574444f630eae3df9ab9bc33ac180e61f3a7b8
@@ -865,8 +847,8 @@ test/extractor-tests/generated/MacroRules/MacroRules_getVisibility.ql 5306cc85f4
 test/extractor-tests/generated/MacroStmts/MacroStmts.ql 991042263ba99acef0972697ce79132e5650b27bf53be2f975a0da1f29940fd8 64c44e65b3c5d3de5f9532b4ff7ce54b39442b37f63da8b10d789b9b52b85a9e
 test/extractor-tests/generated/MacroStmts/MacroStmts_getExpr.ql 5717f20376600e7bf5e471beae1a7c0084f235f0931f8b3f25d2de94ebb86f8b e4685fd9d45b078a6402c285eed3a15cc4550f6656c8bc5e7e274a88d1c7e9b3
 test/extractor-tests/generated/MacroStmts/MacroStmts_getStatement.ql 8958b2212776f487869c29314e7d28f5871f5c3dde62fd9d6f87fb9e94204498 6804f5d4c0c5909689bdcdd5b8ec11ca7a8c0399b47695f66d2f99e39561565a
-test/extractor-tests/generated/MacroType/MacroType.ql 408327fdb4d7cf096536457401cc280f83cd7e4f6fa9aebd65e64031f6c119cf 0c502d25194ab96eb068a85e3f57a9217510a951fa923e9d7a20fd75412bd6da
-test/extractor-tests/generated/MacroType/MacroType_getMacroCall.ql 565be7a72670218d7999d3f6cec4e704b754c217186243f1b24c334589fa82e2 ba413c712783320188800e2a78738b09c40fe9a6305c08d9e67e971a8fca96ee
+test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr.ql 49c0dbf587f84023025f90d73d54f5320993f4db7dcc90e21eda53fc0b4d1f57 0a0712171db935c549a9cfddb6721c2c188c584a67be85409ffc3facf6c9a935
+test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr_getMacroCall.ql cae14884e549c74be4b600a264eb236993d7b8ddd86589a9116ee2ba18f181e1 1d4ae2d8ed9ce0d7635a2ae447b41a328e59e97c6df7827ee7d5cf62343e86e1
 test/extractor-tests/generated/MatchArm/MatchArm.ql 512aa404c94ba40b859564f07e9dffe6a5e687fafb039556e9145f4f3742981c 529f96e38cede8a26054f8981d4ba1d189c17d14d0f92d622eb20acd8f3d7e5d
 test/extractor-tests/generated/MatchArm/MatchArm_getAttr.ql 4faf7a542702d13283262be7cb2e1cc3c862bc2e1953a460fd2bb5e75a7e9b1e 1d43f4d2a580d0ac309dd18a45a9693ab92107cafd817ccdb26fd7998728edf3
 test/extractor-tests/generated/MatchArm/MatchArm_getExpr.ql 116f02bef8650d27784a8657208e9215b04af9139d19a54952c6ba2523770f4b e0677aed6d53148e120fd0b03f4bc4fa108c6dd090f605c87b2e3ba413fb0155
@@ -875,10 +857,10 @@ test/extractor-tests/generated/MatchArm/MatchArm_getPat.ql b346bca229226414b32ac
 test/extractor-tests/generated/MatchArmList/MatchArmList.ql 14b5e110d48e2b77c85b7a188262e6a98300e0d4d507bb7ed9179c5802251dd6 4d091f06b12fef0fffe1c80a10f74438d8068f2fa09c50d5e240b6d140e60d90
 test/extractor-tests/generated/MatchArmList/MatchArmList_getArm.ql 4781d002538a92b7f40fb0ec3d61aeedb6348341ddc354bbdd3ff61b74d59767 ae0da9497a30ce006e03bdb70e0ee24b685df529ac15a7d99a6869b5f7d7b371
 test/extractor-tests/generated/MatchArmList/MatchArmList_getAttr.ql 4d7e6d152d2dbeb4c9f594becabea27d3b25fecbde40d791a2907c69cc0c9631 4be9be658bb22e1b764c4ebc8d6b99bf50fd939f35ea44fbb869056c14632bd4
-test/extractor-tests/generated/MatchExpr/MatchExpr.ql ec116bca37079488977a50beeba508c440cf337799947fcb810b6bd7a7605255 42dc7b5f0dd6fd91417d9846a7b4f678cbfcf095791aaf57c8d3b4548ce2dd98
+test/extractor-tests/generated/MatchExpr/MatchExpr.ql 2966bf0507c0d45db1b933442ce8f1c4e0a9d4212c53a768791665cd2e0927f0 8af3b87528b6dd4cd3ff4fc6d2d389b1a743f979d9ccacd0aff134b5a4376118
 test/extractor-tests/generated/MatchExpr/MatchExpr_getAttr.ql cb8057372dcf24dfa02896ebf4e60a0b757dc4742b94011edc38f5b898ed4d25 6809695c2d3ac3b92c06049c9b920e8c0e99ee1998a11a7f181f2b0ceb47c197
-test/extractor-tests/generated/MatchExpr/MatchExpr_getExpr.ql 7baaa64071cf2666e3b2bc05630d92a7a3b6cf04a026b1f7053c5e2a735bcaa8 d9ba8d8bbff05cfc0461ab41295f921b48429b4376c29adf54428bd5a9aa5298
 test/extractor-tests/generated/MatchExpr/MatchExpr_getMatchArmList.ql d97055bcb0431e8b258b5ecdd98aa07cb24ece06b0cd658b697cd71da4ede8fc 5e9c03b2665ef6b2af98897996abb2e0a9c18d54eb64588340b8efbcee9793bd
+test/extractor-tests/generated/MatchExpr/MatchExpr_getScrutinee.ql 0bfeb8f903fb23356d50b7edd80377f4a67045010ffbed04c835191b5bd62820 7dc8e38730ad72b4cea91c1f023cdbe83057053e8dbd077ff925c59e92744498
 test/extractor-tests/generated/MatchGuard/MatchGuard.ql 23e47ec1b13e2d80e31b57894a46ec789d6ab5ed1eb66bdb6bba9bd5ae71d3ef 7302f4a93108a83228e0ebd5b4a1bc6bccc1f6f0f3272054866fa90378c0dcc4
 test/extractor-tests/generated/MatchGuard/MatchGuard_getCondition.ql 8a79dd46798f111f8d0d5a975380b5cebe5e337267752b77b3718b268ba2773d 6691d8fb483f64fc7e3ad3f46e3129e0a1184d7beb9f83a1000acdbb081c8b5e
 test/extractor-tests/generated/Meta/Meta.ql 16f163f00ba2bbaa0a8c6f3f6710c860a8f61d02d43321c78e05a10a3606e39b ba982c6bb93ddb4fc2c44d24635bd487128a5b1d1f885214044c989a21f4d05a
@@ -904,17 +886,17 @@ test/extractor-tests/generated/Name/Name.ql 0a78cd5c0c703ff30f8e3253b38f9aac98a5
 test/extractor-tests/generated/Name/Name_getText.ql 5d223baad356308abc45cdce9ca9201d674de1cc1e9fff7ef55dd96082d59d99 6488ccc102ed4f0a2e1c5cef3f8b1adbe00d52c961573f1a16eca66af31e2d14
 test/extractor-tests/generated/NameRef/NameRef.ql f73d49d5c176cd7589f6ca148b0d0cc3d1084e27686910058adfd5764ef5767d ebff67ed3b325b01277e25baa1ad588e633ef8ce63209a72305465a0dc8002d1
 test/extractor-tests/generated/NameRef/NameRef_getText.ql 5212dfc1b65c0f724a72f5bffd82268d1f8ae287d3d61797673c29fd70d7ebd6 75c343614925c55a18917c07ef62af08c97c9cc714f627d1a27b9f26158a0bde
-test/extractor-tests/generated/NeverType/NeverType.ql 7da48f7c20733a77495718c06a96eb1a8ea5e825b95e585a960cf777edff1b6a 30e24cfcb4f2ae1b7862a177e622636b4563a1b1d348413884bc605302d31fcf
-test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql f7d7b30870567124e46dc81503a33cb6425fff51f99fa57894228847e68291a3 b0c242095e0df52687502baae97f36e0fc7b4e1e01cd05f75ff0cbe92a6e2f33
+test/extractor-tests/generated/NeverTypeRepr/NeverTypeRepr.ql 6db9820e62fe7a7395aafb6966043bd24d89833fe59c825ebbd4a2504d58bcc3 85dc1500ba751a4b3fa432fe5f5cb0c104a2179ac2e73620ed9ff08552cfbba1
+test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql ba10ed5147469564e632f9444176fffeb1accdb14ad635a3dee76044e5782eca 3f894c494421d49d3f8f2593bccd261c9defa768bd252705d4a3671ca8e8255f
 test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getAttr.ql a12e828c85577184a41b255f54b10d4a654b57703074a7ebcfde2d43a358955f bc2590e76b60a3ddda9cc10903c68d07c6af19a593c8426d108a2a6520304145
 test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getField.ql 6d729fb91deacb1f620df5cbc86473183664e81849958624195da883c410a707 f3374c3d7306699d1f9d1c6c5788ee7c5a17103345bf53847be9d94e5fb9f14d
-test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTy.ql b8597637cffd7a492148020b306c4ab1d2f17f919f441f462ebc00d229b038ca 2c7de1df4351929c221b30e3cede4cd6981fe8a2c1861e194489981c65e00f33
+test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTypeRepr.ql 27f2d94699140805169a0c18068d78e10bddadb8db243bcb8957677c9d477935 4fb96f2f7a6e7217218adeb5069a7d4da548c6ac650683773bbff4fba32a99da
 test/extractor-tests/generated/OrPat/OrPat.ql 49d881b384acaf68fa79de46da997cacab3e75467641f61150908f4112c47fa4 5d721da23be44e79d7b8a0dd475119836828d6a1edaff2c55decea8da83e65b8
 test/extractor-tests/generated/OrPat/OrPat_getPat.ql d56b78287cecebacb25249380647500387e0d9e28be20034b8a12406a999a7c4 cba7bb60afaaed4333ea5ff6d3850fb44a8b42edee67d86fd16df85938454269
-test/extractor-tests/generated/Param/Param.ql 060c53b7e93840ae9cbf0c8fdaea17b16d6825f4b7aaa2eab164a660c5a7ea4d 172f6f4b86a98720f710e5d4342b7d52839c6f3c169ce1debb37629961a702ba
+test/extractor-tests/generated/Param/Param.ql 0a2375e240422ced3e7e6f16da3f538501bc214d0713cf5415a91b8f9f4554f8 12b286e5622e693dfd0a614b96c5d4f0a7dad3dbd033f78ad7318d1bd85a5eaf
 test/extractor-tests/generated/Param/Param_getAttr.ql e1dcf86540fd2971ced34a33b2959f001c3f654914d82e576caa4534b80fbfbf 987a826bf6dcd25c3426edb603a22f6caa030c82c1cb0e9e11062fdbfed23030
 test/extractor-tests/generated/Param/Param_getPat.ql 0c448e8ba8bf3432be08b5eb4a052aa19cccf0eb4596a3239481401dae9d2dc2 c943d4da36e1e734c1a012f092b2f597cb389a7ab33d5371ff8ee9c93e115ffc
-test/extractor-tests/generated/Param/Param_getTy.ql 134dec0c5562a8df68224069f10ee51c7dcc35e0b44a49c0e2078c305487db87 94fa72a213c37f2f63f03789a33e55fc5a22bd83cf0c1d293281bceffb63bd78
+test/extractor-tests/generated/Param/Param_getTypeRepr.ql 151a653a66722ec782af13980638b4156968a2bf1ee9221e983695712c39482e 597dd1b45078711d1ff2a5d3b0282d571b4d76d0d2e410c79a48ff9d5c8f80f6
 test/extractor-tests/generated/ParamList/ParamList.ql 4d879e6a6db24fb8d7f935c2dd332075ca4b2de41cc841aafec7e0b6b77f2cf3 b7e2357b77961f0f8315d3c9e8fde8578373ecfb9efba892416b31d7c168bb26
 test/extractor-tests/generated/ParamList/ParamList_getParam.ql dcaabf654941bf9afe50df3a5c61ef0eab50830a436eede98e30778bfd244a09 63cc7f529f96d5016804f50a385d8a736a534475a6340a8c2f51de99b54206a1
 test/extractor-tests/generated/ParamList/ParamList_getSelfParam.ql 310582a9921226a44e6fee2b386d48bf84388351204941dd12e3a2da395eefaf 6c2e0a6d5bc6db49430cf25501444da6540b7b2f9ac0052da93c8086e2af0c46
@@ -923,34 +905,34 @@ test/extractor-tests/generated/ParenExpr/ParenExpr_getAttr.ql e8b9016d2374d12447
 test/extractor-tests/generated/ParenExpr/ParenExpr_getExpr.ql a75dc46dc78d3b4a4f629ba16f7129ecc0ab90f60b651259d00d241b2886bf7c 32164d75418df184618501f41fbc0a81dafe1ad2dcbc9ec87bea909aaf05ae40
 test/extractor-tests/generated/ParenPat/ParenPat.ql 565182ccd81a9b420911b488c083f540d339eec6a9c230424800bb505df13a66 876cdca008ed32f415c9ee99ce7e66b276769d0b51ad7eee716e1317484a34ce
 test/extractor-tests/generated/ParenPat/ParenPat_getPat.ql 96f3db0ec4e71fd8706192a16729203448ccc7b0a12ba0abeb0c20757b64fba1 0c66ba801869dc6d48dc0b2bca146757b868e8a88ad9429ba340837750f3a902
-test/extractor-tests/generated/ParenType/ParenType.ql 81c8ad667397ce36157941abd9b879e9305a440018853af4528eb737ae4d2935 3ef3b86203b0143be2d7f7f4833f55fd6c226cb9205e3c1940b6c2a1371622f3
-test/extractor-tests/generated/ParenType/ParenType_getTy.ql 41dd6605e7b348618156712b559e2f1b6aac02d6c727e8cbf8653530794ec969 30ac6611c730e76cfb75f98efcf817783a50cec0cf3b3197459d7642f74dde85
+test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr.ql a96bb8b51d8c0c466afc1c076834fa16edf7e67fffe2f641799850dee43099a2 0e6c375e621b7a7756d39e8edd78b671e53d1aac757ac54a26747fe5259c5394
+test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr_getTypeRepr.ql 64fe4ea708bc489ba64ed845f63cfbcd57c1179c57d95be309db37eac2f5eb71 0f4cbbfdf39d89830b5249cabf26d834fc2310b8a9579c19383c90cb4333afb7
 test/extractor-tests/generated/Path/Path.ql f17c1c4d23c0d5e9776cee84444f6ee7445de88afbc1f26c34b96e13ab618158 89499cb0f63b3634d6b5e2b8c4a13bd4401ce82e54af0ab46e41a34b0288eeb9
+test/extractor-tests/generated/Path/PathExpr.ql b9696cd7ad9f3874e4bc4b1b9c77f42f06ab6c61b77fb641458da63667087b9b db84a7a8dd05e30ff80733af01f08d43ff031bb4b3e3af06332a73ba7e7bbc43
+test/extractor-tests/generated/Path/PathExpr_getAttr.ql 2ccac48cd91d86670c1d2742de20344135d424e6f0e3dafcc059555046f92d92 9b7b5f5f9e3674fad9b3a5bcd3cabc0dff32a95640da0fce6f4d0eb931f1757d
+test/extractor-tests/generated/Path/PathExpr_getPath.ql e7894071313a74166bdd31d7cd974037fcd5a7f0e92d5eec42833266196eb858 46a06e8a1207e7a0fa175cd4b61068e5fd6c43b5575b88986409f0ac2be64c51
+test/extractor-tests/generated/Path/PathPat.ql 823732954a5882e33a37bd0bf0cafb2cec51659a5203a4831eec2516da0e49fa 54001149718a9ca15d8c0d4be63f3fe00a9f0d44fa1309e2f605d7932355ea5d
+test/extractor-tests/generated/Path/PathPat_getPath.ql 6c0c71c80a6e631ea7775ec8660b470ff6b264bab14a399606cf113b1fb190fc 8e34cbb4d064db929e94652e1901ec4f26affa71e30e556b7acdff71dd622cbb
+test/extractor-tests/generated/Path/PathSegment.ql be9d62d38b0c7f8b5a8ea86dcb18c62f24930f5931f52e6073414f291d8c0451 31288b7728d45715acf6ab751b833b29473a74d54d9b26f83a73d8c91e3c82da
+test/extractor-tests/generated/Path/PathSegment_getGenericArgList.ql 8f6e67b3e316309f20e21d7e7944accf66b0256b76fa50ee9a714044c6ec8cea 15f10a701fc4d3f9fd6734da90790cdbc8a1ddd57bf52695740acedcb2e6e485
+test/extractor-tests/generated/Path/PathSegment_getNameRef.ql 799d284e2f9267d6bbe67aa7035e525ef347dc74cb3e2180e7b2171b5cb49674 592130bc2358989536abf62e8a261272c851483ede4f19783f7d61ffc1803e4b
+test/extractor-tests/generated/Path/PathSegment_getParamList.ql e1e7b9b5062f936c33b7e7e29b21456448242df4985c6cffb54900063cfd3e63 6568e851cb6bcb32622f89d01e3aa6e7dd21940d21572a9988584e34bdf25366
+test/extractor-tests/generated/Path/PathSegment_getPathType.ql 01942da6d0b10c1d15caec6abb8c53f1dc7f8c04a91a797f572063aa003dbc4b cb21e6cb160652527ba571265297dae86beffe191dd7dfc4d0beee45cb0cda29
+test/extractor-tests/generated/Path/PathSegment_getRetType.ql 36386a514bc925f5b17ad87afba9fef7986900c1b791732de061213c6e86743f f38bcee68c1da19e70bb1e1c4a4047c763a466f1b8ef2c4f65f8c724c0b58197
+test/extractor-tests/generated/Path/PathSegment_getReturnTypeSyntax.ql d1db51208a311c30af369ce2fdc3a3296e7d598b27bf4960b8b34622a9d9163b 561b1e38c6d8b301fdc016e1d012dd805fde1b42b0720c17d7b15535715047f2
+test/extractor-tests/generated/Path/PathSegment_getTypeRepr.ql d9d8ff43a55671616bd5b98ff2c03690ec2661817d19a61edcc4b37d23e312d0 b4dc0ae4d7f03c98c23312b358d214565b34c7a028ba8983826c6bf5c1177eeb
+test/extractor-tests/generated/Path/PathTypeRepr.ql c2e069acc5111088a7287d98b4bd4bf44bd79c5a786b275f7448ebafc3613500 6e016750e5fef92a98bc5cc60bfd40d85fbb5eb2d251b4d69ffe600813f81df0
+test/extractor-tests/generated/Path/PathTypeRepr_getPath.ql 49e96ea2aa482e3b80cb0e2d944055f8298f7fc55b36cea7468586c94bacf686 29b3c2140ac1bc6e0e6160140e292e2b84e13145c1553480e2a582cd7f7bd3fd
 test/extractor-tests/generated/Path/Path_getPart.ql 8aa45a0b58203ef1177166efbe1c2851faf4b4c9a453c83137f0c9298badcdbf b82d490d9b3a8237487cd5da8b3b6fc4aa477977b332a5c6539b3cd4e6d5b45b
 test/extractor-tests/generated/Path/Path_getQualifier.ql 9af95e22cdf3a65da6a41d93136aef4523db5ce81d38f6ed4bc613f1c68784d0 3102d9241a417a92c97a53ac56a7a8683463f1adc7a593cda1382c0d25b3f261
 test/extractor-tests/generated/Path/Path_getResolvedCrateOrigin.ql 7c0ff524595514630de4178028260d4832bfc4f57bfddec9f8e72a6c6dbf241c 55e617380476c183ef9259199d2cfd551b07466e94bc452c4723754d0c82691b
 test/extractor-tests/generated/Path/Path_getResolvedPath.ql 20c8977781dfe687d5db03290612179cf1360eb47b86ea62d25d1eef62a681e7 c35b76e7d63c05dc80867285bb913042cbe90b45d4d4306df9eac2cba5e8db70
-test/extractor-tests/generated/PathExpr/PathExpr.ql b9696cd7ad9f3874e4bc4b1b9c77f42f06ab6c61b77fb641458da63667087b9b db84a7a8dd05e30ff80733af01f08d43ff031bb4b3e3af06332a73ba7e7bbc43
-test/extractor-tests/generated/PathExpr/PathExpr_getAttr.ql 2ccac48cd91d86670c1d2742de20344135d424e6f0e3dafcc059555046f92d92 9b7b5f5f9e3674fad9b3a5bcd3cabc0dff32a95640da0fce6f4d0eb931f1757d
-test/extractor-tests/generated/PathExpr/PathExpr_getPath.ql e7894071313a74166bdd31d7cd974037fcd5a7f0e92d5eec42833266196eb858 46a06e8a1207e7a0fa175cd4b61068e5fd6c43b5575b88986409f0ac2be64c51
-test/extractor-tests/generated/PathPat/PathPat.ql 823732954a5882e33a37bd0bf0cafb2cec51659a5203a4831eec2516da0e49fa 54001149718a9ca15d8c0d4be63f3fe00a9f0d44fa1309e2f605d7932355ea5d
-test/extractor-tests/generated/PathPat/PathPat_getPath.ql 6c0c71c80a6e631ea7775ec8660b470ff6b264bab14a399606cf113b1fb190fc 8e34cbb4d064db929e94652e1901ec4f26affa71e30e556b7acdff71dd622cbb
-test/extractor-tests/generated/PathSegment/PathSegment.ql efc39cea1b4c0b2b0da6434136334430d074699f84124d6bcf94c24aa854dc64 c0a4bd60c67665c058ca22a59e535e925fdb00dec95ffc5c71697fb0ed78a329
-test/extractor-tests/generated/PathSegment/PathSegment_getGenericArgList.ql 8f6e67b3e316309f20e21d7e7944accf66b0256b76fa50ee9a714044c6ec8cea 15f10a701fc4d3f9fd6734da90790cdbc8a1ddd57bf52695740acedcb2e6e485
-test/extractor-tests/generated/PathSegment/PathSegment_getNameRef.ql 799d284e2f9267d6bbe67aa7035e525ef347dc74cb3e2180e7b2171b5cb49674 592130bc2358989536abf62e8a261272c851483ede4f19783f7d61ffc1803e4b
-test/extractor-tests/generated/PathSegment/PathSegment_getParamList.ql e1e7b9b5062f936c33b7e7e29b21456448242df4985c6cffb54900063cfd3e63 6568e851cb6bcb32622f89d01e3aa6e7dd21940d21572a9988584e34bdf25366
-test/extractor-tests/generated/PathSegment/PathSegment_getPathType.ql 01942da6d0b10c1d15caec6abb8c53f1dc7f8c04a91a797f572063aa003dbc4b cb21e6cb160652527ba571265297dae86beffe191dd7dfc4d0beee45cb0cda29
-test/extractor-tests/generated/PathSegment/PathSegment_getRetType.ql 36386a514bc925f5b17ad87afba9fef7986900c1b791732de061213c6e86743f f38bcee68c1da19e70bb1e1c4a4047c763a466f1b8ef2c4f65f8c724c0b58197
-test/extractor-tests/generated/PathSegment/PathSegment_getReturnTypeSyntax.ql d1db51208a311c30af369ce2fdc3a3296e7d598b27bf4960b8b34622a9d9163b 561b1e38c6d8b301fdc016e1d012dd805fde1b42b0720c17d7b15535715047f2
-test/extractor-tests/generated/PathSegment/PathSegment_getTy.ql a0ceaf3f37e521cc92c21cc0bae929499ef3584f86349ef34808c20963d31c75 d674e56e08a6d2a7d211503a466df2cc90c35a3951e41598febf62c8dc693655
-test/extractor-tests/generated/PathType/PathType.ql cb67b05cf7e4f32cbd46ac89a15f6eafe3507cc655db0b9d54a1cf8e7fbcca40 890053e7fd8cd8a92015c09588c7c646f075901cddc3eb8d57210b02b23a5944
-test/extractor-tests/generated/PathType/PathType_getPath.ql 7043c7939e4f835e4b2c7e3e207637c362d7a9dbdba0151b38c873fdaf43e7a5 ee2aad1b4fb2b00e1a5d39387848aa164a39e3cd49141f07c175b205c8451bb1
 test/extractor-tests/generated/PrefixExpr/PrefixExpr.ql 44fb7174365c6deecdc22c720d84617c6e060c05d49c41c90433451588f8aa6f 871fab471c82fede3c36edc003f9decee5bb7844c016951d28be78d0c91487e5
 test/extractor-tests/generated/PrefixExpr/PrefixExpr_getAttr.ql fdad6ad5199435ded1e4a9ea6b246e76b904cd73a36aaa4780e84eef91741c5b 75d63940046e62c1efa1151b0cac45b5ec0bab5e39aec2e11d43f6c385e37984
 test/extractor-tests/generated/PrefixExpr/PrefixExpr_getExpr.ql 2d1d97f6277794871fbb032ea87ac30b1aa902a74cd874720156162057ea202e b1b9880fce07d66df7ec87f12189c37adf9f233a1d0b38a1b09808d052a95642
 test/extractor-tests/generated/PrefixExpr/PrefixExpr_getOperatorName.ql d27602e77ddf491a278426de65041dda8568f427d1e0ff97c0f23069ae64670e 4e4766e948adf88a6b003ead7d9de1ad26174fe9e30c370f1d3e666aa944df52
-test/extractor-tests/generated/PtrType/PtrType.ql 6317c79917e024d2162ae9089c17539fae818288f9ba5976fe39d004691dd343 d7e12a58475322a1292777608056ff90d7014b3e3a77bb756e233014d2670f28
-test/extractor-tests/generated/PtrType/PtrType_getTy.ql 97f5e6197e66c4dcf15d4a62692e30a26979f2902d83354911985d39c8560d1a 0b049b882a33be9746fbb704394a024ac320415cfd1707dc48fe114781558e36
+test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr.ql 33b38895b3a25f0cbec7040861143bd5bdc01f98beff3a6b44bb77e1e0953d4d 9ad76676a6dcdee8eceaedbd759a089eb74fcf9c51308837027cd10253f18bdd
+test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr_getTypeRepr.ql a1901323348a86a47b3d3d2a3d30b4f5aebf46744e4ecbcea650b3360024050c 58eb93dd76a927bb0cab1b25d01162c3b163e8a72ee13b4dd334e6017bb67db3
 test/extractor-tests/generated/RangeExpr/RangeExpr.ql 707c08aab49cc0a22c80a734e663b13ecbbddf0db28b6a25fdbc030a1ce38d6f 1f78950b30485cdde9fe7d9e416ad1dfdac8c5b6bc328172e6e721821c076131
 test/extractor-tests/generated/RangeExpr/RangeExpr_getAttr.ql 8767e670f88c2115bc61b16195d2c9d02bc074adc4ca57d2aa537c1af9b4c530 4fa51652c60ca7d06bd9ad604107e002603ee2a7b4587636f6b46b8e8060e06c
 test/extractor-tests/generated/RangeExpr/RangeExpr_getEnd.ql 0328c3d0597004f3facf3d553ed763566344f54e1b9c9e26f2f41b8146b6bdba 8e701b595631af117fd0a79154e298dfc64cb0874eb58018921f94076a0c7ebe
@@ -971,10 +953,10 @@ test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList.ql b6cd65
 test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getAttr.ql 15b297e79c1ba8c92cb97148d6aab78ed1fd2c94f0d3a430ead8d541024e81ce 4f0a131011cf32e172f7bd027769e39642fb506d37b3d50b175c6ed5947d3d9c
 test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getField.ql c55e4775c8880c05944be04bdeb1c9e6bad45b922ba71ac3145acd83ff988e59 14ce98d1e5564e9e27c29110237cf6210d130ea887920b2b1bd34a853b7fcc63
 test/extractor-tests/generated/RecordExprFieldList/RecordExprFieldList_getSpread.ql f2dd6b85da1cd8195986aefbe7dc8171db6fbbe5b2612c4cbdd8aba052cb0c6a 2c19cb1510c215ddfa004d40bf30fc0fe0dcbb530c320b297541f1dbcb204143
-test/extractor-tests/generated/RecordField/RecordField.ql d503ee1b9de70830947f2b406df058a3fdff7d360293f1c70671bb7f21fcf514 08687d8737dd20ce4a699e2ba4a2313b18c08de593847bce4a13077b608900f4
+test/extractor-tests/generated/RecordField/RecordField.ql b1f14a17b6f2e581c2a1e882a7405351ded14c565375b99a0119fafed93a2b09 b7d74549a4f7556e79fcbdb79748905fb13d13cd01de3d551cb5898b1d0af87a
 test/extractor-tests/generated/RecordField/RecordField_getAttr.ql aa29d317dee23039a807df530a6f04b0678c4d1d34207a4381be535ff04af478 41c5778d6316eec19192334046ed110aea44a4c45937d5c355a9b71c54aa8e04
 test/extractor-tests/generated/RecordField/RecordField_getName.ql 1f5c47d41367bd0115df86f22a70d4621d7cbfb41554daa598da29f549479670 64535303b273f1c2027b6ce89b50816ad3cbbca9bf00b2b8402e36b26e675d97
-test/extractor-tests/generated/RecordField/RecordField_getTy.ql 601fbb244267f366ff989d3cf3d1ff29fc7c6edf415c7844f401efc7798f09b5 de1e54cd4330abed23312a32efdea35fcd8b2d6accf8d8f6f984fe27f4af30e0
+test/extractor-tests/generated/RecordField/RecordField_getTypeRepr.ql f61cfcd0c682604b882a4ed9c746e6f6087e4798d7aaf9d29579e0e2372406e6 01371887fa82748ef196d2e9d27d26c586efb5b4f82d48967b5494723c54af4d
 test/extractor-tests/generated/RecordField/RecordField_getVisibility.ql cc45e9bb9418d15cef07a1827358c3f18a8737324c8e6852591a2da70df89360 45557497fc165a212fffda71dedabc8159a4f72323430df732698a18922b366c
 test/extractor-tests/generated/RecordFieldList/RecordFieldList.ql 586bccfa550243177d9fdfd6900a473f51a76ed360b537f19cb300330d5dad5b a063373dfdbf06b68c69694ea4ae72a26b906c910f9095894c09e72f8fb52819
 test/extractor-tests/generated/RecordFieldList/RecordFieldList_getField.ql 2eb92ef8528204f3f105c19a36cdc06b3b6d20242463ff2ed1fb81c544812a71 d69091899e7157099f117e14fe60cd3705cfda45f28f6a6a2b7234a4a9c1e664
@@ -993,38 +975,38 @@ test/extractor-tests/generated/RefExpr/RefExpr_getAttr.ql 477fb3fee61395fabf78f7
 test/extractor-tests/generated/RefExpr/RefExpr_getExpr.ql 180d6417fd7322cabf4143d0ddd7810f65506b172a5c82484b3ef398041636b2 a291f0bec1ec5b3fa6d088b3d1a658889b9a3521c39ff3bb7a5ab22a56b8b20a
 test/extractor-tests/generated/RefPat/RefPat.ql ba0f0c0b12394ed80880bea7d80a58791492f1f96a26783c2b19085d11e2fd2b 22aa62c6d4b6e4354f20511f8e6d12e6da9d8b0f0b3509eefe7a0c50f7acfb49
 test/extractor-tests/generated/RefPat/RefPat_getPat.ql 60f5e010b90c2c62d26674323d209b7e46c1c2b968a69765e1b1cde028893111 fe9e7dc6a5459250355336eca0bdf2a0be575b1e34936280fd12a76a004f7b46
-test/extractor-tests/generated/RefType/RefType.ql f6959c993a8e401a576c785fd1be4b910be218a212eaa9363ebf8f83dc2f1950 686678725a7f9824e74ec6dda294fc2233fd94aced8e2683b7019a1ce81f345d
-test/extractor-tests/generated/RefType/RefType_getLifetime.ql 880434f5908752adcc02d3645a48f22399250600c19e43c2da852cb6242e6a0b b8f9b9fab827972fd318d5edcaf37e4c7d0cf92261f9744e258537e6aee5a87a
-test/extractor-tests/generated/RefType/RefType_getTy.ql 0d5667542ad05a0da1a6a4c36882a39014c4803a76cadb11400d747b603890fd 2e6c3a56f1a7bbb72c181819be72d85c650af1df06f8582ae61bba9e165cf764
+test/extractor-tests/generated/RefTypeRepr/RefTypeRepr.ql 0e543a2e907bec0736a4e3821e94a49ad5127a69dab88f89a4a4bd6ff9e6a138 fe157d0a00264e2e5b7eee7248b052c960915aac14543e16a31ef659ce84978b
+test/extractor-tests/generated/RefTypeRepr/RefTypeRepr_getLifetime.ql 0fc1babe97a3c12609f30af8d68a2a25a588061fd92fb5a0d6ddb2afd0f87296 c9fcd48451faf77a3d47c4085904439243744119648e10499bc1b1533c5e14be
+test/extractor-tests/generated/RefTypeRepr/RefTypeRepr_getTypeRepr.ql 63130e9884b588a2e0f076a00b55e9c3106826ab78f5e7ff859d24d4f1b4d0d1 fabe9cc6967433def8ddba298d5cb4d903f8491bc4ccfa1b36e415995da9b804
 test/extractor-tests/generated/Rename/Rename.ql c8605e5d8ebb39be238ba26e46861df493d86c9caf9aa9a791ed5ff8d65a812a 7263c2c2565e41c652eda03d1e1ddd030fea79a8e3c967909df9945e30ecbe68
 test/extractor-tests/generated/Rename/Rename_getName.ql 1648191216ece0e3468823ed376292611bd3e5dbe9b3e215167d7051aa03385f 381683d4637a1a7322c9a0df2d90a30a153630965e7facbfaccd6cdb5c1de2cd
 test/extractor-tests/generated/RestPat/RestPat.ql 0abc6a13ec82ebc923ce768344d468871a05a515690f0feaaf55b7967cf34a9e c2bc069de6927c6c04c89c54e694b50d6ca052230cc36668302907a7ed883e08
 test/extractor-tests/generated/RestPat/RestPat_getAttr.ql fb391ab265a454b10270136efd61c1ae9b29951cd28b0f585c6b6eea37c64745 6311e3ca49eb8a061684f8cebdfb11cc5ae09db6e145d1b2349a2ee80298cfe9
-test/extractor-tests/generated/RetType/RetType.ql 7aca20c92e840f930aacd0ef8e70840da76c02592ac2f2fd5a9bf24dc872c30e ef3aed1090a77684773c814692cfaee9cd245d88292cd75f1b5acf9005a2cd17
-test/extractor-tests/generated/RetType/RetType_getTy.ql 55118e2a41cc1a097f6a69d3b63f3ed77d5da6c02b218b69b1c93d605e7239fd b32abe7a3978fe858a53a5772faabf750b5d14880054493f5a99466092b10dce
+test/extractor-tests/generated/RetTypeRepr/RetTypeRepr.ql 9183fb22ed8cab493719ab4c26e9129a033962330893c21a994ca9a98de86670 4031d0ba6f2ea3bd5116c594c053bd92f10f3dd2166e5ac7d6d6006fc6c1911a
+test/extractor-tests/generated/RetTypeRepr/RetTypeRepr_getTypeRepr.ql 0cfb66dc354c6b58c695dace97c4d5ec2a730ba6076918be2beca4a4cedaae07 54a6299dfa05b7ef60feca77dbad3d0a444655df4d1d4c69a8efc3a425ca35af
 test/extractor-tests/generated/ReturnExpr/ReturnExpr.ql 8e9eba0837a466255e8e249e62c69c613cb5a78193fe50e26a617cf9d21c995a f33f6cc874f74d1ce93a6975c88748bd5bca6dc10360f8fd59493d939be63658
 test/extractor-tests/generated/ReturnExpr/ReturnExpr_getAttr.ql 9fb7e1c79798e4f42e18785f3af17ea75f901a36abf9beb47a1eede69c613ba9 9cdb7cc4a4742865f6c92357973f84cee9229f55ff28081e5d17b6d57d6d275f
 test/extractor-tests/generated/ReturnExpr/ReturnExpr_getExpr.ql 7d4562efb0d26d92d11f03a0ef80338eb7d5a0c073f1f09cbb8a826f0cef33de 523ebd51b97f957afaf497e5a4d27929eed18e1d276054e3d5a7c5cfe7285c6e
 test/extractor-tests/generated/ReturnTypeSyntax/ReturnTypeSyntax.ql 976ce33fe3fd34aae2028a11b4accdee122b6d82d07722488c3239f0d2c14609 906bf8c8e7769a1052196bc78947b655158dd3b2903fef2802e2031cffbc1d78
-test/extractor-tests/generated/SelfParam/SelfParam.ql d051c7a2dd88382e37895f1d691f2702aed7f925d3936f51d49949463e4757c8 37f1f429093be7923a55f8b4f46b37bbf71d0dff3843c4d3686383c2863dee1a
+test/extractor-tests/generated/SelfParam/SelfParam.ql 1a75aa4caf4342365c74811f566359053a1a1bbff7058840891f4e050433ee50 a173a91b4c9d8af2f82d8c774b674e06c54414e2bae845695d06f6d27e6ff40b
 test/extractor-tests/generated/SelfParam/SelfParam_getAttr.ql 00dd5409c07e9a7b5dc51c1444e24b35d2ac3cab11320396ef70f531a3b65dc0 effbed79ad530a835e85b931389a0c8609a10ee035cb694f2e39b8539f8e54ba
 test/extractor-tests/generated/SelfParam/SelfParam_getLifetime.ql 0b7c243f609e005dd63fd1b3b9f0096fc13cb98fe113e6f3fefb0d5c414e9a5f f6e06de8bcddfc9bd978c058079e53174edbe7b39f18df3c0bd4e80486808eda
 test/extractor-tests/generated/SelfParam/SelfParam_getName.ql 69207a57b415ba590e50003d506a64fd1780b27b8832b14f9bd3c909bddb5593 56fa28ba1222f45893237052fa5a9421d960e14fbf1396b2d1049b440c2e5abe
-test/extractor-tests/generated/SelfParam/SelfParam_getTy.ql 521db95ede5184298ef05f78062f6c42152ebc60f1a395e162ceda73e4fe5d36 b1e261e0bef72db4bb1a5bc294b93497e5b61ba607588444154cacdb23ac15a4
+test/extractor-tests/generated/SelfParam/SelfParam_getTypeRepr.ql 406c04fbb5e0f4c57a2f73dfd69aff7da95fbbe552dc7391b3332d4e451b1ff4 025ef82cd0bf947333253141a5c3c4990db47a699c21a2381089428d0d133670
 test/extractor-tests/generated/SlicePat/SlicePat.ql c6ff3c926ebbea3d923ba8ed00bf9cc20eaaee4c6ae49ea797c0975d0535240e 1b27e0caeb793da3b82059268b83bd624e81f215de42acbb548c52bacba3ed9e
 test/extractor-tests/generated/SlicePat/SlicePat_getPat.ql e2f892a3a4c623fe3f7e64e1438128126bc4d8b8c0f657ae53bb99d3209a3b13 af835d9ec840c63e13edc6a9230a4e34cb894f4379b85b463b8068de5a8bd717
-test/extractor-tests/generated/SliceType/SliceType.ql 2c81c68b54bf21d32f94ed66765642549540d3d179ac4daa52b597a3ad862c36 1d3b21af4a62a99776f3d569be3b85cac9fdb214d04f37ffb2f9f0759f520da9
-test/extractor-tests/generated/SliceType/SliceType_getTy.ql 0bc70c0e60fc3552584b07ba2a23f304b47ad24644e015674665d0182fa4d1e5 f6ec0703b013d805eec2bb11d28393fc750d000ff6c2188618aa333095c7e328
+test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr.ql 59c4e943626b6d284fa30778437b0ac5b10243b2dd3081200ada18e5a5f75ebc a479a079c841290a42a86da71d0b951d6ff354a4818be72180e6fe24b3eecde4
+test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr_getTypeRepr.ql a6604fccd54cf86fb2b929ffda248a2da207e0841a46fd5e80fc18e2efccd9ca f10cc6446549214d8929521f8794a93cfacdbd71cd95e05e585bd178af414e52
 test/extractor-tests/generated/SourceFile/SourceFile.ql c30a3c2c82be3114f3857295615e2ec1e59c823f0b65ea3918be85e6b7adb921 6a5bbe96f81861c953eb89f77ea64d580f996dca5950f717dd257a0b795453e6
 test/extractor-tests/generated/SourceFile/SourceFile_getAttr.ql 450404306b3d991b23c60a7bb354631d37925e74dec7cc795452fe3263dc2358 07ffcc91523fd029bd599be28fe2fc909917e22f2b95c4257d3605f54f9d7551
 test/extractor-tests/generated/SourceFile/SourceFile_getItem.ql f17e44bc0c829b2aadcb6d4ab9c687c10dc8f1afbed4e5190404e574d6ab3107 1cf49a37cc32a67fdc00d16b520daf39143e1b27205c1a610e24d2fe1a464b95
-test/extractor-tests/generated/Static/Static.ql b4266fc731d027e00825cbb02d27f9dde50c7e8d32fd6b571cb167da64a8747e 9dd9c4dd56210adcfbd1bd387d79f27a30394e7b8b9c81cc2553a718f36cca5a
+test/extractor-tests/generated/Static/Static.ql b633f189040bc9d0592b77440b5b161b5c69cab97c4f47ef2c3754671fab0fc2 8dba58a18a217b741a7c474bffe0b3ab524cba8e1e4d6ddb22181170d2971fca
 test/extractor-tests/generated/Static/Static_getAttr.ql adb0bbf55fb962c0e9d317fd815c09c88793c04f2fb78dfd62c259420c70bc68 d317429171c69c4d5d926c26e97b47f5df87cf0552338f575cd3aeea0e57d2c2
 test/extractor-tests/generated/Static/Static_getBody.ql e735bbd421e22c67db792671f5cb78291c437621fdfd700e5ef13b5b76b3684d 9148dc9d1899cedf817258a30a274e4f2c34659140090ca2afeb1b6f2f21e52f
 test/extractor-tests/generated/Static/Static_getCrateOrigin.ql f24ac3dac6a6e04d3cc58ae11b09749114a89816c28b96bf6be0e96b2e20d37f e4051426c5daa7e73c1a5a9023d6e50a2b46ebf194f45befbe3dd45e64831a55
 test/extractor-tests/generated/Static/Static_getExtendedCanonicalPath.ql 6ec02f7ec9cf4cb174a7cdf87921758a3e798c76171be85939614305d773b6a0 c51567dac069fc67ece0aa018ae6332187aa1145f33489093e4aee049d7cea52
 test/extractor-tests/generated/Static/Static_getName.ql c7537e166d994b6f961547e8b97ab4328b78cbd038a0eb9afaae42e35f6d9cb4 bb5ae24b85cd7a8340a4ce9e9d56ec3be31558051c82257ccb84289291f38a42
-test/extractor-tests/generated/Static/Static_getTy.ql 1f282ac9c52b8d9efa1eb7f963767d0af28332c99baf283b3818edf53b3b8b9f 656cd5516601e21ffd54c51934bbbbe293de0b30a4327240208f5bd51ed524b7
+test/extractor-tests/generated/Static/Static_getTypeRepr.ql 45efcf393a3c6d4eca92416d8d6c88e0d0e85a2bc017da097ae2bbbe8a271a32 374b551e2d58813203df6f475a1701c89508803693e2a4bec7afc86c2d58d60b
 test/extractor-tests/generated/Static/Static_getVisibility.ql 0672b27f16955f7b0223a27c037884338dcf30759b7b8bb3da44e5d533228f90 0e4916f5683963041ef23c724ca8e16acfa370b583d90b76508c87131b9e1c73
 test/extractor-tests/generated/StmtList/StmtList.ql 0010df0d5e30f7bed3bd5d916faff7d101cc1edddceab7ddc12bb744f8e46cf7 aaff98988c68713b3577f3d4b4ed16b978eb11433ec7f3a32def82e96aac8c5b
 test/extractor-tests/generated/StmtList/StmtList_getAttr.ql 78d4bf65273498f04238706330b03d0b61dd03b001531f05fcb2230f24ceab64 6e02cee05c0b9f104ddea72b20097034edb76e985188b3f10f079bb03163b830
@@ -1068,9 +1050,9 @@ test/extractor-tests/generated/TryExpr/TryExpr_getExpr.ql 4ccd50eb4bdf01381eabb8
 test/extractor-tests/generated/TupleExpr/TupleExpr.ql d6caa8d9ff94f27f88d338b07cacc280289970931e101680c6574e32bc0c863e 70508104013003dcf98f22db6eb9b60d14552831714048f348f812807189e9b1
 test/extractor-tests/generated/TupleExpr/TupleExpr_getAttr.ql b1e93069613a8cd2b49af93a5cdd1571b343571e9c3d049d8bf19b25a461f9d3 be18008a00e3b0fb786f5dd36268201fd43bf8527d8a40119b147a3a8c973b3b
 test/extractor-tests/generated/TupleExpr/TupleExpr_getField.ql 308cd14873afedc74e3ed61d283f72da50008ce7690510c57fe0934c92158d58 5e3e23a7221486ead6502debb5d4978fb67046c8b0a5c8a688e4e196cb1f28a1
-test/extractor-tests/generated/TupleField/TupleField.ql 2dbdb37ecb22a05007713434ac747a348266bab2863e48704fff48a10eb01c75 4309f177306f8adea929c1cff809eb26e262ae12e0d95b22597efd36c9105bfd
+test/extractor-tests/generated/TupleField/TupleField.ql ec4f5a92fd702f8ff4540f5c681d79e197354244fdcc6df8a3c50f30f7c3c4c2 ad8c7f8316dc02238c40cc79d257fdfd8614b2db14a871eea849be6551e8f0f5
 test/extractor-tests/generated/TupleField/TupleField_getAttr.ql b6b6a5349fc6767b0081d737e818425f0c93be5bd8de47c29fd89b7812e3267d 23d82a649cb733bc8c1d1b09dde84dbfcc8f847ed35be986a9ca8717ea9e5081
-test/extractor-tests/generated/TupleField/TupleField_getTy.ql 291d62ba4246acad200cd5347ed1280d80595fdf663f0ec39389996c23745fd0 d364381e5aab8aca36be354af5c41b2e8b5e95ae8cb7a14a702a28f644d567a8
+test/extractor-tests/generated/TupleField/TupleField_getTypeRepr.ql ce4b6f69779e9f3c5a8b5625137bac806fc929d1c637804edefbf804a66f88e3 a3b741a2f48cb1e275f978585d2a04a720e23a03ccc04d09eb229fec322f42e3
 test/extractor-tests/generated/TupleField/TupleField_getVisibility.ql c7af5373382394a686d12a23c4e688a7cc0dfe6b6cbee25c7e863b4713601ddb b174f30404e69eef112dedc8397ad444e968f12dde9befdccb051305d98a75d2
 test/extractor-tests/generated/TupleFieldList/TupleFieldList.ql 7dc88440222ff036eb6aeabf9311568ea34f31f7c1ad19c71dd69a2dc17a6ed9 0255890d1389da004f18e8a0fc0b72d22790c36ccfacc6f452b269667f030f22
 test/extractor-tests/generated/TupleFieldList/TupleFieldList_getField.ql ad552a9c0b9964d1770f14cabbb436db60ebedc3c569006542a8eae9ddb30f6d 3a8c49d629376a9b8326138836b05ee2366b1021ffd19f5be74ab023e70aa50d
@@ -1079,24 +1061,24 @@ test/extractor-tests/generated/TuplePat/TuplePat_getField.ql f000bed41af031bc56d
 test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql 6e6cfba0d2565782088af55ca977ada3d8093200aa180a49a67c9a176c52c254 c10c93823a9d814d694ca88fdf65a9bf8c1bb178e50c08982a97aa8d445284b3
 test/extractor-tests/generated/TupleStructPat/TupleStructPat_getField.ql f3f2e23cc2a32aa5abc1e0fda1300dab1693230632b9eaa75bb3b1e82ee9ea1a 24b87a39ec639a26ff8c1d04dc3429b72266b2a3b1650a06a7cd4387b6f0e615
 test/extractor-tests/generated/TupleStructPat/TupleStructPat_getPath.ql 13a06696bbf1fa8d5b73107e28cdba40e93da04b27f9c54381b78a52368d2ad1 5558c35ea9bb371ad90a5b374d7530dd1936f83e6ba656ebfbfd5bd63598e088
-test/extractor-tests/generated/TupleType/TupleType.ql e5951a30817b8c51fe9cb9435f75bfdca2a1277b2094267d3205e33ef1ee9a9c 9a4d57322ed2cff57057654272981b056f833136f983141b033afaf64e19c117
-test/extractor-tests/generated/TupleType/TupleType_getField.ql b73a8cdaf6ba46cf9b63d8819239d2d2c06b3496ed4768e8a387a7558178fbd8 6efbcf13c25d0ff3ed0c6d194ba44d2abfa620406badef8184953395fab92bb4
-test/extractor-tests/generated/TypeAlias/TypeAlias.ql 87645d4aa0e2c789dfd7111c6150e72c65b2e108b371bb5fc247aa8d34a25893 6335b4e56d998eed57d8f026d2d1dbfc018754e87c755e1194a2ef9f7a468233
+test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr.ql 2f99917a95a85a932f423cba5a619a51cada8e704b93c54b0a8cb5d7a1129fa1 759bd02347c898139ac7dabe207988eea125be24d3e4c2282b791ec810c16ea7
+test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr_getField.ql 615acfcbc475b5c2ffa8e46d023fc2e19d29ee879b4949644a7f0b25c33125e6 81b037af5dcb8a0489a7a81a0ad668ca781b71d4406c123c4f1c4f558722f13e
+test/extractor-tests/generated/TypeAlias/TypeAlias.ql 637d4c982691942fabcc99ef4a1765ec794d1271bdd376addb55c9d7ea31230e ef81773e2f1260f66f23ce537080c3273b1cf74f96fba37403d34dc1ee1e0458
 test/extractor-tests/generated/TypeAlias/TypeAlias_getAttr.ql ecf4b45ef4876e46252785d2e42b11207e65757cdb26e60decafd765e7b03b49 21bb4d635d3d38abd731b9ad1a2b871f8e0788f48a03e9572823abeea0ea9382
 test/extractor-tests/generated/TypeAlias/TypeAlias_getCrateOrigin.ql cd66db5b43bcb46a6cf6db8c262fd524017ef67cdb67c010af61fab303e3bc65 2aebae618448530ec537709c5381359ea98399db83eeae3be88825ebefa1829d
 test/extractor-tests/generated/TypeAlias/TypeAlias_getExtendedCanonicalPath.ql fe9c4132e65b54eb071b779e508e9ed0081d860df20f8d4748332b45b7215fd5 448c10c3f8f785c380ce430996af4040419d8dccfa86f75253b6af83d2c8f1c9
 test/extractor-tests/generated/TypeAlias/TypeAlias_getGenericParamList.ql e7e936458dce5a8c6675485a49e2769b6dbff29c112ed744c880e0fc7ae740ef e5fcf3a33d2416db6b0a73401a3cbc0cece22d0e06794e01a1645f2b3bca9306
 test/extractor-tests/generated/TypeAlias/TypeAlias_getName.ql 757deb3493764677de3eb1ff7cc119a469482b7277ed01eb8aa0c38b4a8797fb 5efed24a6968544b10ff44bfac7d0432a9621bde0e53b8477563d600d4847825
-test/extractor-tests/generated/TypeAlias/TypeAlias_getTy.ql c4d56678981c78cd839b203dbd4a02dd30144db83329fb0015e90cf6c6138757 f9626eee79ce10727c6f13ed6a4819eb7da32827357a52939afaf4e71419af33
 test/extractor-tests/generated/TypeAlias/TypeAlias_getTypeBoundList.ql 309efaa32a840fb1fca7d34b7cdbbf51ab469707fa195b69a9f1a7d141db3a02 e12bf44d8858e930bdde80ecd7909b5405a51a1b00a6d2c8ee880e68dd622075
+test/extractor-tests/generated/TypeAlias/TypeAlias_getTypeRepr.ql 64acc817272d5ee0ff3659a6851635ec8436a8f7944c15d19c80fffa2ad29eb7 db1e91971ba1ae8ba95ba8ac1dfa91f2fe0381c1b520518d80b344878357dbf5
 test/extractor-tests/generated/TypeAlias/TypeAlias_getVisibility.ql a1851a78f31ad6e3e5e43537832701f4c420546c2c86449c8391d3cc366d5445 23c118f662dee5f0e286753d107165b1964ce703a1378765f974530929a32723
 test/extractor-tests/generated/TypeAlias/TypeAlias_getWhereClause.ql 0cd281b7b5d3a76e4ec1938d7dcebb41e24ed54e94f352dcf48cbcdb5d48b353 5898e71246d8ba7517dab1f8d726af02a7add79924c8e6b30ce2c760e1344e8f
-test/extractor-tests/generated/TypeArg/TypeArg.ql 8019f0eb5a64162df88e7e64ba0355578dad158b884c8eb42b2f10e093e52121 4871ac369925228978a1e16cf1393a449ea846657893d8a760fb46dbd6a0d609
-test/extractor-tests/generated/TypeArg/TypeArg_getTy.ql 54c291039d88fb460b0bc6bb83938c3be272898512415d08abffea714a000275 3117f1bbc1168b0ff75948459673c50971e3e71b0bb966783a8dc44328803f33
-test/extractor-tests/generated/TypeBound/TypeBound.ql f49bc5b12f9817d9464c771bd35837c1ae6c8b3162ab6b0fc9b3e6748d18e87a 2535af71fa8e212d6f9b9e10ca0ba7958808dea4d1af432e1d5167a681d7779c
+test/extractor-tests/generated/TypeArg/TypeArg.ql 32366a6163dcb2fbe2e98d739cc049f410a6523a135310e79b98a4c760926c8a dd52b9c138197ab07b6abbb66236c37261b47cc3201b1e1ab6ccb425b2cc6f44
+test/extractor-tests/generated/TypeArg/TypeArg_getTypeRepr.ql de9102f7cb306503d1858cba40a48b8f40e192bd11b40104453a303db5c6e241 65105b7b2ee346a37a3d6ee61d4c12e34d0cd6ff4a3d79ee0634081a6f959ef6
+test/extractor-tests/generated/TypeBound/TypeBound.ql e309b93e3788a0350a347b3dd61b779fe8b0320fa9cb0250ccba7c1ed476e79e 6b09a853d1b2528fcbc394aa0490efb2171d4c7c6e7e4f70e84e60bd0f6e2894
 test/extractor-tests/generated/TypeBound/TypeBound_getGenericParamList.ql 7cf4ce64ea8048b85733fc2de627480465a616d62f57345c25bb62fdfda0ca59 e63b77ed3555b150cebf205016b1cc8d1b10fda315d5a21b3e60753ad602ea8f
 test/extractor-tests/generated/TypeBound/TypeBound_getLifetime.ql 615b0f5ccbffc425a3fa9480197bfae649c072717697f59d2e9b8112d2ff3fcf 1f969aca15be820eb27fe80317ad7fd4ce60f1a0fbcb4ae98b04828b0aeca632
-test/extractor-tests/generated/TypeBound/TypeBound_getTy.ql bded40be75f99b97869e5b4701a479db91867a861fb9f2071f4f7df0980ac6a2 6bdb30e50ba3ab7c2976aa602bae54a089019c8b81cab497c962b6b96362fbab
+test/extractor-tests/generated/TypeBound/TypeBound_getTypeRepr.ql 5c77f9ba0ce7ccde5a512e1eb6887e1588789d2bfbaadefa42177a144ca56e37 122ab4c2eb6cf285a1ce8818c00f60a12a53765b6999879a1c3596fb48eda39e
 test/extractor-tests/generated/TypeBoundList/TypeBoundList.ql 829c62ad88caa7707a4067c1a34f81971e936af1280a134b0b3532fbd4e4c887 10133eec05b902d5f0a6b3ed66156879914a83290014ba0ded26f1c3aaeb2b28
 test/extractor-tests/generated/TypeBoundList/TypeBoundList_getBound.ql a6f6ec3f8d329da3509a8040ee2383ec6d9c66fe7c5685d94e90ac989a9e61b0 c812280f09658c63beb2a2ec0ab86e007819da08b6637bb4299c6ed6c90a4c6f
 test/extractor-tests/generated/TypeParam/TypeParam.ql bff624133257883477db43ae05cc17681ab20d5564c2025dc78758255a62eaf2 a25d4adbe6119f4f36fa57f08cf7ba52e0b54668047e685d811570e0126bcfaf
@@ -1127,9 +1109,11 @@ test/extractor-tests/generated/UseTree/UseTree_getRename.ql ec3917501f3c89ac4974
 test/extractor-tests/generated/UseTree/UseTree_getUseTreeList.ql c265a88347e813840969ae934dfd2904bc06f502de77709bc0b1c7255e46382a 52a239c8ea5fd8fbfbd606559d70ecadc769887437a9bcab6fb3e774208ad868
 test/extractor-tests/generated/UseTreeList/UseTreeList.ql cd943c15c86e66244caafeb95b960a5c3d351d5edbd506258744fb60a61af3b2 cfa584cd9d8aa08267fd1106745a66226b2c99fadd1da65059cc7ecf2f2e68cf
 test/extractor-tests/generated/UseTreeList/UseTreeList_getUseTree.ql dd72966b1cb7b04f0267503013809063fcfb145e2b2d7d5250d9f24d2e405f9a 75b953aa11c51ca0fe95e67d50d6238962d8df4a4b9054999a2c6338e5a5613d
-test/extractor-tests/generated/Variant/Variant.ql bf9b928ab3b1911e6c81fdc3fb9811e754ea28bfd0e4a21dca08b844aa42c3f1 bffd4bcc5019f721010722453985b39a4285240774e474e233ebe46f1cd5beb1
+test/extractor-tests/generated/Variant/Variant.ql c60dd31adac91e09f8b1e5523d6b859747e64ef072c077b5a3326763f9f461f7 55d6446a3a831ed1137264678c5df027eb94cb3570a88d364994851fe6236999
 test/extractor-tests/generated/Variant/Variant_getAttr.ql dd38e48e1eb05ce280b880652a90010eb63f7de3be7232411ba6265691249420 f8980680104de1e5fd40f264d8d62346aacaf6403a5e051f6fd680e234c82c1f
+test/extractor-tests/generated/Variant/Variant_getCrateOrigin.ql 99e79930f8ff87a25f256926e5c3ce1ee0847daf6fadc5445fb33c85328b4c61 2dd64a53813790654c83be25b5e175c9c5b388e758723c2138fff095353fdd7b
 test/extractor-tests/generated/Variant/Variant_getExpr.ql ce00af303d28f60c5fd1dc7df628c7974aced21884e223a2f656cb4f0d1a74d5 9de51a65510cf9a15801d4207b616915bd959c95ec7330fdb502c5dff5b650cc
+test/extractor-tests/generated/Variant/Variant_getExtendedCanonicalPath.ql fe6a4bfd1440e7629d47283910de84c5e8c2f5645512780e710f53540b5bc886 b1e31b765cb1a5fe063abb8c1b2115e881ae28aa3ccd39e088ff8f2af20d6cf4
 test/extractor-tests/generated/Variant/Variant_getFieldList.ql 083c8cf61989663de33d99b72dec231c308ccc8bb6739921465c473a07e8ea03 d03bff6945853c940acdc053b813d53b008ddab9a8bd4307826433828d4763ce
 test/extractor-tests/generated/Variant/Variant_getName.ql 0d7b47bec9f9031c67f7b684112a84a311ef9b2efeb260bd7cd6f424011ca0d8 73565e6f965dd7fd7bb9b3408c7d7b69120e1971b67ab307fed293eb663a59ae
 test/extractor-tests/generated/Variant/Variant_getVisibility.ql 2c8f365d28d96af55589f4d71ac3fee718b319b4cbc784560c0591d1f605a119 13160d9cf39fe169410eff6c338f5d063e1948109e8f18dd33ea0064f1dd9283
@@ -1139,12 +1123,12 @@ test/extractor-tests/generated/Visibility/Visibility.ql 417b501e0eef74006cdc41ae
 test/extractor-tests/generated/Visibility/Visibility_getPath.ql 53de9942208dff340d4665f602c519592c79b65dad5db217360fe23bb22b9318 6e4d2b191792d7a259f2edbbb2333df3f97c14600b04142fff4c86266dc61b75
 test/extractor-tests/generated/WhereClause/WhereClause.ql 89af4f9e3021560c67c49a3b7458449aeda469f586317d8855d00977a8969a95 59f9f9e7619fb0aa17124679c69723a31f03e7a7af24088b274234c034371e7c
 test/extractor-tests/generated/WhereClause/WhereClause_getPredicate.ql cc9f83e30aa028d0130c7f27a1cb72a2c8e3100d65de4041f24670e8062192a4 a561ef1d71efc850b73f30a695777acda4835e2b9a34b1d054a57ebb2450d73c
-test/extractor-tests/generated/WherePred/WherePred.ql 4955fa96838565a7cbfaa3361586632764cb67e52e1ca10d2951a924353d94f3 4bfcfe08c3482e0801214b4a06ed632ca02e163c5437ad94d370fc901eb23baf
+test/extractor-tests/generated/WherePred/WherePred.ql 3a29d0eae524810ade32546b9170f25cc243f8542b68b5fe86b0fd2d766e92b3 ff5742ad1d36f2675089c2692418e3c8e73cca3ed1e8796d795aa6c681107099
 test/extractor-tests/generated/WherePred/WherePred_getGenericParamList.ql 21c3aaae697a7c8b4df82aa5c6eeef4963c9240fafb20cca3888e4361e208966 2f9ab4ed12984a4c82af2b8b805b28c2cb0c82d4e90927d9cf5be81e3bdc231a
 test/extractor-tests/generated/WherePred/WherePred_getLifetime.ql e08d9d6cccf634746f42a6ee583bbb3e7e9a9edbb63242e73b2bff4463df55d8 139543750c18f88d9c1ad2cdbcf1699d597cf2264bbb6b02a7e5792444e277ef
-test/extractor-tests/generated/WherePred/WherePred_getTy.ql 34cee0335bbaf8946fe15e3c32449150d07a730fcca56b4faed554fbb8689e21 883976c8c27c276c402d591ebd89d076c2c4d8da4d4f738f3c860c34d4a03b97
 test/extractor-tests/generated/WherePred/WherePred_getTypeBoundList.ql c78e31ff4d1822a6b76f403e5ccb8f5529b4f784e14e618833df0378adca55fc 8bb1c9b5a1cfca0f5e8335464f7439aa098063176fbd3edbaf3407169f1899e6
-test/extractor-tests/generated/WhileExpr/WhileExpr.ql e061fac7584adf999d31ed0785041e2cc14b26a1c9901281f90c859335d8f614 fb1e597e28841e3b2d275d697aa6de7158db51b70a348d634291a75b25e4e80a
+test/extractor-tests/generated/WherePred/WherePred_getTypeRepr.ql e56e4989bb9b9ff1d8648641993732dac2f37c5e3b4bbf1c550735a4f1d84b3c 246cd2cfaf90115060412c9e4a15da9089f3b524f72a63ae42d17b062e7be52f
+test/extractor-tests/generated/WhileExpr/WhileExpr.ql 61c49414f2ed786a68b79bd9a77093e4086457edb6c136cf8a94f2ac830c2f5b 7737f724a297d011c12143e009a63926812c63c08a1067b03e8677697ab00f83
 test/extractor-tests/generated/WhileExpr/WhileExpr_getAttr.ql f8527130eb2492743c0e629c97db291abcefe3d35302c840fee327ab0d8f10fd b41bedd429e5566fd68a50140ff1f50b51e2c7c351cbc8253fbc126527073f7e
 test/extractor-tests/generated/WhileExpr/WhileExpr_getCondition.ql 84a021806423425b24eaeb9fb9967a6aadabe823c24e77a0dfefcb3509041597 147aa8bbe4dbf9b90be2467db8207dc96aed281e722eb6b9c998442a90911a6c
 test/extractor-tests/generated/WhileExpr/WhileExpr_getLabel.ql 60ef4de57d85c7df23c0518b944b3839a9b2478044326829b5bf709a8c8d7240 3916e9ff50733c58afdc09837339b72a555a043f92f1c4e09e1652866029b017
diff --git a/rust/ql/.gitattributes b/rust/ql/.gitattributes
index a532f142ec9..86e56bcdae8 100644
--- a/rust/ql/.gitattributes
+++ b/rust/ql/.gitattributes
@@ -1,9 +1,13 @@
 /.generated.list linguist-generated
 /.gitattributes linguist-generated
+/lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll linguist-generated
 /lib/codeql/rust/elements/Abi.qll linguist-generated
+/lib/codeql/rust/elements/Addressable.qll linguist-generated
 /lib/codeql/rust/elements/ArgList.qll linguist-generated
 /lib/codeql/rust/elements/ArrayExpr.qll linguist-generated
-/lib/codeql/rust/elements/ArrayType.qll linguist-generated
+/lib/codeql/rust/elements/ArrayListExpr.qll linguist-generated
+/lib/codeql/rust/elements/ArrayRepeatExpr.qll linguist-generated
+/lib/codeql/rust/elements/ArrayTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/AsmExpr.qll linguist-generated
 /lib/codeql/rust/elements/AssocItem.qll linguist-generated
 /lib/codeql/rust/elements/AssocItemList.qll linguist-generated
@@ -28,7 +32,7 @@
 /lib/codeql/rust/elements/ConstBlockPat.qll linguist-generated
 /lib/codeql/rust/elements/ConstParam.qll linguist-generated
 /lib/codeql/rust/elements/ContinueExpr.qll linguist-generated
-/lib/codeql/rust/elements/DynTraitType.qll linguist-generated
+/lib/codeql/rust/elements/DynTraitTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/Element.qll linguist-generated
 /lib/codeql/rust/elements/Enum.qll linguist-generated
 /lib/codeql/rust/elements/Expr.qll linguist-generated
@@ -39,9 +43,9 @@
 /lib/codeql/rust/elements/ExternItemList.qll linguist-generated
 /lib/codeql/rust/elements/FieldExpr.qll linguist-generated
 /lib/codeql/rust/elements/FieldList.qll linguist-generated
-/lib/codeql/rust/elements/FnPtrType.qll linguist-generated
+/lib/codeql/rust/elements/FnPtrTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/ForExpr.qll linguist-generated
-/lib/codeql/rust/elements/ForType.qll linguist-generated
+/lib/codeql/rust/elements/ForTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/Format.qll linguist-generated
 /lib/codeql/rust/elements/FormatArgsArg.qll linguist-generated
 /lib/codeql/rust/elements/FormatArgsExpr.qll linguist-generated
@@ -55,12 +59,13 @@
 /lib/codeql/rust/elements/IdentPat.qll linguist-generated
 /lib/codeql/rust/elements/IfExpr.qll linguist-generated
 /lib/codeql/rust/elements/Impl.qll linguist-generated
-/lib/codeql/rust/elements/ImplTraitType.qll linguist-generated
+/lib/codeql/rust/elements/ImplTraitTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/IndexExpr.qll linguist-generated
-/lib/codeql/rust/elements/InferType.qll linguist-generated
+/lib/codeql/rust/elements/InferTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/Item.qll linguist-generated
 /lib/codeql/rust/elements/ItemList.qll linguist-generated
 /lib/codeql/rust/elements/Label.qll linguist-generated
+/lib/codeql/rust/elements/LabelableExpr.qll linguist-generated
 /lib/codeql/rust/elements/LetElse.qll linguist-generated
 /lib/codeql/rust/elements/LetExpr.qll linguist-generated
 /lib/codeql/rust/elements/LetStmt.qll linguist-generated
@@ -71,6 +76,7 @@
 /lib/codeql/rust/elements/LiteralPat.qll linguist-generated
 /lib/codeql/rust/elements/Locatable.qll linguist-generated
 /lib/codeql/rust/elements/LoopExpr.qll linguist-generated
+/lib/codeql/rust/elements/LoopingExpr.qll linguist-generated
 /lib/codeql/rust/elements/MacroCall.qll linguist-generated
 /lib/codeql/rust/elements/MacroDef.qll linguist-generated
 /lib/codeql/rust/elements/MacroExpr.qll linguist-generated
@@ -78,7 +84,7 @@
 /lib/codeql/rust/elements/MacroPat.qll linguist-generated
 /lib/codeql/rust/elements/MacroRules.qll linguist-generated
 /lib/codeql/rust/elements/MacroStmts.qll linguist-generated
-/lib/codeql/rust/elements/MacroType.qll linguist-generated
+/lib/codeql/rust/elements/MacroTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/MatchArm.qll linguist-generated
 /lib/codeql/rust/elements/MatchArmList.qll linguist-generated
 /lib/codeql/rust/elements/MatchExpr.qll linguist-generated
@@ -89,23 +95,24 @@
 /lib/codeql/rust/elements/Module.qll linguist-generated
 /lib/codeql/rust/elements/Name.qll linguist-generated
 /lib/codeql/rust/elements/NameRef.qll linguist-generated
-/lib/codeql/rust/elements/NeverType.qll linguist-generated
+/lib/codeql/rust/elements/NeverTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/OffsetOfExpr.qll linguist-generated
 /lib/codeql/rust/elements/OrPat.qll linguist-generated
 /lib/codeql/rust/elements/Param.qll linguist-generated
+/lib/codeql/rust/elements/ParamBase.qll linguist-generated
 /lib/codeql/rust/elements/ParamList.qll linguist-generated
 /lib/codeql/rust/elements/ParenExpr.qll linguist-generated
 /lib/codeql/rust/elements/ParenPat.qll linguist-generated
-/lib/codeql/rust/elements/ParenType.qll linguist-generated
+/lib/codeql/rust/elements/ParenTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/Pat.qll linguist-generated
 /lib/codeql/rust/elements/Path.qll linguist-generated
 /lib/codeql/rust/elements/PathExpr.qll linguist-generated
 /lib/codeql/rust/elements/PathExprBase.qll linguist-generated
 /lib/codeql/rust/elements/PathPat.qll linguist-generated
 /lib/codeql/rust/elements/PathSegment.qll linguist-generated
-/lib/codeql/rust/elements/PathType.qll linguist-generated
+/lib/codeql/rust/elements/PathTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/PrefixExpr.qll linguist-generated
-/lib/codeql/rust/elements/PtrType.qll linguist-generated
+/lib/codeql/rust/elements/PtrTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/RangeExpr.qll linguist-generated
 /lib/codeql/rust/elements/RangePat.qll linguist-generated
 /lib/codeql/rust/elements/RecordExpr.qll linguist-generated
@@ -118,16 +125,16 @@
 /lib/codeql/rust/elements/RecordPatFieldList.qll linguist-generated
 /lib/codeql/rust/elements/RefExpr.qll linguist-generated
 /lib/codeql/rust/elements/RefPat.qll linguist-generated
-/lib/codeql/rust/elements/RefType.qll linguist-generated
+/lib/codeql/rust/elements/RefTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/Rename.qll linguist-generated
 /lib/codeql/rust/elements/Resolvable.qll linguist-generated
 /lib/codeql/rust/elements/RestPat.qll linguist-generated
-/lib/codeql/rust/elements/RetType.qll linguist-generated
+/lib/codeql/rust/elements/RetTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/ReturnExpr.qll linguist-generated
 /lib/codeql/rust/elements/ReturnTypeSyntax.qll linguist-generated
 /lib/codeql/rust/elements/SelfParam.qll linguist-generated
 /lib/codeql/rust/elements/SlicePat.qll linguist-generated
-/lib/codeql/rust/elements/SliceType.qll linguist-generated
+/lib/codeql/rust/elements/SliceTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/SourceFile.qll linguist-generated
 /lib/codeql/rust/elements/Static.qll linguist-generated
 /lib/codeql/rust/elements/Stmt.qll linguist-generated
@@ -143,13 +150,13 @@
 /lib/codeql/rust/elements/TupleFieldList.qll linguist-generated
 /lib/codeql/rust/elements/TuplePat.qll linguist-generated
 /lib/codeql/rust/elements/TupleStructPat.qll linguist-generated
-/lib/codeql/rust/elements/TupleType.qll linguist-generated
+/lib/codeql/rust/elements/TupleTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/TypeAlias.qll linguist-generated
 /lib/codeql/rust/elements/TypeArg.qll linguist-generated
 /lib/codeql/rust/elements/TypeBound.qll linguist-generated
 /lib/codeql/rust/elements/TypeBoundList.qll linguist-generated
 /lib/codeql/rust/elements/TypeParam.qll linguist-generated
-/lib/codeql/rust/elements/TypeRef.qll linguist-generated
+/lib/codeql/rust/elements/TypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/UnderscoreExpr.qll linguist-generated
 /lib/codeql/rust/elements/Unextracted.qll linguist-generated
 /lib/codeql/rust/elements/Unimplemented.qll linguist-generated
@@ -168,12 +175,14 @@
 /lib/codeql/rust/elements/YieldExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/AbiConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/AbiImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/AddressableImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ArgListConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ArgListImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/ArrayExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ArrayExprImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/ArrayTypeConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ArrayTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ArrayExprInternal.qll linguist-generated
+/lib/codeql/rust/elements/internal/ArrayExprInternalConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ArrayExprInternalImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ArrayTypeReprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ArrayTypeReprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/AsmExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/AsmExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/AssocItemImpl.qll linguist-generated
@@ -184,25 +193,18 @@
 /lib/codeql/rust/elements/internal/AttrConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/AttrImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/AwaitExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/AwaitExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/BecomeExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/BecomeExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/BinaryExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/BlockExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/BlockExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/BoxPatConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/BoxPatImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/BreakExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/CallExprBaseImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/CallExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/CallExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/CallableImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/CastExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/CastExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ClosureBinderConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ClosureBinderImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ClosureExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ClosureExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/CommentConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ConstArgConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ConstArgImpl.qll linguist-generated
@@ -213,10 +215,9 @@
 /lib/codeql/rust/elements/internal/ConstParamConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ConstParamImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ContinueExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/DynTraitTypeConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/DynTraitTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/DynTraitTypeReprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/DynTraitTypeReprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/EnumConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/EnumImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ExprStmtConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ExprStmtImpl.qll linguist-generated
@@ -227,60 +228,48 @@
 /lib/codeql/rust/elements/internal/ExternItemImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ExternItemListConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ExternItemListImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ExtractorStep.qll linguist-generated
+/lib/codeql/rust/elements/internal/ExtractorStepConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/FieldExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/FieldExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/FieldListImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/FnPtrTypeConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/FnPtrTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/FnPtrTypeReprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/FnPtrTypeReprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ForExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ForExprImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/ForTypeConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ForTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ForTypeReprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ForTypeReprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/FormatArgsArgConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/FormatArgsArgImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/FormatArgsExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/FunctionConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/GenericArgImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/GenericArgListConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/GenericArgListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/GenericParamImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/GenericParamListConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/GenericParamListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/IdentPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/IfExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/IfExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ImplConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ImplImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/ImplTraitTypeConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ImplTraitTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ImplTraitTypeReprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ImplTraitTypeReprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/IndexExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/IndexExprImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/InferTypeConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/InferTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/InferTypeReprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ItemImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ItemListConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ItemListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/LabelConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/LabelImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/LetElseConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/LetElseImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/LetExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/LetExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/LetStmtConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/LetStmtImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/LifetimeArgConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/LifetimeArgImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/LifetimeConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/LifetimeImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/LifetimeParamConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/LifetimeParamImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/LiteralExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/LiteralPatConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/LiteralPatImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/LoopExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/LoopExprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/LoopingExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/MacroCallConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/MacroCallImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/MacroDefConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/MacroDefImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/MacroExprConstructor.qll linguist-generated
@@ -293,10 +282,9 @@
 /lib/codeql/rust/elements/internal/MacroRulesImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/MacroStmtsConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/MacroStmtsImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/MacroTypeConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/MacroTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroTypeReprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/MacroTypeReprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/MatchArmConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/MatchArmImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/MatchArmListConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/MatchArmListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/MatchExprConstructor.qll linguist-generated
@@ -308,46 +296,35 @@
 /lib/codeql/rust/elements/internal/MissingConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/MissingImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ModuleConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ModuleImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/NameConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/NameRefConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/NeverTypeConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/NeverTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/NeverTypeReprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/OffsetOfExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/OffsetOfExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/OrPatConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/ParamBaseImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ParamConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ParamImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ParamListConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ParamListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ParenExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ParenExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ParenPatConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ParenPatImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/ParenTypeConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ParenTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ParenTypeReprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/PatImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/PathConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/PathExprBaseImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/PathExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/PathPatConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/PathPatImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/PathSegmentConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/PathTypeConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/PathTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/PathTypeReprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/PrefixExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/PtrTypeConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/PtrTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/PtrTypeReprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/PtrTypeReprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/RangeExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/RangeExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/RangePatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/RangePatImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/RecordExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/RecordExprFieldConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/RecordExprFieldImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/RecordExprFieldListConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/RecordExprFieldListImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/RecordExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/RecordFieldConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/RecordFieldImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/RecordFieldListConstructor.qll linguist-generated
@@ -357,30 +334,24 @@
 /lib/codeql/rust/elements/internal/RecordPatFieldImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/RecordPatFieldListConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/RecordPatFieldListImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/RecordPatImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/RefExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/RefExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/RefPatConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/RefPatImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/RefTypeConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/RefTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/RefTypeReprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/RefTypeReprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/RenameConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/RenameImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/ResolvableImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/RestPatConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/RestPatImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/RetTypeConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/RetTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/RetTypeReprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/RetTypeReprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ReturnExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ReturnExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ReturnTypeSyntaxConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ReturnTypeSyntaxImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/SelfParamConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/SelfParamImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/SlicePatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/SlicePatImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/SliceTypeConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/SliceTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/SliceTypeReprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/SliceTypeReprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/SourceFileConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/SourceFileImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/StaticConstructor.qll linguist-generated
@@ -396,7 +367,6 @@
 /lib/codeql/rust/elements/internal/TraitAliasConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/TraitAliasImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/TraitConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/TraitImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/TryExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/TryExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/TupleExprConstructor.qll linguist-generated
@@ -408,9 +378,8 @@
 /lib/codeql/rust/elements/internal/TuplePatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/TuplePatImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/TupleStructPatConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/TupleStructPatImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/TupleTypeConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/TupleTypeImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/TupleTypeReprConstructor.qll linguist-generated
+/lib/codeql/rust/elements/internal/TupleTypeReprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/TypeAliasConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/TypeAliasImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/TypeArgConstructor.qll linguist-generated
@@ -421,14 +390,12 @@
 /lib/codeql/rust/elements/internal/TypeBoundListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/TypeParamConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/TypeParamImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/TypeRefImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/TypeReprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/UnderscoreExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/UnderscoreExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/UnextractedImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/UnimplementedConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/UnimplementedImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/UnionConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/UnionImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/UseConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/UseImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/UseTreeConstructor.qll linguist-generated
@@ -446,17 +413,19 @@
 /lib/codeql/rust/elements/internal/WherePredConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/WherePredImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/WhileExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/WhileExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/WildcardPatConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/WildcardPatImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/YeetExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/YeetExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/YieldExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/YieldExprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Abi.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/Addressable.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ArgList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ArrayExpr.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/ArrayType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ArrayExprInternal.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ArrayListExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ArrayRepeatExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ArrayTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/AsmExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/AssocItem.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/AssocItemList.qll linguist-generated
@@ -481,7 +450,7 @@
 /lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ConstParam.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ContinueExpr.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/DynTraitType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/DynTraitTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Element.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Enum.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Expr.qll linguist-generated
@@ -490,11 +459,12 @@
 /lib/codeql/rust/elements/internal/generated/ExternCrate.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ExternItem.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ExternItemList.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ExtractorStep.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/FieldExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/FieldList.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/FnPtrType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/FnPtrTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ForExpr.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/ForType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ForTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Format.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/FormatArgsArg.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/FormatArgsExpr.qll linguist-generated
@@ -508,12 +478,13 @@
 /lib/codeql/rust/elements/internal/generated/IdentPat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/IfExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Impl.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/ImplTraitType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ImplTraitTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/IndexExpr.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/InferType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/InferTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Item.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ItemList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Label.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/LabelableExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/LetElse.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/LetExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/LetStmt.qll linguist-generated
@@ -524,6 +495,7 @@
 /lib/codeql/rust/elements/internal/generated/LiteralPat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Locatable.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/LoopExpr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/LoopingExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/MacroCall.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/MacroDef.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/MacroExpr.qll linguist-generated
@@ -531,7 +503,7 @@
 /lib/codeql/rust/elements/internal/generated/MacroPat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/MacroRules.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/MacroStmts.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/MacroType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/MacroTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/MatchArm.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/MatchArmList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/MatchExpr.qll linguist-generated
@@ -542,14 +514,15 @@
 /lib/codeql/rust/elements/internal/generated/Module.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Name.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/NameRef.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/NeverType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/NeverTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/OrPat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Param.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ParamBase.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ParamList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ParenExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ParenPat.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/ParenType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ParenTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ParentChild.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Pat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Path.qll linguist-generated
@@ -557,9 +530,9 @@
 /lib/codeql/rust/elements/internal/generated/PathExprBase.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/PathPat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/PathSegment.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/PathType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/PathTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/PrefixExpr.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/PtrType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/PtrTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/PureSynthConstructors.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/RangeExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/RangePat.qll linguist-generated
@@ -574,16 +547,16 @@
 /lib/codeql/rust/elements/internal/generated/RecordPatFieldList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/RefExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/RefPat.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/RefType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/RefTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Rename.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Resolvable.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/RestPat.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/RetType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/RetTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ReturnExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ReturnTypeSyntax.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/SelfParam.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/SlicePat.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/SliceType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/SliceTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/SourceFile.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Static.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Stmt.qll linguist-generated
@@ -601,13 +574,13 @@
 /lib/codeql/rust/elements/internal/generated/TupleFieldList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/TuplePat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/TupleStructPat.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/TupleType.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/TupleTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/TypeAlias.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/TypeArg.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/TypeBound.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/TypeBoundList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/TypeParam.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/TypeRef.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/TypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/UnderscoreExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Unextracted.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Unimplemented.qll linguist-generated
@@ -629,12 +602,15 @@
 /test/extractor-tests/generated/Abi/Abi_getAbiString.ql linguist-generated
 /test/extractor-tests/generated/ArgList/ArgList.ql linguist-generated
 /test/extractor-tests/generated/ArgList/ArgList_getArg.ql linguist-generated
-/test/extractor-tests/generated/ArrayExpr/ArrayExpr.ql linguist-generated
-/test/extractor-tests/generated/ArrayExpr/ArrayExpr_getAttr.ql linguist-generated
-/test/extractor-tests/generated/ArrayExpr/ArrayExpr_getExpr.ql linguist-generated
-/test/extractor-tests/generated/ArrayType/ArrayType.ql linguist-generated
-/test/extractor-tests/generated/ArrayType/ArrayType_getConstArg.ql linguist-generated
-/test/extractor-tests/generated/ArrayType/ArrayType_getTy.ql linguist-generated
+/test/extractor-tests/generated/ArrayListExpr/ArrayListExpr.ql linguist-generated
+/test/extractor-tests/generated/ArrayListExpr/ArrayListExpr_getAttr.ql linguist-generated
+/test/extractor-tests/generated/ArrayListExpr/ArrayListExpr_getExpr.ql linguist-generated
+/test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr.ql linguist-generated
+/test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr_getAttr.ql linguist-generated
+/test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr_getExpr.ql linguist-generated
+/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr.ql linguist-generated
+/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr_getConstArg.ql linguist-generated
+/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr_getElementTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/AsmExpr/AsmExpr.ql linguist-generated
 /test/extractor-tests/generated/AsmExpr/AsmExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/AsmExpr/AsmExpr_getExpr.ql linguist-generated
@@ -645,8 +621,8 @@
 /test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getParamList.ql linguist-generated
 /test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getRetType.ql linguist-generated
 /test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getReturnTypeSyntax.ql linguist-generated
-/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTy.ql linguist-generated
 /test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTypeBoundList.ql linguist-generated
+/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/Attr/Attr.ql linguist-generated
 /test/extractor-tests/generated/Attr/Attr_getMeta.ql linguist-generated
 /test/extractor-tests/generated/AwaitExpr/AwaitExpr.ql linguist-generated
@@ -673,11 +649,11 @@
 /test/extractor-tests/generated/CallExpr/CallExpr.ql linguist-generated
 /test/extractor-tests/generated/CallExpr/CallExpr_getArgList.ql linguist-generated
 /test/extractor-tests/generated/CallExpr/CallExpr_getAttr.ql linguist-generated
-/test/extractor-tests/generated/CallExpr/CallExpr_getExpr.ql linguist-generated
+/test/extractor-tests/generated/CallExpr/CallExpr_getFunction.ql linguist-generated
 /test/extractor-tests/generated/CastExpr/CastExpr.ql linguist-generated
 /test/extractor-tests/generated/CastExpr/CastExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/CastExpr/CastExpr_getExpr.ql linguist-generated
-/test/extractor-tests/generated/CastExpr/CastExpr_getTy.ql linguist-generated
+/test/extractor-tests/generated/CastExpr/CastExpr_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/ClosureBinder/ClosureBinder.ql linguist-generated
 /test/extractor-tests/generated/ClosureBinder/ClosureBinder_getGenericParamList.ql linguist-generated
 /test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql linguist-generated
@@ -693,7 +669,7 @@
 /test/extractor-tests/generated/Const/Const_getCrateOrigin.ql linguist-generated
 /test/extractor-tests/generated/Const/Const_getExtendedCanonicalPath.ql linguist-generated
 /test/extractor-tests/generated/Const/Const_getName.ql linguist-generated
-/test/extractor-tests/generated/Const/Const_getTy.ql linguist-generated
+/test/extractor-tests/generated/Const/Const_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/Const/Const_getVisibility.ql linguist-generated
 /test/extractor-tests/generated/ConstArg/ConstArg.ql linguist-generated
 /test/extractor-tests/generated/ConstArg/ConstArg_getExpr.ql linguist-generated
@@ -703,12 +679,12 @@
 /test/extractor-tests/generated/ConstParam/ConstParam_getAttr.ql linguist-generated
 /test/extractor-tests/generated/ConstParam/ConstParam_getDefaultVal.ql linguist-generated
 /test/extractor-tests/generated/ConstParam/ConstParam_getName.ql linguist-generated
-/test/extractor-tests/generated/ConstParam/ConstParam_getTy.ql linguist-generated
+/test/extractor-tests/generated/ConstParam/ConstParam_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/ContinueExpr/ContinueExpr.ql linguist-generated
 /test/extractor-tests/generated/ContinueExpr/ContinueExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLifetime.ql linguist-generated
-/test/extractor-tests/generated/DynTraitType/DynTraitType.ql linguist-generated
-/test/extractor-tests/generated/DynTraitType/DynTraitType_getTypeBoundList.ql linguist-generated
+/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.ql linguist-generated
+/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr_getTypeBoundList.ql linguist-generated
 /test/extractor-tests/generated/Enum/Enum.ql linguist-generated
 /test/extractor-tests/generated/Enum/Enum_getAttr.ql linguist-generated
 /test/extractor-tests/generated/Enum/Enum_getCrateOrigin.ql linguist-generated
@@ -740,26 +716,32 @@
 /test/extractor-tests/generated/FieldExpr/FieldExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/FieldExpr/FieldExpr_getExpr.ql linguist-generated
 /test/extractor-tests/generated/FieldExpr/FieldExpr_getNameRef.ql linguist-generated
-/test/extractor-tests/generated/FnPtrType/FnPtrType.ql linguist-generated
-/test/extractor-tests/generated/FnPtrType/FnPtrType_getAbi.ql linguist-generated
-/test/extractor-tests/generated/FnPtrType/FnPtrType_getParamList.ql linguist-generated
-/test/extractor-tests/generated/FnPtrType/FnPtrType_getRetType.ql linguist-generated
+/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr.ql linguist-generated
+/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getAbi.ql linguist-generated
+/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getParamList.ql linguist-generated
+/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getRetType.ql linguist-generated
 /test/extractor-tests/generated/ForExpr/ForExpr.ql linguist-generated
 /test/extractor-tests/generated/ForExpr/ForExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/ForExpr/ForExpr_getIterable.ql linguist-generated
 /test/extractor-tests/generated/ForExpr/ForExpr_getLabel.ql linguist-generated
 /test/extractor-tests/generated/ForExpr/ForExpr_getLoopBody.ql linguist-generated
 /test/extractor-tests/generated/ForExpr/ForExpr_getPat.ql linguist-generated
-/test/extractor-tests/generated/ForType/ForType.ql linguist-generated
-/test/extractor-tests/generated/ForType/ForType_getGenericParamList.ql linguist-generated
-/test/extractor-tests/generated/ForType/ForType_getTy.ql linguist-generated
-/test/extractor-tests/generated/FormatArgsArg/FormatArgsArg.ql linguist-generated
-/test/extractor-tests/generated/FormatArgsArg/FormatArgsArg_getExpr.ql linguist-generated
-/test/extractor-tests/generated/FormatArgsArg/FormatArgsArg_getName.ql linguist-generated
+/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.ql linguist-generated
+/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr_getGenericParamList.ql linguist-generated
+/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr_getTypeRepr.ql linguist-generated
+/test/extractor-tests/generated/FormatArgsExpr/Format.ql linguist-generated
+/test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg.ql linguist-generated
+/test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg_getExpr.ql linguist-generated
+/test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg_getName.ql linguist-generated
 /test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.ql linguist-generated
 /test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getArg.ql linguist-generated
 /test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getAttr.ql linguist-generated
+/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getFormat.ql linguist-generated
 /test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getTemplate.ql linguist-generated
+/test/extractor-tests/generated/FormatArgsExpr/FormatArgument.ql linguist-generated
+/test/extractor-tests/generated/FormatArgsExpr/FormatArgument_getVariable.ql linguist-generated
+/test/extractor-tests/generated/FormatArgsExpr/FormatTemplateVariableAccess.ql linguist-generated
+/test/extractor-tests/generated/FormatArgsExpr/Format_getArgument.ql linguist-generated
 /test/extractor-tests/generated/Function/Function.ql linguist-generated
 /test/extractor-tests/generated/Function/Function_getAbi.ql linguist-generated
 /test/extractor-tests/generated/Function/Function_getAttr.ql linguist-generated
@@ -795,13 +777,13 @@
 /test/extractor-tests/generated/Impl/Impl_getTrait.ql linguist-generated
 /test/extractor-tests/generated/Impl/Impl_getVisibility.ql linguist-generated
 /test/extractor-tests/generated/Impl/Impl_getWhereClause.ql linguist-generated
-/test/extractor-tests/generated/ImplTraitType/ImplTraitType.ql linguist-generated
-/test/extractor-tests/generated/ImplTraitType/ImplTraitType_getTypeBoundList.ql linguist-generated
+/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr.ql linguist-generated
+/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr_getTypeBoundList.ql linguist-generated
 /test/extractor-tests/generated/IndexExpr/IndexExpr.ql linguist-generated
 /test/extractor-tests/generated/IndexExpr/IndexExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/IndexExpr/IndexExpr_getBase.ql linguist-generated
 /test/extractor-tests/generated/IndexExpr/IndexExpr_getIndex.ql linguist-generated
-/test/extractor-tests/generated/InferType/InferType.ql linguist-generated
+/test/extractor-tests/generated/InferTypeRepr/InferTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/ItemList/ItemList.ql linguist-generated
 /test/extractor-tests/generated/ItemList/ItemList_getAttr.ql linguist-generated
 /test/extractor-tests/generated/ItemList/ItemList_getItem.ql linguist-generated
@@ -811,14 +793,14 @@
 /test/extractor-tests/generated/LetElse/LetElse_getBlockExpr.ql linguist-generated
 /test/extractor-tests/generated/LetExpr/LetExpr.ql linguist-generated
 /test/extractor-tests/generated/LetExpr/LetExpr_getAttr.ql linguist-generated
-/test/extractor-tests/generated/LetExpr/LetExpr_getExpr.ql linguist-generated
 /test/extractor-tests/generated/LetExpr/LetExpr_getPat.ql linguist-generated
+/test/extractor-tests/generated/LetExpr/LetExpr_getScrutinee.ql linguist-generated
 /test/extractor-tests/generated/LetStmt/LetStmt.ql linguist-generated
 /test/extractor-tests/generated/LetStmt/LetStmt_getAttr.ql linguist-generated
 /test/extractor-tests/generated/LetStmt/LetStmt_getInitializer.ql linguist-generated
 /test/extractor-tests/generated/LetStmt/LetStmt_getLetElse.ql linguist-generated
 /test/extractor-tests/generated/LetStmt/LetStmt_getPat.ql linguist-generated
-/test/extractor-tests/generated/LetStmt/LetStmt_getTy.ql linguist-generated
+/test/extractor-tests/generated/LetStmt/LetStmt_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/Lifetime/Lifetime.ql linguist-generated
 /test/extractor-tests/generated/Lifetime/Lifetime_getText.ql linguist-generated
 /test/extractor-tests/generated/LifetimeArg/LifetimeArg.ql linguist-generated
@@ -867,8 +849,8 @@
 /test/extractor-tests/generated/MacroStmts/MacroStmts.ql linguist-generated
 /test/extractor-tests/generated/MacroStmts/MacroStmts_getExpr.ql linguist-generated
 /test/extractor-tests/generated/MacroStmts/MacroStmts_getStatement.ql linguist-generated
-/test/extractor-tests/generated/MacroType/MacroType.ql linguist-generated
-/test/extractor-tests/generated/MacroType/MacroType_getMacroCall.ql linguist-generated
+/test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr.ql linguist-generated
+/test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr_getMacroCall.ql linguist-generated
 /test/extractor-tests/generated/MatchArm/MatchArm.ql linguist-generated
 /test/extractor-tests/generated/MatchArm/MatchArm_getAttr.ql linguist-generated
 /test/extractor-tests/generated/MatchArm/MatchArm_getExpr.ql linguist-generated
@@ -879,8 +861,8 @@
 /test/extractor-tests/generated/MatchArmList/MatchArmList_getAttr.ql linguist-generated
 /test/extractor-tests/generated/MatchExpr/MatchExpr.ql linguist-generated
 /test/extractor-tests/generated/MatchExpr/MatchExpr_getAttr.ql linguist-generated
-/test/extractor-tests/generated/MatchExpr/MatchExpr_getExpr.ql linguist-generated
 /test/extractor-tests/generated/MatchExpr/MatchExpr_getMatchArmList.ql linguist-generated
+/test/extractor-tests/generated/MatchExpr/MatchExpr_getScrutinee.ql linguist-generated
 /test/extractor-tests/generated/MatchGuard/MatchGuard.ql linguist-generated
 /test/extractor-tests/generated/MatchGuard/MatchGuard_getCondition.ql linguist-generated
 /test/extractor-tests/generated/Meta/Meta.ql linguist-generated
@@ -906,17 +888,17 @@
 /test/extractor-tests/generated/Name/Name_getText.ql linguist-generated
 /test/extractor-tests/generated/NameRef/NameRef.ql linguist-generated
 /test/extractor-tests/generated/NameRef/NameRef_getText.ql linguist-generated
-/test/extractor-tests/generated/NeverType/NeverType.ql linguist-generated
+/test/extractor-tests/generated/NeverTypeRepr/NeverTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql linguist-generated
 /test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getField.ql linguist-generated
-/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTy.ql linguist-generated
+/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/OrPat/OrPat.ql linguist-generated
 /test/extractor-tests/generated/OrPat/OrPat_getPat.ql linguist-generated
 /test/extractor-tests/generated/Param/Param.ql linguist-generated
 /test/extractor-tests/generated/Param/Param_getAttr.ql linguist-generated
 /test/extractor-tests/generated/Param/Param_getPat.ql linguist-generated
-/test/extractor-tests/generated/Param/Param_getTy.ql linguist-generated
+/test/extractor-tests/generated/Param/Param_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/ParamList/ParamList.ql linguist-generated
 /test/extractor-tests/generated/ParamList/ParamList_getParam.ql linguist-generated
 /test/extractor-tests/generated/ParamList/ParamList_getSelfParam.ql linguist-generated
@@ -925,34 +907,34 @@
 /test/extractor-tests/generated/ParenExpr/ParenExpr_getExpr.ql linguist-generated
 /test/extractor-tests/generated/ParenPat/ParenPat.ql linguist-generated
 /test/extractor-tests/generated/ParenPat/ParenPat_getPat.ql linguist-generated
-/test/extractor-tests/generated/ParenType/ParenType.ql linguist-generated
-/test/extractor-tests/generated/ParenType/ParenType_getTy.ql linguist-generated
+/test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr.ql linguist-generated
+/test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/Path/Path.ql linguist-generated
+/test/extractor-tests/generated/Path/PathExpr.ql linguist-generated
+/test/extractor-tests/generated/Path/PathExpr_getAttr.ql linguist-generated
+/test/extractor-tests/generated/Path/PathExpr_getPath.ql linguist-generated
+/test/extractor-tests/generated/Path/PathPat.ql linguist-generated
+/test/extractor-tests/generated/Path/PathPat_getPath.ql linguist-generated
+/test/extractor-tests/generated/Path/PathSegment.ql linguist-generated
+/test/extractor-tests/generated/Path/PathSegment_getGenericArgList.ql linguist-generated
+/test/extractor-tests/generated/Path/PathSegment_getNameRef.ql linguist-generated
+/test/extractor-tests/generated/Path/PathSegment_getParamList.ql linguist-generated
+/test/extractor-tests/generated/Path/PathSegment_getPathType.ql linguist-generated
+/test/extractor-tests/generated/Path/PathSegment_getRetType.ql linguist-generated
+/test/extractor-tests/generated/Path/PathSegment_getReturnTypeSyntax.ql linguist-generated
+/test/extractor-tests/generated/Path/PathSegment_getTypeRepr.ql linguist-generated
+/test/extractor-tests/generated/Path/PathTypeRepr.ql linguist-generated
+/test/extractor-tests/generated/Path/PathTypeRepr_getPath.ql linguist-generated
 /test/extractor-tests/generated/Path/Path_getPart.ql linguist-generated
 /test/extractor-tests/generated/Path/Path_getQualifier.ql linguist-generated
 /test/extractor-tests/generated/Path/Path_getResolvedCrateOrigin.ql linguist-generated
 /test/extractor-tests/generated/Path/Path_getResolvedPath.ql linguist-generated
-/test/extractor-tests/generated/PathExpr/PathExpr.ql linguist-generated
-/test/extractor-tests/generated/PathExpr/PathExpr_getAttr.ql linguist-generated
-/test/extractor-tests/generated/PathExpr/PathExpr_getPath.ql linguist-generated
-/test/extractor-tests/generated/PathPat/PathPat.ql linguist-generated
-/test/extractor-tests/generated/PathPat/PathPat_getPath.ql linguist-generated
-/test/extractor-tests/generated/PathSegment/PathSegment.ql linguist-generated
-/test/extractor-tests/generated/PathSegment/PathSegment_getGenericArgList.ql linguist-generated
-/test/extractor-tests/generated/PathSegment/PathSegment_getNameRef.ql linguist-generated
-/test/extractor-tests/generated/PathSegment/PathSegment_getParamList.ql linguist-generated
-/test/extractor-tests/generated/PathSegment/PathSegment_getPathType.ql linguist-generated
-/test/extractor-tests/generated/PathSegment/PathSegment_getRetType.ql linguist-generated
-/test/extractor-tests/generated/PathSegment/PathSegment_getReturnTypeSyntax.ql linguist-generated
-/test/extractor-tests/generated/PathSegment/PathSegment_getTy.ql linguist-generated
-/test/extractor-tests/generated/PathType/PathType.ql linguist-generated
-/test/extractor-tests/generated/PathType/PathType_getPath.ql linguist-generated
 /test/extractor-tests/generated/PrefixExpr/PrefixExpr.ql linguist-generated
 /test/extractor-tests/generated/PrefixExpr/PrefixExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/PrefixExpr/PrefixExpr_getExpr.ql linguist-generated
 /test/extractor-tests/generated/PrefixExpr/PrefixExpr_getOperatorName.ql linguist-generated
-/test/extractor-tests/generated/PtrType/PtrType.ql linguist-generated
-/test/extractor-tests/generated/PtrType/PtrType_getTy.ql linguist-generated
+/test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr.ql linguist-generated
+/test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/RangeExpr/RangeExpr.ql linguist-generated
 /test/extractor-tests/generated/RangeExpr/RangeExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/RangeExpr/RangeExpr_getEnd.ql linguist-generated
@@ -976,7 +958,7 @@
 /test/extractor-tests/generated/RecordField/RecordField.ql linguist-generated
 /test/extractor-tests/generated/RecordField/RecordField_getAttr.ql linguist-generated
 /test/extractor-tests/generated/RecordField/RecordField_getName.ql linguist-generated
-/test/extractor-tests/generated/RecordField/RecordField_getTy.ql linguist-generated
+/test/extractor-tests/generated/RecordField/RecordField_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/RecordField/RecordField_getVisibility.ql linguist-generated
 /test/extractor-tests/generated/RecordFieldList/RecordFieldList.ql linguist-generated
 /test/extractor-tests/generated/RecordFieldList/RecordFieldList_getField.ql linguist-generated
@@ -995,15 +977,15 @@
 /test/extractor-tests/generated/RefExpr/RefExpr_getExpr.ql linguist-generated
 /test/extractor-tests/generated/RefPat/RefPat.ql linguist-generated
 /test/extractor-tests/generated/RefPat/RefPat_getPat.ql linguist-generated
-/test/extractor-tests/generated/RefType/RefType.ql linguist-generated
-/test/extractor-tests/generated/RefType/RefType_getLifetime.ql linguist-generated
-/test/extractor-tests/generated/RefType/RefType_getTy.ql linguist-generated
+/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr.ql linguist-generated
+/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr_getLifetime.ql linguist-generated
+/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/Rename/Rename.ql linguist-generated
 /test/extractor-tests/generated/Rename/Rename_getName.ql linguist-generated
 /test/extractor-tests/generated/RestPat/RestPat.ql linguist-generated
 /test/extractor-tests/generated/RestPat/RestPat_getAttr.ql linguist-generated
-/test/extractor-tests/generated/RetType/RetType.ql linguist-generated
-/test/extractor-tests/generated/RetType/RetType_getTy.ql linguist-generated
+/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr.ql linguist-generated
+/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/ReturnExpr/ReturnExpr.ql linguist-generated
 /test/extractor-tests/generated/ReturnExpr/ReturnExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/ReturnExpr/ReturnExpr_getExpr.ql linguist-generated
@@ -1012,11 +994,11 @@
 /test/extractor-tests/generated/SelfParam/SelfParam_getAttr.ql linguist-generated
 /test/extractor-tests/generated/SelfParam/SelfParam_getLifetime.ql linguist-generated
 /test/extractor-tests/generated/SelfParam/SelfParam_getName.ql linguist-generated
-/test/extractor-tests/generated/SelfParam/SelfParam_getTy.ql linguist-generated
+/test/extractor-tests/generated/SelfParam/SelfParam_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/SlicePat/SlicePat.ql linguist-generated
 /test/extractor-tests/generated/SlicePat/SlicePat_getPat.ql linguist-generated
-/test/extractor-tests/generated/SliceType/SliceType.ql linguist-generated
-/test/extractor-tests/generated/SliceType/SliceType_getTy.ql linguist-generated
+/test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr.ql linguist-generated
+/test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/SourceFile/SourceFile.ql linguist-generated
 /test/extractor-tests/generated/SourceFile/SourceFile_getAttr.ql linguist-generated
 /test/extractor-tests/generated/SourceFile/SourceFile_getItem.ql linguist-generated
@@ -1026,7 +1008,7 @@
 /test/extractor-tests/generated/Static/Static_getCrateOrigin.ql linguist-generated
 /test/extractor-tests/generated/Static/Static_getExtendedCanonicalPath.ql linguist-generated
 /test/extractor-tests/generated/Static/Static_getName.ql linguist-generated
-/test/extractor-tests/generated/Static/Static_getTy.ql linguist-generated
+/test/extractor-tests/generated/Static/Static_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/Static/Static_getVisibility.ql linguist-generated
 /test/extractor-tests/generated/StmtList/StmtList.ql linguist-generated
 /test/extractor-tests/generated/StmtList/StmtList_getAttr.ql linguist-generated
@@ -1072,7 +1054,7 @@
 /test/extractor-tests/generated/TupleExpr/TupleExpr_getField.ql linguist-generated
 /test/extractor-tests/generated/TupleField/TupleField.ql linguist-generated
 /test/extractor-tests/generated/TupleField/TupleField_getAttr.ql linguist-generated
-/test/extractor-tests/generated/TupleField/TupleField_getTy.ql linguist-generated
+/test/extractor-tests/generated/TupleField/TupleField_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/TupleField/TupleField_getVisibility.ql linguist-generated
 /test/extractor-tests/generated/TupleFieldList/TupleFieldList.ql linguist-generated
 /test/extractor-tests/generated/TupleFieldList/TupleFieldList_getField.ql linguist-generated
@@ -1081,24 +1063,24 @@
 /test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql linguist-generated
 /test/extractor-tests/generated/TupleStructPat/TupleStructPat_getField.ql linguist-generated
 /test/extractor-tests/generated/TupleStructPat/TupleStructPat_getPath.ql linguist-generated
-/test/extractor-tests/generated/TupleType/TupleType.ql linguist-generated
-/test/extractor-tests/generated/TupleType/TupleType_getField.ql linguist-generated
+/test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr.ql linguist-generated
+/test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr_getField.ql linguist-generated
 /test/extractor-tests/generated/TypeAlias/TypeAlias.ql linguist-generated
 /test/extractor-tests/generated/TypeAlias/TypeAlias_getAttr.ql linguist-generated
 /test/extractor-tests/generated/TypeAlias/TypeAlias_getCrateOrigin.ql linguist-generated
 /test/extractor-tests/generated/TypeAlias/TypeAlias_getExtendedCanonicalPath.ql linguist-generated
 /test/extractor-tests/generated/TypeAlias/TypeAlias_getGenericParamList.ql linguist-generated
 /test/extractor-tests/generated/TypeAlias/TypeAlias_getName.ql linguist-generated
-/test/extractor-tests/generated/TypeAlias/TypeAlias_getTy.ql linguist-generated
 /test/extractor-tests/generated/TypeAlias/TypeAlias_getTypeBoundList.ql linguist-generated
+/test/extractor-tests/generated/TypeAlias/TypeAlias_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/TypeAlias/TypeAlias_getVisibility.ql linguist-generated
 /test/extractor-tests/generated/TypeAlias/TypeAlias_getWhereClause.ql linguist-generated
 /test/extractor-tests/generated/TypeArg/TypeArg.ql linguist-generated
-/test/extractor-tests/generated/TypeArg/TypeArg_getTy.ql linguist-generated
+/test/extractor-tests/generated/TypeArg/TypeArg_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/TypeBound/TypeBound.ql linguist-generated
 /test/extractor-tests/generated/TypeBound/TypeBound_getGenericParamList.ql linguist-generated
 /test/extractor-tests/generated/TypeBound/TypeBound_getLifetime.ql linguist-generated
-/test/extractor-tests/generated/TypeBound/TypeBound_getTy.ql linguist-generated
+/test/extractor-tests/generated/TypeBound/TypeBound_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/TypeBoundList/TypeBoundList.ql linguist-generated
 /test/extractor-tests/generated/TypeBoundList/TypeBoundList_getBound.ql linguist-generated
 /test/extractor-tests/generated/TypeParam/TypeParam.ql linguist-generated
@@ -1131,7 +1113,9 @@
 /test/extractor-tests/generated/UseTreeList/UseTreeList_getUseTree.ql linguist-generated
 /test/extractor-tests/generated/Variant/Variant.ql linguist-generated
 /test/extractor-tests/generated/Variant/Variant_getAttr.ql linguist-generated
+/test/extractor-tests/generated/Variant/Variant_getCrateOrigin.ql linguist-generated
 /test/extractor-tests/generated/Variant/Variant_getExpr.ql linguist-generated
+/test/extractor-tests/generated/Variant/Variant_getExtendedCanonicalPath.ql linguist-generated
 /test/extractor-tests/generated/Variant/Variant_getFieldList.ql linguist-generated
 /test/extractor-tests/generated/Variant/Variant_getName.ql linguist-generated
 /test/extractor-tests/generated/Variant/Variant_getVisibility.ql linguist-generated
@@ -1144,8 +1128,8 @@
 /test/extractor-tests/generated/WherePred/WherePred.ql linguist-generated
 /test/extractor-tests/generated/WherePred/WherePred_getGenericParamList.ql linguist-generated
 /test/extractor-tests/generated/WherePred/WherePred_getLifetime.ql linguist-generated
-/test/extractor-tests/generated/WherePred/WherePred_getTy.ql linguist-generated
 /test/extractor-tests/generated/WherePred/WherePred_getTypeBoundList.ql linguist-generated
+/test/extractor-tests/generated/WherePred/WherePred_getTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/WhileExpr/WhileExpr.ql linguist-generated
 /test/extractor-tests/generated/WhileExpr/WhileExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/WhileExpr/WhileExpr_getCondition.ql linguist-generated
diff --git a/rust/ql/consistency-queries/DataFlowConsistency.ql b/rust/ql/consistency-queries/DataFlowConsistency.ql
index 3513121f260..ed50c3876aa 100644
--- a/rust/ql/consistency-queries/DataFlowConsistency.ql
+++ b/rust/ql/consistency-queries/DataFlowConsistency.ql
@@ -5,12 +5,4 @@
  * @id rust/diagnostics/data-flow-consistency
  */
 
-import codeql.rust.dataflow.DataFlow::DataFlow as DataFlow
-private import rust
-private import codeql.rust.dataflow.internal.DataFlowImpl
-private import codeql.rust.dataflow.internal.TaintTrackingImpl
-private import codeql.dataflow.internal.DataFlowImplConsistency
-
-private module Input implements InputSig<Location, RustDataFlow> { }
-
-import MakeConsistency<Location, RustDataFlow, RustTaintTracking, Input>
+import codeql.rust.dataflow.internal.DataFlowConsistency
diff --git a/rust/ql/integration-tests/conftest.py b/rust/ql/integration-tests/conftest.py
index 08b17f106f8..a1fbcf4e18d 100644
--- a/rust/ql/integration-tests/conftest.py
+++ b/rust/ql/integration-tests/conftest.py
@@ -1,15 +1,34 @@
 import pytest
-import shutil
-
-class _Manifests:
-    def __init__(self, cwd):
-        self.dir = cwd / "manifests"
-
-    def select(self, name: str):
-        (self.dir / name).rename(name)
-        shutil.rmtree(self.dir)
+import json
+import commands
+import pathlib
 
 
 @pytest.fixture
-def manifests(cwd):
-    return _Manifests(cwd)
+def cargo(cwd):
+    assert (cwd / "Cargo.toml").exists()
+    (cwd / "rust-project.json").unlink(missing_ok=True)
+
+@pytest.fixture(scope="session")
+def rust_sysroot_src() -> str:
+    rust_sysroot = pathlib.Path(commands.run("rustc --print sysroot", _capture=True))
+    ret = rust_sysroot.joinpath("lib", "rustlib", "src", "rust", "library")
+    assert ret.exists()
+    return str(ret)
+
+@pytest.fixture
+def rust_project(cwd, rust_sysroot_src):
+    project_file = cwd / "rust-project.json"
+    assert project_file.exists()
+    project = json.loads(project_file.read_text())
+    project["sysroot_src"] = rust_sysroot_src
+    project_file.write_text(json.dumps(project, indent=4))
+    (cwd / "Cargo.toml").unlink(missing_ok=True)
+
+@pytest.fixture
+def rust_check_diagnostics(check_diagnostics):
+    check_diagnostics.redact += [
+        "attributes.durations.*.ms",
+        "attributes.durations.*.pretty",
+    ]
+    return check_diagnostics
diff --git a/rust/ql/integration-tests/hello-project/manifests/Cargo.toml b/rust/ql/integration-tests/hello-project/Cargo.toml
similarity index 100%
rename from rust/ql/integration-tests/hello-project/manifests/Cargo.toml
rename to rust/ql/integration-tests/hello-project/Cargo.toml
diff --git a/rust/ql/test/extractor-tests/generated/ArrayType/ArrayType.expected b/rust/ql/integration-tests/hello-project/ExtractionErrors.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/ArrayType/ArrayType.expected
rename to rust/ql/integration-tests/hello-project/ExtractionErrors.expected
diff --git a/rust/ql/integration-tests/hello-project/ExtractionErrors.qlref b/rust/ql/integration-tests/hello-project/ExtractionErrors.qlref
new file mode 100644
index 00000000000..ba4f854d6a1
--- /dev/null
+++ b/rust/ql/integration-tests/hello-project/ExtractionErrors.qlref
@@ -0,0 +1 @@
+queries/diagnostics/ExtractionErrors.ql
diff --git a/rust/ql/integration-tests/hello-project/ExtractionWarnings.expected b/rust/ql/integration-tests/hello-project/ExtractionWarnings.expected
new file mode 100644
index 00000000000..ef3e107fa76
--- /dev/null
+++ b/rust/ql/integration-tests/hello-project/ExtractionWarnings.expected
@@ -0,0 +1 @@
+| src/directory_module/not_loaded.rs:1:1:1:1 | semantic analyzer unavailable (not included as a module) | Extraction warning in src/directory_module/not_loaded.rs with message semantic analyzer unavailable (not included as a module) | 1 |
diff --git a/rust/ql/integration-tests/hello-project/ExtractionWarnings.qlref b/rust/ql/integration-tests/hello-project/ExtractionWarnings.qlref
new file mode 100644
index 00000000000..ff6e566d20a
--- /dev/null
+++ b/rust/ql/integration-tests/hello-project/ExtractionWarnings.qlref
@@ -0,0 +1 @@
+queries/diagnostics/ExtractionWarnings.ql
diff --git a/rust/ql/integration-tests/hello-project/diagnostics.expected b/rust/ql/integration-tests/hello-project/diagnostics.expected
new file mode 100644
index 00000000000..f938b5b8ab5
--- /dev/null
+++ b/rust/ql/integration-tests/hello-project/diagnostics.expected
@@ -0,0 +1,39 @@
+{
+  "attributes": {
+    "durations": {
+      "extract": {
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
+      },
+      "loadManifest": {
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
+      },
+      "loadSource": {
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
+      },
+      "parse": {
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
+      },
+      "total": {
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
+      }
+    },
+    "numberOfFiles": 5,
+    "numberOfManifests": 1
+  },
+  "severity": "note",
+  "source": {
+    "extractorName": "rust",
+    "id": "rust/extractor/telemetry",
+    "name": "telemetry"
+  },
+  "visibility": {
+    "cliSummaryTable": false,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
diff --git a/rust/ql/integration-tests/hello-project/functions.expected b/rust/ql/integration-tests/hello-project/functions.expected
index fc49564084e..2665ea7df76 100644
--- a/rust/ql/integration-tests/hello-project/functions.expected
+++ b/rust/ql/integration-tests/hello-project/functions.expected
@@ -1 +1 @@
-| src/main.rs:4:1:6:1 | main |
+| src/main.rs:4:1:6:1 | fn main |
diff --git a/rust/ql/integration-tests/hello-project/manifests/rust-project.json b/rust/ql/integration-tests/hello-project/rust-project.json
similarity index 63%
rename from rust/ql/integration-tests/hello-project/manifests/rust-project.json
rename to rust/ql/integration-tests/hello-project/rust-project.json
index 03d9a5ce2c0..b111bca9c73 100644
--- a/rust/ql/integration-tests/hello-project/manifests/rust-project.json
+++ b/rust/ql/integration-tests/hello-project/rust-project.json
@@ -1,4 +1,5 @@
 {
+  "sysroot_src": "filled by the rust_project fixture",
   "crates": [{
     "root_module": "src/main.rs",
     "edition": "2021",
diff --git a/rust/ql/integration-tests/hello-project/steps.cargo.expected b/rust/ql/integration-tests/hello-project/steps.cargo.expected
new file mode 100644
index 00000000000..61987aa564b
--- /dev/null
+++ b/rust/ql/integration-tests/hello-project/steps.cargo.expected
@@ -0,0 +1,15 @@
+| Cargo.toml:0:0:0:0 | LoadManifest(Cargo.toml) |
+| src/directory_module/mod.rs:0:0:0:0 | Extract(src/directory_module/mod.rs) |
+| src/directory_module/mod.rs:0:0:0:0 | LoadSource(src/directory_module/mod.rs) |
+| src/directory_module/mod.rs:0:0:0:0 | Parse(src/directory_module/mod.rs) |
+| src/directory_module/nested_module.rs:0:0:0:0 | Extract(src/directory_module/nested_module.rs) |
+| src/directory_module/nested_module.rs:0:0:0:0 | LoadSource(src/directory_module/nested_module.rs) |
+| src/directory_module/nested_module.rs:0:0:0:0 | Parse(src/directory_module/nested_module.rs) |
+| src/directory_module/not_loaded.rs:0:0:0:0 | Extract(src/directory_module/not_loaded.rs) |
+| src/directory_module/not_loaded.rs:0:0:0:0 | Parse(src/directory_module/not_loaded.rs) |
+| src/file_module.rs:0:0:0:0 | Extract(src/file_module.rs) |
+| src/file_module.rs:0:0:0:0 | LoadSource(src/file_module.rs) |
+| src/file_module.rs:0:0:0:0 | Parse(src/file_module.rs) |
+| src/main.rs:0:0:0:0 | Extract(src/main.rs) |
+| src/main.rs:0:0:0:0 | LoadSource(src/main.rs) |
+| src/main.rs:0:0:0:0 | Parse(src/main.rs) |
diff --git a/rust/ql/integration-tests/hello-project/steps.ql b/rust/ql/integration-tests/hello-project/steps.ql
new file mode 100644
index 00000000000..17358a1c100
--- /dev/null
+++ b/rust/ql/integration-tests/hello-project/steps.ql
@@ -0,0 +1,4 @@
+import codeql.rust.elements.internal.ExtractorStep
+
+from ExtractorStep step
+select step
diff --git a/rust/ql/integration-tests/hello-project/steps.rust-project.expected b/rust/ql/integration-tests/hello-project/steps.rust-project.expected
new file mode 100644
index 00000000000..d1d2e9ddee3
--- /dev/null
+++ b/rust/ql/integration-tests/hello-project/steps.rust-project.expected
@@ -0,0 +1,15 @@
+| rust-project.json:0:0:0:0 | LoadManifest(rust-project.json) |
+| src/directory_module/mod.rs:0:0:0:0 | Extract(src/directory_module/mod.rs) |
+| src/directory_module/mod.rs:0:0:0:0 | LoadSource(src/directory_module/mod.rs) |
+| src/directory_module/mod.rs:0:0:0:0 | Parse(src/directory_module/mod.rs) |
+| src/directory_module/nested_module.rs:0:0:0:0 | Extract(src/directory_module/nested_module.rs) |
+| src/directory_module/nested_module.rs:0:0:0:0 | LoadSource(src/directory_module/nested_module.rs) |
+| src/directory_module/nested_module.rs:0:0:0:0 | Parse(src/directory_module/nested_module.rs) |
+| src/directory_module/not_loaded.rs:0:0:0:0 | Extract(src/directory_module/not_loaded.rs) |
+| src/directory_module/not_loaded.rs:0:0:0:0 | Parse(src/directory_module/not_loaded.rs) |
+| src/file_module.rs:0:0:0:0 | Extract(src/file_module.rs) |
+| src/file_module.rs:0:0:0:0 | LoadSource(src/file_module.rs) |
+| src/file_module.rs:0:0:0:0 | Parse(src/file_module.rs) |
+| src/main.rs:0:0:0:0 | Extract(src/main.rs) |
+| src/main.rs:0:0:0:0 | LoadSource(src/main.rs) |
+| src/main.rs:0:0:0:0 | Parse(src/main.rs) |
diff --git a/rust/ql/integration-tests/hello-project/summary.expected b/rust/ql/integration-tests/hello-project/summary.expected
new file mode 100644
index 00000000000..44c14e790fe
--- /dev/null
+++ b/rust/ql/integration-tests/hello-project/summary.expected
@@ -0,0 +1,17 @@
+| Elements extracted | 65 |
+| Elements unextracted | 0 |
+| Extraction errors | 0 |
+| Extraction warnings | 1 |
+| Files extracted - total | 5 |
+| Files extracted - with errors | 1 |
+| Files extracted - without errors | 4 |
+| Inconsistencies - AST | 0 |
+| Inconsistencies - CFG | 0 |
+| Inconsistencies - data flow | 0 |
+| Lines of code extracted | 6 |
+| Lines of user code extracted | 6 |
+| Macro calls - resolved | 2 |
+| Macro calls - total | 2 |
+| Macro calls - unresolved | 0 |
+| Taint sources - active | 0 |
+| Taint sources - total | 0 |
diff --git a/rust/ql/integration-tests/hello-project/summary.qlref b/rust/ql/integration-tests/hello-project/summary.qlref
new file mode 100644
index 00000000000..b94ba40446a
--- /dev/null
+++ b/rust/ql/integration-tests/hello-project/summary.qlref
@@ -0,0 +1 @@
+queries/summary/SummaryStats.ql
diff --git a/rust/ql/integration-tests/hello-project/test_project.py b/rust/ql/integration-tests/hello-project/test_project.py
index d03c4f67e26..c52002d0b22 100644
--- a/rust/ql/integration-tests/hello-project/test_project.py
+++ b/rust/ql/integration-tests/hello-project/test_project.py
@@ -1,7 +1,10 @@
-def test_cargo(codeql, rust, manifests, check_source_archive):
-    manifests.select("Cargo.toml")
+import pytest
+
+
+@pytest.mark.ql_test("steps.ql", expected=".cargo.expected")
+def test_cargo(codeql, rust, cargo, check_source_archive, rust_check_diagnostics):
     codeql.database.create()
 
-def test_rust_project(codeql, rust, manifests, check_source_archive):
-    manifests.select("rust-project.json")
+@pytest.mark.ql_test("steps.ql", expected=".rust-project.expected")
+def test_rust_project(codeql, rust, rust_project, check_source_archive, rust_check_diagnostics):
     codeql.database.create()
diff --git a/rust/ql/integration-tests/hello-workspace/manifests/Cargo.toml b/rust/ql/integration-tests/hello-workspace/Cargo.toml
similarity index 100%
rename from rust/ql/integration-tests/hello-workspace/manifests/Cargo.toml
rename to rust/ql/integration-tests/hello-workspace/Cargo.toml
diff --git a/rust/ql/test/extractor-tests/generated/ArrayType/ArrayType_getConstArg.expected b/rust/ql/integration-tests/hello-workspace/ExtractionErrors.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/ArrayType/ArrayType_getConstArg.expected
rename to rust/ql/integration-tests/hello-workspace/ExtractionErrors.expected
diff --git a/rust/ql/integration-tests/hello-workspace/ExtractionErrors.qlref b/rust/ql/integration-tests/hello-workspace/ExtractionErrors.qlref
new file mode 100644
index 00000000000..ba4f854d6a1
--- /dev/null
+++ b/rust/ql/integration-tests/hello-workspace/ExtractionErrors.qlref
@@ -0,0 +1 @@
+queries/diagnostics/ExtractionErrors.ql
diff --git a/rust/ql/test/extractor-tests/generated/ArrayType/ArrayType_getTy.expected b/rust/ql/integration-tests/hello-workspace/ExtractionWarnings.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/ArrayType/ArrayType_getTy.expected
rename to rust/ql/integration-tests/hello-workspace/ExtractionWarnings.expected
diff --git a/rust/ql/integration-tests/hello-workspace/ExtractionWarnings.qlref b/rust/ql/integration-tests/hello-workspace/ExtractionWarnings.qlref
new file mode 100644
index 00000000000..ff6e566d20a
--- /dev/null
+++ b/rust/ql/integration-tests/hello-workspace/ExtractionWarnings.qlref
@@ -0,0 +1 @@
+queries/diagnostics/ExtractionWarnings.ql
diff --git a/rust/ql/integration-tests/hello-workspace/diagnostics.cargo.expected b/rust/ql/integration-tests/hello-workspace/diagnostics.cargo.expected
new file mode 100644
index 00000000000..7d44256db5a
--- /dev/null
+++ b/rust/ql/integration-tests/hello-workspace/diagnostics.cargo.expected
@@ -0,0 +1,39 @@
+{
+  "attributes": {
+    "durations": {
+      "extract": {
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
+      },
+      "loadManifest": {
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
+      },
+      "loadSource": {
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
+      },
+      "parse": {
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
+      },
+      "total": {
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
+      }
+    },
+    "numberOfFiles": 4,
+    "numberOfManifests": 2
+  },
+  "severity": "note",
+  "source": {
+    "extractorName": "rust",
+    "id": "rust/extractor/telemetry",
+    "name": "telemetry"
+  },
+  "visibility": {
+    "cliSummaryTable": false,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
diff --git a/rust/ql/integration-tests/hello-workspace/diagnostics.rust-project.expected b/rust/ql/integration-tests/hello-workspace/diagnostics.rust-project.expected
new file mode 100644
index 00000000000..4c5dbc75d84
--- /dev/null
+++ b/rust/ql/integration-tests/hello-workspace/diagnostics.rust-project.expected
@@ -0,0 +1,39 @@
+{
+  "attributes": {
+    "durations": {
+      "extract": {
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
+      },
+      "loadManifest": {
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
+      },
+      "loadSource": {
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
+      },
+      "parse": {
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
+      },
+      "total": {
+        "ms": "__REDACTED__",
+        "pretty": "__REDACTED__"
+      }
+    },
+    "numberOfFiles": 4,
+    "numberOfManifests": 1
+  },
+  "severity": "note",
+  "source": {
+    "extractorName": "rust",
+    "id": "rust/extractor/telemetry",
+    "name": "telemetry"
+  },
+  "visibility": {
+    "cliSummaryTable": false,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
diff --git a/rust/ql/integration-tests/hello-workspace/functions.expected b/rust/ql/integration-tests/hello-workspace/functions.expected
index 0ec9937972e..0633774edf7 100644
--- a/rust/ql/integration-tests/hello-workspace/functions.expected
+++ b/rust/ql/integration-tests/hello-workspace/functions.expected
@@ -1,2 +1,2 @@
-| exe/src/main.rs:5:1:7:1 | main |
-| lib/src/a_module/mod.rs:1:1:3:1 | hello |
+| exe/src/main.rs:5:1:7:1 | fn main |
+| lib/src/a_module/mod.rs:1:1:3:1 | fn hello |
diff --git a/rust/ql/integration-tests/hello-workspace/manifests/rust-project.json b/rust/ql/integration-tests/hello-workspace/rust-project.json
similarity index 81%
rename from rust/ql/integration-tests/hello-workspace/manifests/rust-project.json
rename to rust/ql/integration-tests/hello-workspace/rust-project.json
index 38e16980196..c8461b098bd 100644
--- a/rust/ql/integration-tests/hello-workspace/manifests/rust-project.json
+++ b/rust/ql/integration-tests/hello-workspace/rust-project.json
@@ -1,4 +1,5 @@
 {
+  "sysroot_src": "filled by the rust_project fixture",
   "crates": [
     {
       "root_module": "exe/src/main.rs",
diff --git a/rust/ql/integration-tests/hello-workspace/steps.cargo.expected b/rust/ql/integration-tests/hello-workspace/steps.cargo.expected
new file mode 100644
index 00000000000..138bd77b690
--- /dev/null
+++ b/rust/ql/integration-tests/hello-workspace/steps.cargo.expected
@@ -0,0 +1,14 @@
+| exe/Cargo.toml:0:0:0:0 | LoadManifest(exe/Cargo.toml) |
+| exe/src/a_module.rs:0:0:0:0 | Extract(exe/src/a_module.rs) |
+| exe/src/a_module.rs:0:0:0:0 | LoadSource(exe/src/a_module.rs) |
+| exe/src/a_module.rs:0:0:0:0 | Parse(exe/src/a_module.rs) |
+| exe/src/main.rs:0:0:0:0 | Extract(exe/src/main.rs) |
+| exe/src/main.rs:0:0:0:0 | LoadSource(exe/src/main.rs) |
+| exe/src/main.rs:0:0:0:0 | Parse(exe/src/main.rs) |
+| lib/Cargo.toml:0:0:0:0 | LoadManifest(lib/Cargo.toml) |
+| lib/src/a_module/mod.rs:0:0:0:0 | Extract(lib/src/a_module/mod.rs) |
+| lib/src/a_module/mod.rs:0:0:0:0 | LoadSource(lib/src/a_module/mod.rs) |
+| lib/src/a_module/mod.rs:0:0:0:0 | Parse(lib/src/a_module/mod.rs) |
+| lib/src/lib.rs:0:0:0:0 | Extract(lib/src/lib.rs) |
+| lib/src/lib.rs:0:0:0:0 | LoadSource(lib/src/lib.rs) |
+| lib/src/lib.rs:0:0:0:0 | Parse(lib/src/lib.rs) |
diff --git a/rust/ql/integration-tests/hello-workspace/steps.ql b/rust/ql/integration-tests/hello-workspace/steps.ql
new file mode 100644
index 00000000000..17358a1c100
--- /dev/null
+++ b/rust/ql/integration-tests/hello-workspace/steps.ql
@@ -0,0 +1,4 @@
+import codeql.rust.elements.internal.ExtractorStep
+
+from ExtractorStep step
+select step
diff --git a/rust/ql/integration-tests/hello-workspace/steps.rust-project.expected b/rust/ql/integration-tests/hello-workspace/steps.rust-project.expected
new file mode 100644
index 00000000000..09620925ce9
--- /dev/null
+++ b/rust/ql/integration-tests/hello-workspace/steps.rust-project.expected
@@ -0,0 +1,13 @@
+| exe/src/a_module.rs:0:0:0:0 | Extract(exe/src/a_module.rs) |
+| exe/src/a_module.rs:0:0:0:0 | LoadSource(exe/src/a_module.rs) |
+| exe/src/a_module.rs:0:0:0:0 | Parse(exe/src/a_module.rs) |
+| exe/src/main.rs:0:0:0:0 | Extract(exe/src/main.rs) |
+| exe/src/main.rs:0:0:0:0 | LoadSource(exe/src/main.rs) |
+| exe/src/main.rs:0:0:0:0 | Parse(exe/src/main.rs) |
+| lib/src/a_module/mod.rs:0:0:0:0 | Extract(lib/src/a_module/mod.rs) |
+| lib/src/a_module/mod.rs:0:0:0:0 | LoadSource(lib/src/a_module/mod.rs) |
+| lib/src/a_module/mod.rs:0:0:0:0 | Parse(lib/src/a_module/mod.rs) |
+| lib/src/lib.rs:0:0:0:0 | Extract(lib/src/lib.rs) |
+| lib/src/lib.rs:0:0:0:0 | LoadSource(lib/src/lib.rs) |
+| lib/src/lib.rs:0:0:0:0 | Parse(lib/src/lib.rs) |
+| rust-project.json:0:0:0:0 | LoadManifest(rust-project.json) |
diff --git a/rust/ql/integration-tests/hello-workspace/summary.cargo.expected b/rust/ql/integration-tests/hello-workspace/summary.cargo.expected
new file mode 100644
index 00000000000..ec1abea6252
--- /dev/null
+++ b/rust/ql/integration-tests/hello-workspace/summary.cargo.expected
@@ -0,0 +1,17 @@
+| Elements extracted | 86 |
+| Elements unextracted | 0 |
+| Extraction errors | 0 |
+| Extraction warnings | 0 |
+| Files extracted - total | 4 |
+| Files extracted - with errors | 0 |
+| Files extracted - without errors | 4 |
+| Inconsistencies - AST | 0 |
+| Inconsistencies - CFG | 0 |
+| Inconsistencies - data flow | 0 |
+| Lines of code extracted | 9 |
+| Lines of user code extracted | 9 |
+| Macro calls - resolved | 2 |
+| Macro calls - total | 2 |
+| Macro calls - unresolved | 0 |
+| Taint sources - active | 0 |
+| Taint sources - total | 0 |
diff --git a/rust/ql/integration-tests/hello-workspace/summary.qlref b/rust/ql/integration-tests/hello-workspace/summary.qlref
new file mode 100644
index 00000000000..b94ba40446a
--- /dev/null
+++ b/rust/ql/integration-tests/hello-workspace/summary.qlref
@@ -0,0 +1 @@
+queries/summary/SummaryStats.ql
diff --git a/rust/ql/integration-tests/hello-workspace/summary.rust-project.expected b/rust/ql/integration-tests/hello-workspace/summary.rust-project.expected
new file mode 100644
index 00000000000..5ca38e5a90c
--- /dev/null
+++ b/rust/ql/integration-tests/hello-workspace/summary.rust-project.expected
@@ -0,0 +1,17 @@
+| Elements extracted | 85 |
+| Elements unextracted | 0 |
+| Extraction errors | 0 |
+| Extraction warnings | 0 |
+| Files extracted - total | 4 |
+| Files extracted - with errors | 0 |
+| Files extracted - without errors | 4 |
+| Inconsistencies - AST | 0 |
+| Inconsistencies - CFG | 0 |
+| Inconsistencies - data flow | 0 |
+| Lines of code extracted | 9 |
+| Lines of user code extracted | 9 |
+| Macro calls - resolved | 2 |
+| Macro calls - total | 2 |
+| Macro calls - unresolved | 0 |
+| Taint sources - active | 0 |
+| Taint sources - total | 0 |
diff --git a/rust/ql/integration-tests/hello-workspace/test_workspace.py b/rust/ql/integration-tests/hello-workspace/test_workspace.py
index f3503e7cefa..fe8dbc69141 100644
--- a/rust/ql/integration-tests/hello-workspace/test_workspace.py
+++ b/rust/ql/integration-tests/hello-workspace/test_workspace.py
@@ -1,12 +1,14 @@
 import pytest
 
-# currently the DB-check fails on actions because of loading files multiple times and assiging multiple locations
-# see https://github.com/github/codeql-team/issues/3365
-@pytest.mark.ql_test("DB-CHECK", xfail="maybe")
-def test_cargo(codeql, rust, manifests, check_source_archive):
-    manifests.select("Cargo.toml")
+
+@pytest.mark.ql_test("steps.ql", expected=".cargo.expected")
+@pytest.mark.ql_test("summary.qlref", expected=".cargo.expected")
+def test_cargo(codeql, rust, cargo, check_source_archive, rust_check_diagnostics):
+    rust_check_diagnostics.expected_suffix = ".cargo.expected"
     codeql.database.create()
 
-def test_rust_project(codeql, rust, manifests, check_source_archive):
-    manifests.select("rust-project.json")
+@pytest.mark.ql_test("steps.ql", expected=".rust-project.expected")
+@pytest.mark.ql_test("summary.qlref", expected=".rust-project.expected")
+def test_rust_project(codeql, rust, rust_project, check_source_archive, rust_check_diagnostics):
+    rust_check_diagnostics.expected_suffix = ".rust-project.expected"
     codeql.database.create()
diff --git a/rust/ql/integration-tests/options/cfg/functions.expected b/rust/ql/integration-tests/options/cfg/functions.expected
index a2042c5e4c4..cd022ca510e 100644
--- a/rust/ql/integration-tests/options/cfg/functions.expected
+++ b/rust/ql/integration-tests/options/cfg/functions.expected
@@ -1,3 +1,3 @@
-| src/lib.rs:7:1:8:19 | cfg_no_flag |
-| src/lib.rs:10:1:11:18 | cfg_no_key |
-| src/lib.rs:16:1:17:24 | pointer_width_64 |
+| src/lib.rs:7:1:8:19 | fn cfg_no_flag |
+| src/lib.rs:10:1:11:18 | fn cfg_no_key |
+| src/lib.rs:16:1:17:24 | fn pointer_width_64 |
diff --git a/rust/ql/integration-tests/options/cfg/functions.override.expected b/rust/ql/integration-tests/options/cfg/functions.override.expected
index 4a19db56a74..34feddaf149 100644
--- a/rust/ql/integration-tests/options/cfg/functions.override.expected
+++ b/rust/ql/integration-tests/options/cfg/functions.override.expected
@@ -1,4 +1,4 @@
-| src/lib.rs:1:1:2:16 | cfg_flag |
-| src/lib.rs:4:1:5:15 | cfg_key |
-| src/lib.rs:13:1:14:12 | test |
-| src/lib.rs:19:1:20:24 | pointer_width_32 |
+| src/lib.rs:1:1:2:16 | fn cfg_flag |
+| src/lib.rs:4:1:5:15 | fn cfg_key |
+| src/lib.rs:13:1:14:12 | fn test |
+| src/lib.rs:19:1:20:24 | fn pointer_width_32 |
diff --git a/rust/ql/integration-tests/options/features/functions.all.expected b/rust/ql/integration-tests/options/features/functions.all.expected
index 5ce4cae2ab0..1fa14be6da6 100644
--- a/rust/ql/integration-tests/options/features/functions.all.expected
+++ b/rust/ql/integration-tests/options/features/functions.all.expected
@@ -1,3 +1,3 @@
-| src/lib.rs:1:1:2:11 | foo |
-| src/lib.rs:4:1:5:11 | bar |
-| src/lib.rs:7:1:7:14 | always |
+| src/lib.rs:1:1:2:11 | fn foo |
+| src/lib.rs:4:1:5:11 | fn bar |
+| src/lib.rs:7:1:7:14 | fn always |
diff --git a/rust/ql/integration-tests/options/features/functions.bar.expected b/rust/ql/integration-tests/options/features/functions.bar.expected
index cad441d6749..fae918e493a 100644
--- a/rust/ql/integration-tests/options/features/functions.bar.expected
+++ b/rust/ql/integration-tests/options/features/functions.bar.expected
@@ -1,2 +1,2 @@
-| src/lib.rs:4:1:5:11 | bar |
-| src/lib.rs:7:1:7:14 | always |
+| src/lib.rs:4:1:5:11 | fn bar |
+| src/lib.rs:7:1:7:14 | fn always |
diff --git a/rust/ql/integration-tests/options/features/functions.expected b/rust/ql/integration-tests/options/features/functions.expected
index 523c2187688..d095a8993d8 100644
--- a/rust/ql/integration-tests/options/features/functions.expected
+++ b/rust/ql/integration-tests/options/features/functions.expected
@@ -1 +1 @@
-| src/lib.rs:7:1:7:14 | always |
+| src/lib.rs:7:1:7:14 | fn always |
diff --git a/rust/ql/integration-tests/options/features/functions.foo.expected b/rust/ql/integration-tests/options/features/functions.foo.expected
index b7875423083..3768144364f 100644
--- a/rust/ql/integration-tests/options/features/functions.foo.expected
+++ b/rust/ql/integration-tests/options/features/functions.foo.expected
@@ -1,2 +1,2 @@
-| src/lib.rs:1:1:2:11 | foo |
-| src/lib.rs:7:1:7:14 | always |
+| src/lib.rs:1:1:2:11 | fn foo |
+| src/lib.rs:7:1:7:14 | fn always |
diff --git a/rust/ql/integration-tests/options/target/functions.Darwin.expected b/rust/ql/integration-tests/options/target/functions.Darwin.expected
index 217974bb7c6..8b879e8ca7c 100644
--- a/rust/ql/integration-tests/options/target/functions.Darwin.expected
+++ b/rust/ql/integration-tests/options/target/functions.Darwin.expected
@@ -1 +1 @@
-| src/lib.rs:7:1:8:13 | macos |
+| src/lib.rs:7:1:8:13 | fn macos |
diff --git a/rust/ql/integration-tests/options/target/functions.Linux.expected b/rust/ql/integration-tests/options/target/functions.Linux.expected
index 57662579f1f..2e023fb887c 100644
--- a/rust/ql/integration-tests/options/target/functions.Linux.expected
+++ b/rust/ql/integration-tests/options/target/functions.Linux.expected
@@ -1 +1 @@
-| src/lib.rs:1:1:2:13 | linux |
+| src/lib.rs:1:1:2:13 | fn linux |
diff --git a/rust/ql/integration-tests/options/target/functions.Windows.expected b/rust/ql/integration-tests/options/target/functions.Windows.expected
index 8ae2d8c86cc..170a6e62e80 100644
--- a/rust/ql/integration-tests/options/target/functions.Windows.expected
+++ b/rust/ql/integration-tests/options/target/functions.Windows.expected
@@ -1 +1 @@
-| src/lib.rs:4:1:5:15 | windows |
+| src/lib.rs:4:1:5:15 | fn windows |
diff --git a/rust/ql/integration-tests/qltest/dependencies/functions.expected b/rust/ql/integration-tests/qltest/dependencies/functions.expected
deleted file mode 100644
index c062595f923..00000000000
--- a/rust/ql/integration-tests/qltest/dependencies/functions.expected
+++ /dev/null
@@ -1 +0,0 @@
-| test.rs:4:1:7:1 | foo |
diff --git a/rust/ql/integration-tests/qltest/dependencies/functions.nested.expected b/rust/ql/integration-tests/qltest/dependencies/functions.nested.expected
new file mode 100644
index 00000000000..9ee4b080b97
--- /dev/null
+++ b/rust/ql/integration-tests/qltest/dependencies/functions.nested.expected
@@ -0,0 +1 @@
+| test.rs:4:1:7:1 | fn foo |
diff --git a/rust/ql/integration-tests/qltest/lib/functions.expected b/rust/ql/integration-tests/qltest/lib/functions.expected
deleted file mode 100644
index 613d53954dc..00000000000
--- a/rust/ql/integration-tests/qltest/lib/functions.expected
+++ /dev/null
@@ -1 +0,0 @@
-| test.rs:1:1:1:11 | foo |
diff --git a/rust/ql/integration-tests/qltest/lib/functions.nested.expected b/rust/ql/integration-tests/qltest/lib/functions.nested.expected
new file mode 100644
index 00000000000..74d1d680dae
--- /dev/null
+++ b/rust/ql/integration-tests/qltest/lib/functions.nested.expected
@@ -0,0 +1 @@
+| test.rs:1:1:1:11 | fn foo |
diff --git a/rust/ql/integration-tests/qltest/main/functions.expected b/rust/ql/integration-tests/qltest/main/functions.expected
deleted file mode 100644
index 9d363103419..00000000000
--- a/rust/ql/integration-tests/qltest/main/functions.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| main.rs:1:1:1:12 | main |
-| test.rs:1:1:1:11 | foo |
diff --git a/rust/ql/integration-tests/qltest/main/functions.nested.expected b/rust/ql/integration-tests/qltest/main/functions.nested.expected
new file mode 100644
index 00000000000..fc9c578919c
--- /dev/null
+++ b/rust/ql/integration-tests/qltest/main/functions.nested.expected
@@ -0,0 +1,2 @@
+| main.rs:1:1:1:12 | fn main |
+| test.rs:1:1:1:11 | fn foo |
diff --git a/rust/ql/integration-tests/qltest/test.py b/rust/ql/integration-tests/qltest/test_qltest.py
similarity index 84%
rename from rust/ql/integration-tests/qltest/test.py
rename to rust/ql/integration-tests/qltest/test_qltest.py
index e488dee2571..edd62bf600e 100644
--- a/rust/ql/integration-tests/qltest/test.py
+++ b/rust/ql/integration-tests/qltest/test_qltest.py
@@ -11,10 +11,12 @@ def default_options(codeql):
         threads = 1,
         show_extractor_output = True,
         check_databases = False,
+        learn = True,
     )
 
 @pytest.mark.parametrize("dir", ["lib", "main", "dependencies"])
-def test(codeql, rust, dir):
+def test(codeql, rust, expected_files, dir):
+    expected_files.add(f"{dir}/functions.expected", expected=".nested.expected")
     codeql.test.run(dir)
 
 def test_failing_cargo_check(codeql, rust):
diff --git a/rust/ql/lib/codeql/files/FileSystem.qll b/rust/ql/lib/codeql/files/FileSystem.qll
index 7136dcc3b5a..b13793b3600 100644
--- a/rust/ql/lib/codeql/files/FileSystem.qll
+++ b/rust/ql/lib/codeql/files/FileSystem.qll
@@ -6,6 +6,7 @@ private import codeql.rust.elements.SourceFile
 private import codeql.rust.elements.AstNode
 private import codeql.rust.elements.Comment
 private import codeql.rust.Diagnostics
+private import codeql.rust.elements.internal.ExtractorStep
 
 private module Input implements InputSig {
   abstract class ContainerBase extends @container {
@@ -36,7 +37,9 @@ class Folder = Impl::Folder;
 /** A file. */
 class File extends Container, Impl::File {
   /** Holds if this file was extracted from ordinary source code. */
-  predicate fromSource() { any() }
+  predicate fromSource() {
+    exists(ExtractorStep s | s.getAction() = "Extract" and s.getFile() = this)
+  }
 
   /**
    * Gets the number of lines containing code in this file. This value
@@ -58,11 +61,20 @@ class File extends Container, Impl::File {
   }
 }
 
+/**
+ * A source file that was extracted.
+ *
+ * TODO: rename `SourceFile` from the generated AST to give that name to this class.
+ */
+class ExtractedFile extends File {
+  ExtractedFile() { this.fromSource() }
+}
+
 /**
  * A successfully extracted file, that is, a file that was extracted and
  * contains no extraction errors or warnings.
  */
-class SuccessfullyExtractedFile extends File {
+class SuccessfullyExtractedFile extends ExtractedFile {
   SuccessfullyExtractedFile() {
     not exists(Diagnostic d |
       d.getLocation().getFile() = this and
diff --git a/rust/ql/lib/codeql/rust/AstConsistency.qll b/rust/ql/lib/codeql/rust/AstConsistency.qll
index dbb7f7216d7..2358bddb3b9 100644
--- a/rust/ql/lib/codeql/rust/AstConsistency.qll
+++ b/rust/ql/lib/codeql/rust/AstConsistency.qll
@@ -10,8 +10,9 @@ private predicate multipleToStrings(Element e) { strictcount(e.toString()) > 1 }
 /**
  * Holds if `e` has more than one `toString()` result.
  */
-query predicate multipleToStrings(Element e, string s) {
+query predicate multipleToStrings(Element e, string cls, string s) {
   multipleToStrings(e) and
+  cls = e.getPrimaryQlClasses() and
   s = strictconcat(e.toString(), ", ")
 }
 
@@ -20,6 +21,11 @@ query predicate multipleToStrings(Element e, string s) {
  */
 query predicate multipleLocations(Locatable e) { strictcount(e.getLocation()) > 1 }
 
+/**
+ * Holds if `e` does not have a `Location`.
+ */
+query predicate noLocation(Locatable e) { not exists(e.getLocation()) }
+
 private predicate multiplePrimaryQlClasses(Element e) {
   strictcount(string cls | cls = e.getAPrimaryQlClass() and cls != "VariableAccess") > 1
 }
@@ -39,9 +45,11 @@ private predicate multipleParents(Element child) { strictcount(getParent(child))
 /**
  * Holds if `child` has more than one AST parent.
  */
-query predicate multipleParents(Element child, Element parent) {
+query predicate multipleParents(Element child, string childClass, Element parent, string parentClass) {
   multipleParents(child) and
-  parent = getParent(child)
+  childClass = child.getPrimaryQlClasses() and
+  parent = getParent(child) and
+  parentClass = parent.getPrimaryQlClasses()
 }
 
 /**
@@ -55,6 +63,9 @@ int getAstInconsistencyCounts(string type) {
   type = "Multiple locations" and
   result = count(Element e | multipleLocations(e) | e)
   or
+  type = "No location" and
+  result = count(Element e | noLocation(e) | e)
+  or
   type = "Multiple primary QL classes" and
   result = count(Element e | multiplePrimaryQlClasses(e) | e)
   or
diff --git a/rust/ql/lib/codeql/rust/Concepts.qll b/rust/ql/lib/codeql/rust/Concepts.qll
new file mode 100644
index 00000000000..7e3ec0990ce
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/Concepts.qll
@@ -0,0 +1,174 @@
+/**
+ * Provides abstract classes representing generic concepts such as file system
+ * access or system command execution, for which individual framework libraries
+ * provide concrete subclasses.
+ */
+
+private import codeql.rust.dataflow.DataFlow
+private import codeql.threatmodels.ThreatModels
+private import codeql.rust.Frameworks
+
+/**
+ * A data flow source for a specific threat-model.
+ *
+ * Extend this class to refine existing API models. If you want to model new APIs,
+ * extend `ThreatModelSource::Range` instead.
+ */
+final class ThreatModelSource = ThreatModelSource::Range;
+
+/**
+ * Provides a class for modeling new sources for specific threat-models.
+ */
+module ThreatModelSource {
+  /**
+   * A data flow source, for a specific threat-model.
+   */
+  abstract class Range extends DataFlow::Node {
+    /**
+     * Gets a string that represents the source kind with respect to threat modeling.
+     *
+     * See
+     * - https://github.com/github/codeql/blob/main/docs/codeql/reusables/threat-model-description.rst
+     * - https://github.com/github/codeql/blob/main/shared/threat-models/ext/threat-model-grouping.model.yml
+     */
+    abstract string getThreatModel();
+
+    /**
+     * Gets a string that describes the type of this threat-model source.
+     */
+    abstract string getSourceType();
+  }
+}
+
+/**
+ * A data flow source that is enabled in the current threat model configuration.
+ */
+class ActiveThreatModelSource extends ThreatModelSource {
+  ActiveThreatModelSource() { currentThreatModel(this.getThreatModel()) }
+}
+
+/**
+ * A data flow source corresponding to the program's command line arguments or path.
+ */
+final class CommandLineArgsSource = CommandLineArgsSource::Range;
+
+/**
+ * Provides a class for modeling new sources for the program's command line arguments or path.
+ */
+module CommandLineArgsSource {
+  /**
+   * A data flow source corresponding to the program's command line arguments or path.
+   */
+  abstract class Range extends ThreatModelSource::Range {
+    override string getThreatModel() { result = "commandargs" }
+
+    override string getSourceType() { result = "CommandLineArgs" }
+  }
+}
+
+/**
+ * A data flow source corresponding to the program's environment.
+ */
+final class EnvironmentSource = EnvironmentSource::Range;
+
+/**
+ * Provides a class for modeling new sources for the program's environment.
+ */
+module EnvironmentSource {
+  /**
+   * A data flow source corresponding to the program's environment.
+   */
+  abstract class Range extends ThreatModelSource::Range {
+    override string getThreatModel() { result = "environment" }
+
+    override string getSourceType() { result = "EnvironmentSource" }
+  }
+}
+
+/**
+ * A data flow source for remote (network) data.
+ */
+final class RemoteSource = RemoteSource::Range;
+
+/**
+ * Provides a class for modeling new sources of remote (network) data.
+ */
+module RemoteSource {
+  /**
+   * A data flow source for remote (network) data.
+   */
+  abstract class Range extends ThreatModelSource::Range {
+    override string getThreatModel() { result = "remote" }
+
+    override string getSourceType() { result = "RemoteSource" }
+  }
+}
+
+/**
+ * A data-flow node that constructs a SQL statement (for later execution).
+ *
+ * Often, it is worthy of an alert if a SQL statement is constructed such that
+ * executing it would be a security risk.
+ *
+ * If it is important that the SQL statement is executed, use `SqlExecution`.
+ *
+ * Extend this class to refine existing API models. If you want to model new APIs,
+ * extend `SqlConstruction::Range` instead.
+ */
+final class SqlConstruction = SqlConstruction::Range;
+
+/**
+ * Provides a class for modeling new SQL execution APIs.
+ */
+module SqlConstruction {
+  /**
+   * A data-flow node that constructs a SQL statement.
+   */
+  abstract class Range extends DataFlow::Node {
+    /**
+     * Gets the argument that specifies the SQL statements to be constructed.
+     */
+    abstract DataFlow::Node getSql();
+  }
+}
+
+/**
+ * A data-flow node that constructs and executes SQL statements.
+ *
+ * If the context of interest is such that merely constructing a SQL statement
+ * would be valuable to report, consider also using `SqlConstruction`.
+ *
+ * Extend this class to refine existing API models. If you want to model new APIs,
+ * extend `SqlExecution::Range` instead.
+ */
+final class SqlExecution = SqlExecution::Range;
+
+/**
+ * Provides a class for modeling new SQL execution APIs.
+ */
+module SqlExecution {
+  /**
+   * A data-flow node that executes SQL statements.
+   */
+  abstract class Range extends DataFlow::Node {
+    /**
+     * Gets the argument that specifies the SQL statements to be executed.
+     */
+    abstract DataFlow::Node getSql();
+  }
+}
+
+/**
+ * A data-flow node that performs SQL sanitization.
+ */
+final class SqlSanitization = SqlSanitization::Range;
+
+/**
+ * Provides a class for modeling new SQL sanitization APIs.
+ */
+module SqlSanitization {
+  /**
+   * A data-flow node that performs SQL sanitization.
+   */
+  abstract class Range extends DataFlow::Node { }
+}
diff --git a/rust/ql/lib/codeql/rust/Frameworks.qll b/rust/ql/lib/codeql/rust/Frameworks.qll
new file mode 100644
index 00000000000..0c6fc573d0f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/Frameworks.qll
@@ -0,0 +1,7 @@
+/**
+ * This file imports all models of frameworks and libraries.
+ */
+
+private import codeql.rust.frameworks.Reqwest
+private import codeql.rust.frameworks.stdlib.Env
+private import codeql.rust.frameworks.Sqlx
diff --git a/rust/ql/lib/codeql/rust/controlflow/CfgNodes.qll b/rust/ql/lib/codeql/rust/controlflow/CfgNodes.qll
index 4a51506dbc0..07bc8946bc1 100644
--- a/rust/ql/lib/codeql/rust/controlflow/CfgNodes.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/CfgNodes.qll
@@ -5,56 +5,219 @@
 
 private import rust
 private import ControlFlowGraph
-private import internal.ControlFlowGraphImpl
+private import internal.ControlFlowGraphImpl as CfgImpl
+private import internal.CfgNodes
+import Nodes
 
-/** A CFG node that corresponds to an element in the AST. */
-class AstCfgNode extends CfgNode {
-  AstNode node;
+class AstCfgNode = CfgImpl::AstCfgNode;
 
-  AstCfgNode() { node = this.getAstNode() }
+class ExitCfgNode = CfgImpl::ExitNode;
 
-  /** Gets the underlying ast node. */
-  AstNode getAstNode() { result = node }
+class AnnotatedExitCfgNode = CfgImpl::AnnotatedExitNode;
+
+/**
+ * An assignment expression, for example
+ *
+ * ```rust
+ * x = y;
+ * ```
+ */
+final class AssignmentExprCfgNode extends BinaryExprCfgNode {
+  AssignmentExpr a;
+
+  AssignmentExprCfgNode() { a = this.getBinaryExpr() }
+
+  /** Gets the underlying `AssignmentExpr`. */
+  AssignmentExpr getAssignmentExpr() { result = a }
 }
 
-/** A CFG node that corresponds to a parameter in the AST. */
-class ParamCfgNode extends AstCfgNode {
-  override Param node;
+/**
+ * A match expression. For example:
+ * ```rust
+ * match x {
+ *     Option::Some(y) => y,
+ *     Option::None => 0,
+ * }
+ * ```
+ * ```rust
+ * match x {
+ *     Some(y) if y != 0 => 1 / y,
+ *     _ => 0,
+ * }
+ * ```
+ */
+final class MatchExprCfgNode extends Nodes::MatchExprCfgNode {
+  private MatchExpr node;
 
-  /** Gets the underlying parameter. */
-  Param getParam() { result = node }
+  MatchExprCfgNode() { node = this.getMatchExpr() }
+
+  /**
+   * Gets the pattern of the `i`th match arm, if it exists.
+   */
+  PatCfgNode getArmPat(int i) {
+    any(ChildMapping mapping).hasCfgChild(node, node.getArm(i).getPat(), this, result)
+  }
+
+  /**
+   * Gets the guard of the `i`th match arm, if it exists.
+   */
+  ExprCfgNode getArmGuard(int i) {
+    any(ChildMapping mapping)
+        .hasCfgChild(node, node.getArm(i).getGuard().getCondition(), this, result)
+  }
+
+  /**
+   * Gets the expression of the `i`th match arm, if it exists.
+   */
+  ExprCfgNode getArmExpr(int i) {
+    any(ChildMapping mapping).hasCfgChild(node, node.getArm(i).getExpr(), this, result)
+  }
 }
 
-/** A CFG node that corresponds to a parameter in the AST. */
-class PatCfgNode extends AstCfgNode {
-  override Pat node;
+/**
+ * A block expression. For example:
+ * ```rust
+ * {
+ *     let x = 42;
+ * }
+ * ```
+ * ```rust
+ * 'label: {
+ *     let x = 42;
+ *     x
+ * }
+ * ```
+ */
+final class BlockExprCfgNode extends Nodes::BlockExprCfgNode {
+  private BlockExprChildMapping node;
 
-  /** Gets the underlying pattern. */
-  Pat getPat() { result = node }
+  BlockExprCfgNode() { node = this.getAstNode() }
+
+  /**
+   * Gets the tail expression of this block, if it exists.
+   */
+  ExprCfgNode getTailExpr() {
+    any(ChildMapping mapping).hasCfgChild(node, node.getStmtList().getTailExpr(), this, result)
+  }
 }
 
-/** A CFG node that corresponds to an expression in the AST. */
-class ExprCfgNode extends AstCfgNode {
-  override Expr node;
-
-  /** Gets the underlying expression. */
-  Expr getExpr() { result = node }
+/**
+ * A break expression. For example:
+ * ```rust
+ * loop {
+ *     if not_ready() {
+ *         break;
+ *      }
+ * }
+ * ```
+ * ```rust
+ * let x = 'label: loop {
+ *     if done() {
+ *         break 'label 42;
+ *     }
+ * };
+ * ```
+ * ```rust
+ * let x = 'label: {
+ *     if exit() {
+ *         break 'label 42;
+ *     }
+ *     0;
+ * };
+ * ```
+ */
+final class BreakExprCfgNode extends Nodes::BreakExprCfgNode {
+  /**
+   * Gets the target of this `break` expression.
+   *
+   * The target is either a `LoopExpr`, a `ForExpr`, a `WhileExpr`, or a
+   * `BlockExpr`.
+   */
+  ExprCfgNode getTarget() {
+    any(ChildMapping mapping)
+        .hasCfgChild(this.getBreakExpr().getTarget(), this.getBreakExpr(), result, this)
+  }
 }
 
-/** A CFG node that corresponds to a call in the AST. */
-class CallExprCfgNode extends ExprCfgNode {
-  override CallExpr node;
+/**
+ * A function or method call expression. See `CallExpr` and `MethodCallExpr` for further details.
+ */
+final class CallExprBaseCfgNode extends Nodes::CallExprBaseCfgNode {
+  private CallExprBaseChildMapping node;
 
-  /** Gets the underlying `CallExpr`. */
-  CallExpr getCallExpr() { result = node }
+  CallExprBaseCfgNode() { node = this.getAstNode() }
+
+  /** Gets the `i`th argument of this call. */
+  ExprCfgNode getArgument(int i) {
+    any(ChildMapping mapping).hasCfgChild(node, node.getArgList().getArg(i), this, result)
+  }
 }
 
-/** A CFG node that corresponds to a call in the AST. */
-class MethodCallExprCfgNode extends ExprCfgNode {
-  override MethodCallExpr node;
+/**
+ * A method call expression. For example:
+ * ```rust
+ * x.foo(42);
+ * x.foo::<u32, u64>(42);
+ * ```
+ */
+final class MethodCallExprCfgNode extends CallExprBaseCfgNode, Nodes::MethodCallExprCfgNode { }
 
-  /** Gets the underlying `MethodCallExpr`. */
-  MethodCallExpr getMethodCallExpr() { result = node }
+/**
+ * A function call expression. For example:
+ * ```rust
+ * foo(42);
+ * foo::<u32, u64>(42);
+ * foo[0](42);
+ * foo(1) = 4;
+ * ```
+ */
+final class CallExprCfgNode extends CallExprBaseCfgNode, Nodes::CallExprCfgNode { }
+
+/**
+ * A record expression. For example:
+ * ```rust
+ * let first = Foo { a: 1, b: 2 };
+ * let second = Foo { a: 2, ..first };
+ * Foo { a: 1, b: 2 }[2] = 10;
+ * Foo { .. } = second;
+ * ```
+ */
+final class RecordExprCfgNode extends Nodes::RecordExprCfgNode {
+  private RecordExprChildMapping node;
+
+  RecordExprCfgNode() { node = this.getRecordExpr() }
+
+  /** Gets the record expression for the field `field`. */
+  pragma[nomagic]
+  ExprCfgNode getFieldExpr(string field) {
+    exists(RecordExprField ref |
+      ref = node.getRecordExprFieldList().getAField() and
+      any(ChildMapping mapping).hasCfgChild(node, ref.getExpr(), this, result) and
+      field = ref.getNameRef().getText()
+    )
+  }
 }
 
-final class ExitCfgNode = ExitNode;
+/**
+ * A record pattern. For example:
+ * ```rust
+ * match x {
+ *     Foo { a: 1, b: 2 } => "ok",
+ *     Foo { .. } => "fail",
+ * }
+ * ```
+ */
+final class RecordPatCfgNode extends Nodes::RecordPatCfgNode {
+  private RecordPatChildMapping node;
+
+  RecordPatCfgNode() { node = this.getRecordPat() }
+
+  /** Gets the record pattern for the field `field`. */
+  PatCfgNode getFieldPat(string field) {
+    exists(RecordPatField rpf |
+      rpf = node.getRecordPatFieldList().getAField() and
+      any(ChildMapping mapping).hasCfgChild(node, rpf.getPat(), this, result) and
+      field = rpf.getNameRef().getText()
+    )
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/CfgConsistency.qll b/rust/ql/lib/codeql/rust/controlflow/internal/CfgConsistency.qll
index 2722661494d..62ac5822dbb 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/CfgConsistency.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/CfgConsistency.qll
@@ -8,6 +8,8 @@ import Consistency
 private import codeql.rust.controlflow.ControlFlowGraph
 private import codeql.rust.controlflow.internal.ControlFlowGraphImpl as CfgImpl
 private import codeql.rust.controlflow.internal.Completion
+private import codeql.rust.controlflow.internal.CfgNodes::Consistency as CfgNodes
+private import codeql.rust.Diagnostics
 
 private predicate nonPostOrderExpr(Expr e) {
   not e instanceof LetExpr and
@@ -54,6 +56,25 @@ query predicate deadEnd(CfgImpl::Node node) {
   not letElsePanic(node.getAstNode())
 }
 
+pragma[nomagic]
+private predicate successfullyExtractedFile(File f) {
+  not exists(ExtractionWarning ee | ee.getLocation().getFile() = f)
+}
+
+query predicate missingCfgChild(CfgNode parent, string pred, int i, AstNode child) {
+  CfgNodes::missingCfgChild(parent, pred, i, child) and
+  successfullyExtractedFile(child.getLocation().getFile()) and
+  not exists(AstNode last, CfgImpl::Completion c | CfgImpl::last(child, last, c) |
+    // In for example `if (a && true) ...`, there is no edge from the CFG node
+    // for `true` into the `[false] a && true` node.
+    strictcount(ConditionalSuccessor cs | exists(last.getACfgNode().getASuccessor(cs)) | cs) = 1
+    or
+    // In for example `x && return`, there is no edge from the node for
+    // `return` into the `&&` node.
+    not c instanceof CfgImpl::NormalCompletion
+  )
+}
+
 /**
  * Gets counts of control flow graph inconsistencies of each type.
  */
@@ -99,4 +120,7 @@ int getCfgInconsistencyCounts(string type) {
   or
   type = "Non-PostOrderTree Expr node" and
   result = count(Expr e | nonPostOrderExpr(e) | e)
+  or
+  type = "Missing CFG child" and
+  result = count(CfgNode parent, string pred, int child | missingCfgChild(parent, pred, child, _))
 }
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/CfgNodes.qll b/rust/ql/lib/codeql/rust/controlflow/internal/CfgNodes.qll
new file mode 100644
index 00000000000..0f3dee7a9f4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/CfgNodes.qll
@@ -0,0 +1,154 @@
+private import rust
+private import codeql.rust.controlflow.internal.generated.CfgNodes
+private import codeql.rust.controlflow.internal.ControlFlowGraphImpl as CfgImpl
+private import codeql.rust.controlflow.ControlFlowGraph
+private import codeql.rust.controlflow.BasicBlocks
+private import codeql.rust.controlflow.CfgNodes
+private import codeql.rust.internal.CachedStages
+
+private predicate isPostOrder(AstNode n) {
+  n instanceof Expr and
+  not n instanceof LetExpr
+  or
+  n instanceof OrPat
+  or
+  n instanceof IdentPat
+  or
+  n instanceof LiteralPat
+  or
+  n instanceof Param
+}
+
+private module CfgNodesInput implements InputSig<Location> {
+  private import codeql.rust.controlflow.ControlFlowGraph as Cfg
+
+  class CfgNode = AstCfgNode;
+
+  private AstNode desugar(AstNode n) {
+    result = n.(ParenPat).getPat()
+    or
+    result = n.(ParenExpr).getExpr()
+  }
+
+  AstNode getDesugared(AstNode n) {
+    result = getDesugared(desugar(n))
+    or
+    not exists(desugar(n)) and
+    result = n
+  }
+}
+
+import MakeCfgNodes<Location, CfgNodesInput>
+
+class MatchExprChildMapping extends ParentAstNode, MatchExpr {
+  override predicate relevantChild(AstNode child) {
+    child = this.getAnArm().getPat()
+    or
+    child = this.getAnArm().getGuard().getCondition()
+    or
+    child = this.getAnArm().getExpr()
+  }
+}
+
+class BlockExprChildMapping extends ParentAstNode, BlockExpr {
+  override predicate relevantChild(AstNode child) { child = this.getStmtList().getTailExpr() }
+}
+
+class BreakExprTargetChildMapping extends ParentAstNode, Expr {
+  override predicate relevantChild(AstNode child) { child.(BreakExpr).getTarget() = this }
+}
+
+class CallExprBaseChildMapping extends ParentAstNode, CallExprBase {
+  override predicate relevantChild(AstNode child) { child = this.getArgList().getAnArg() }
+}
+
+class RecordExprChildMapping extends ParentAstNode, RecordExpr {
+  override predicate relevantChild(AstNode child) {
+    child = this.getRecordExprFieldList().getAField().getExpr()
+  }
+}
+
+class RecordPatChildMapping extends ParentAstNode, RecordPat {
+  override predicate relevantChild(AstNode child) {
+    child = this.getRecordPatFieldList().getAField().getPat()
+  }
+}
+
+class FormatArgsExprChildMapping extends ParentAstNode, CfgImpl::ExprTrees::FormatArgsExprTree {
+  override predicate relevantChild(AstNode child) { child = this.getChildNode(_) }
+}
+
+private class ChildMappingImpl extends ChildMapping {
+  /** Gets a CFG node for `child`, where `child` is a relevant child node of `parent`. */
+  private CfgNode getRelevantChildCfgNode(AstNode parent, AstNode child) {
+    this.relevantChild(parent, child) and
+    result = CfgNodesInput::getDesugared(child).getACfgNode()
+  }
+
+  pragma[nomagic]
+  private BasicBlock getARelevantBasicBlock(AstNode parent) {
+    result.getANode().getAstNode() = parent or
+    result.getANode() = this.getRelevantChildCfgNode(parent, _)
+  }
+
+  /**
+   * Holds if CFG node `cfnChild` can reach basic block `bb`, without going
+   * through an intermediate block that contains a CFG node for `parent` or
+   * any other relevant child of `parent`.
+   */
+  pragma[nomagic]
+  predicate childNodeReachesBasicBlock(
+    AstNode parent, AstNode child, CfgNode cfnChild, BasicBlock bb
+  ) {
+    exists(BasicBlock bb0 |
+      cfnChild = this.getRelevantChildCfgNode(parent, child) and
+      bb0.getANode() = cfnChild
+    |
+      bb = bb0
+      or
+      not bb0.getANode().getAstNode() = parent and
+      if isPostOrder(parent) then bb = bb0.getASuccessor() else bb = bb0.getAPredecessor()
+    )
+    or
+    exists(BasicBlock mid |
+      this.childNodeReachesBasicBlock(parent, child, cfnChild, mid) and
+      not mid = this.getARelevantBasicBlock(parent) and
+      if isPostOrder(parent) then bb = mid.getASuccessor() else bb = mid.getAPredecessor()
+    )
+  }
+
+  /**
+   * Holds if CFG node `cfnChild` can reach CFG node `cfnParent`, without going
+   * through an intermediate block that contains a CFG node for `parent`.
+   */
+  pragma[nomagic]
+  predicate childNodeReachesParentNode(
+    AstNode parent, CfgNode cfnParent, AstNode child, CfgNode cfnChild
+  ) {
+    // `cfnChild` can reach `cfnParent` directly
+    exists(BasicBlock bb |
+      this.childNodeReachesBasicBlock(parent, child, cfnChild, bb) and
+      cfnParent.getAstNode() = parent
+    |
+      cfnParent = bb.getANode()
+      or
+      if isPostOrder(parent)
+      then cfnParent = bb.getASuccessor().getANode()
+      else cfnParent = bb.getAPredecessor().getANode()
+    )
+    or
+    // `cfnChild` can reach `cfnParent` by going via another relevant child
+    exists(CfgNode cfnOtherChild |
+      this.childNodeReachesParentNode(parent, cfnParent, _, cfnOtherChild) and
+      exists(BasicBlock bb |
+        this.childNodeReachesBasicBlock(parent, child, cfnChild, bb) and
+        bb.getANode() = cfnOtherChild
+      )
+    )
+  }
+
+  override predicate hasCfgChild(AstNode parent, AstNode child, AstCfgNode cfn, AstCfgNode cfnChild) {
+    Stages::CfgStage::ref() and
+    this.childNodeReachesParentNode(parent, cfn, child, cfnChild)
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
index b331ddd2d54..b999c5c7848 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
@@ -19,7 +19,7 @@ private module CfgInput implements InputSig<Location> {
 
   predicate completionIsValidFor = C::completionIsValidFor/2;
 
-  /** An AST node with an associated control-flow graph. */
+  /** An AST node with an associated control flow graph. */
   class CfgScope = Scope::CfgScope;
 
   CfgScope getCfgScope(AstNode n) {
@@ -73,9 +73,12 @@ class CallableScopeTree extends StandardTree, PreOrderTree, PostOrderTree, Scope
   override predicate propagatesAbnormal(AstNode child) { none() }
 
   override AstNode getChildNode(int i) {
-    result = this.getParamList().getParam(i)
+    i = 0 and
+    result = this.getParamList().getSelfParam()
     or
-    i = this.getParamList().getNumberOfParams() and
+    result = this.getParamList().getParam(i - 1)
+    or
+    i = this.getParamList().getNumberOfParams() + 1 and
     result = this.getBody()
   }
 }
@@ -191,7 +194,11 @@ class NameTree extends LeafTree, Name { }
 
 class NameRefTree extends LeafTree, NameRef { }
 
-class TypeRefTree extends LeafTree instanceof TypeRef { }
+class SelfParamTree extends StandardPostOrderTree, SelfParam {
+  override AstNode getChildNode(int i) { i = 0 and result = this.getName() }
+}
+
+class TypeReprTree extends LeafTree instanceof TypeRepr { }
 
 /**
  * Provides `ControlFlowTree`s for expressions.
@@ -306,7 +313,7 @@ module ExprTrees {
 
   class CallExprTree extends StandardPostOrderTree instanceof CallExpr {
     override AstNode getChildNode(int i) {
-      i = 0 and result = super.getExpr()
+      i = 0 and result = super.getFunction()
       or
       result = super.getArgList().getArg(i - 1)
     }
@@ -403,7 +410,7 @@ module ExprTrees {
   class LetExprTree extends StandardPreOrderTree, LetExpr {
     override AstNode getChildNode(int i) {
       i = 0 and
-      result = this.getExpr()
+      result = this.getScrutinee()
       or
       i = 1 and
       result = this.getPat()
@@ -507,14 +514,14 @@ module ExprTrees {
 
   class MatchExprTree extends PostOrderTree instanceof MatchExpr {
     override predicate propagatesAbnormal(AstNode child) {
-      child = [super.getExpr(), super.getAnArm().getExpr()]
+      child = [super.getScrutinee(), super.getAnArm().getExpr()]
     }
 
-    override predicate first(AstNode node) { first(super.getExpr(), node) }
+    override predicate first(AstNode node) { first(super.getScrutinee(), node) }
 
     override predicate succ(AstNode pred, AstNode succ, Completion c) {
       // Edge from the scrutinee to the first arm or to the match expression if no arms.
-      last(super.getExpr(), pred, c) and
+      last(super.getScrutinee(), pred, c) and
       (
         first(super.getArm(0).getPat(), succ)
         or
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/Scope.qll b/rust/ql/lib/codeql/rust/controlflow/internal/Scope.qll
index 7b3367690ec..cf779ed152f 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/Scope.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/Scope.qll
@@ -4,7 +4,7 @@ private import ControlFlowGraphImpl
 private import codeql.rust.elements.internal.generated.ParentChild
 
 /**
- * A control-flow graph (CFG) scope.
+ * A control flow graph (CFG) scope.
  */
 abstract private class CfgScopeImpl extends AstNode {
   /** Holds if `first` is executed first when entering `scope`. */
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll b/rust/ql/lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll
new file mode 100644
index 00000000000..b28dd64d66e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll
@@ -0,0 +1,3772 @@
+// generated by codegen, do not edit
+/**
+ * This module provides generated wrappers around the `CfgNode` type.
+ *
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.util.Location
+private import codeql.util.Unit
+private import codeql.rust.elements
+
+/** Provides the input to `MakeCfgNodes` */
+signature module InputSig<LocationSig Loc> {
+  class CfgNode {
+    AstNode getAstNode();
+
+    string toString();
+
+    Loc getLocation();
+  }
+
+  AstNode getDesugared(AstNode n);
+}
+
+/**
+ * Given a `CfgNode` implementation, provides the module `Nodes` that
+ * contains wrappers around `CfgNode` for relevant classes.
+ */
+module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
+  private import Input
+
+  final private class AstNodeFinal = AstNode;
+
+  final private class CfgNodeFinal = CfgNode;
+
+  /**
+   * INTERNAL: Do not expose.
+   */
+  abstract class ParentAstNode extends AstNodeFinal {
+    /**
+     * Holds if `child` is a (possibly nested) child of this AST node
+     * for which we would like to find a matching CFG child.
+     */
+    abstract predicate relevantChild(AstNode child);
+  }
+
+  /**
+   * INTERNAL: Do not expose.
+   */
+  abstract class ChildMapping extends Unit {
+    /**
+     * Holds if `child` is a (possibly nested) child of AST node `parent`
+     * for which we would like to find a matching CFG child.
+     */
+    final predicate relevantChild(AstNode parent, AstNode child) {
+      parent.(ParentAstNode).relevantChild(child)
+    }
+
+    /**
+     * Holds if there is a control flow path from `cfn` to `cfnChild`, where `cfn`
+     * is a control flow node for this AST node, and `cfnChild` is a control flow
+     * node for `child`.
+     *
+     * This predicate should be implemented at the place where `MakeCfgNodes` is
+     * invoked. Ideally, `MakeCfgNodes` should be a higher-order parameterized
+     * module, but since that is currently not supported, we achieve the "callback"
+     * effect using this `abstract` class instead.
+     */
+    cached
+    abstract predicate hasCfgChild(AstNode parent, AstNode child, CfgNode cfn, CfgNode cfnChild);
+  }
+
+  /** Provides sub classes of `CfgNode`. */
+  module Nodes {
+    final private class ParentArrayExpr extends ParentAstNode, ArrayExpr {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getExpr(_)
+      }
+    }
+
+    /**
+     * The base class for array expressions. For example:
+     * ```rust
+     * [1, 2, 3];
+     * [1; 10];
+     * ```
+     */
+    final class ArrayExprCfgNode extends CfgNodeFinal, ExprCfgNode {
+      private ArrayExpr node;
+
+      ArrayExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `ArrayExpr`. */
+      ArrayExpr getArrayExpr() { result = node }
+
+      /**
+       * Gets the `index`th expression of this array expression (0-based).
+       */
+      ExprCfgNode getExpr(int index) {
+        any(ChildMapping mapping).hasCfgChild(node, node.getExpr(index), this, result)
+      }
+
+      /**
+       * Gets any of the expressions of this array expression.
+       */
+      ExprCfgNode getAnExpr() { result = this.getExpr(_) }
+
+      /**
+       * Gets the number of expressions of this array expression.
+       */
+      int getNumberOfExprs() { result = count(int i | exists(this.getExpr(i))) }
+
+      /**
+       * Gets the `index`th attr of this array expression (0-based).
+       */
+      Attr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this array expression.
+       */
+      Attr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this array expression.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+    }
+
+    final private class ParentArrayListExpr extends ParentAstNode, ArrayListExpr {
+      override predicate relevantChild(AstNode child) { none() }
+    }
+
+    /**
+     * An array expression with a list of elements. For example:
+     * ```rust
+     * [1, 2, 3];
+     * ```
+     */
+    final class ArrayListExprCfgNode extends CfgNodeFinal, ArrayExprCfgNode {
+      private ArrayListExpr node;
+
+      ArrayListExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `ArrayListExpr`. */
+      ArrayListExpr getArrayListExpr() { result = node }
+    }
+
+    final private class ParentArrayRepeatExpr extends ParentAstNode, ArrayRepeatExpr {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getRepeatOperand()
+        or
+        child = this.getRepeatLength()
+      }
+    }
+
+    /**
+     * An array expression with a repeat operand and a repeat length. For example:
+     * ```rust
+     * [1; 10];
+     * ```
+     */
+    final class ArrayRepeatExprCfgNode extends CfgNodeFinal, ArrayExprCfgNode {
+      private ArrayRepeatExpr node;
+
+      ArrayRepeatExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `ArrayRepeatExpr`. */
+      ArrayRepeatExpr getArrayRepeatExpr() { result = node }
+
+      /**
+       * Gets the repeat operand of this array repeat expression.
+       */
+      ExprCfgNode getRepeatOperand() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getRepeatOperand(), this, result)
+      }
+
+      /**
+       * Gets the repeat length of this array repeat expression.
+       */
+      ExprCfgNode getRepeatLength() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getRepeatLength(), this, result)
+      }
+    }
+
+    final private class ParentAsmExpr extends ParentAstNode, AsmExpr {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getExpr()
+      }
+    }
+
+    /**
+     * An inline assembly expression. For example:
+     * ```rust
+     * unsafe {
+     *     builtin # asm(_);
+     * }
+     * ```
+     */
+    final class AsmExprCfgNode extends CfgNodeFinal, ExprCfgNode {
+      private AsmExpr node;
+
+      AsmExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `AsmExpr`. */
+      AsmExpr getAsmExpr() { result = node }
+
+      /**
+       * Gets the `index`th attr of this asm expression (0-based).
+       */
+      Attr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this asm expression.
+       */
+      Attr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this asm expression.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+      /**
+       * Gets the expression of this asm expression, if it exists.
+       */
+      ExprCfgNode getExpr() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getExpr(), this, result)
+      }
+
+      /**
+       * Holds if `getExpr()` exists.
+       */
+      predicate hasExpr() { exists(this.getExpr()) }
+    }
+
+    final private class ParentAwaitExpr extends ParentAstNode, AwaitExpr {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getExpr()
+      }
+    }
+
+    /**
+     * An `await` expression. For example:
+     * ```rust
+     * async {
+     *     let x = foo().await;
+     *     x
+     * }
+     * ```
+     */
+    final class AwaitExprCfgNode extends CfgNodeFinal, ExprCfgNode {
+      private AwaitExpr node;
+
+      AwaitExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `AwaitExpr`. */
+      AwaitExpr getAwaitExpr() { result = node }
+
+      /**
+       * Gets the `index`th attr of this await expression (0-based).
+       */
+      Attr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this await expression.
+       */
+      Attr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this await expression.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+      /**
+       * Gets the expression of this await expression, if it exists.
+       */
+      ExprCfgNode getExpr() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getExpr(), this, result)
+      }
+
+      /**
+       * Holds if `getExpr()` exists.
+       */
+      predicate hasExpr() { exists(this.getExpr()) }
+    }
+
+    final private class ParentBecomeExpr extends ParentAstNode, BecomeExpr {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getExpr()
+      }
+    }
+
+    /**
+     * A `become` expression. For example:
+     * ```rust
+     * fn fact_a(n: i32, a: i32) -> i32 {
+     *      if n == 0 {
+     *          a
+     *      } else {
+     *          become fact_a(n - 1, n * a)
+     *      }
+     * }
+     * ```
+     */
+    final class BecomeExprCfgNode extends CfgNodeFinal, ExprCfgNode {
+      private BecomeExpr node;
+
+      BecomeExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `BecomeExpr`. */
+      BecomeExpr getBecomeExpr() { result = node }
+
+      /**
+       * Gets the `index`th attr of this become expression (0-based).
+       */
+      Attr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this become expression.
+       */
+      Attr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this become expression.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+      /**
+       * Gets the expression of this become expression, if it exists.
+       */
+      ExprCfgNode getExpr() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getExpr(), this, result)
+      }
+
+      /**
+       * Holds if `getExpr()` exists.
+       */
+      predicate hasExpr() { exists(this.getExpr()) }
+    }
+
+    final private class ParentBinaryExpr extends ParentAstNode, BinaryExpr {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getLhs()
+        or
+        child = this.getRhs()
+      }
+    }
+
+    /**
+     * A binary operation expression. For example:
+     * ```rust
+     * x + y;
+     * x && y;
+     * x <= y;
+     * x = y;
+     * x += y;
+     * ```
+     */
+    final class BinaryExprCfgNode extends CfgNodeFinal, ExprCfgNode {
+      private BinaryExpr node;
+
+      BinaryExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `BinaryExpr`. */
+      BinaryExpr getBinaryExpr() { result = node }
+
+      /**
+       * Gets the `index`th attr of this binary expression (0-based).
+       */
+      Attr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this binary expression.
+       */
+      Attr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this binary expression.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+      /**
+       * Gets the lhs of this binary expression, if it exists.
+       */
+      ExprCfgNode getLhs() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getLhs(), this, result)
+      }
+
+      /**
+       * Holds if `getLhs()` exists.
+       */
+      predicate hasLhs() { exists(this.getLhs()) }
+
+      /**
+       * Gets the operator name of this binary expression, if it exists.
+       */
+      string getOperatorName() { result = node.getOperatorName() }
+
+      /**
+       * Holds if `getOperatorName()` exists.
+       */
+      predicate hasOperatorName() { exists(this.getOperatorName()) }
+
+      /**
+       * Gets the rhs of this binary expression, if it exists.
+       */
+      ExprCfgNode getRhs() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getRhs(), this, result)
+      }
+
+      /**
+       * Holds if `getRhs()` exists.
+       */
+      predicate hasRhs() { exists(this.getRhs()) }
+    }
+
+    final private class ParentBlockExpr extends ParentAstNode, BlockExpr {
+      override predicate relevantChild(AstNode child) { none() }
+    }
+
+    /**
+     * A block expression. For example:
+     * ```rust
+     * {
+     *     let x = 42;
+     * }
+     * ```
+     * ```rust
+     * 'label: {
+     *     let x = 42;
+     *     x
+     * }
+     * ```
+     */
+    final class BlockExprCfgNode extends CfgNodeFinal, LabelableExprCfgNode {
+      private BlockExpr node;
+
+      BlockExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `BlockExpr`. */
+      BlockExpr getBlockExpr() { result = node }
+
+      /**
+       * Gets the `index`th attr of this block expression (0-based).
+       */
+      Attr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this block expression.
+       */
+      Attr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this block expression.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+      /**
+       * Holds if this block expression is async.
+       */
+      predicate isAsync() { node.isAsync() }
+
+      /**
+       * Holds if this block expression is const.
+       */
+      predicate isConst() { node.isConst() }
+
+      /**
+       * Holds if this block expression is gen.
+       */
+      predicate isGen() { node.isGen() }
+
+      /**
+       * Holds if this block expression is move.
+       */
+      predicate isMove() { node.isMove() }
+
+      /**
+       * Holds if this block expression is try.
+       */
+      predicate isTry() { node.isTry() }
+
+      /**
+       * Holds if this block expression is unsafe.
+       */
+      predicate isUnsafe() { node.isUnsafe() }
+
+      /**
+       * Gets the statement list of this block expression, if it exists.
+       */
+      StmtList getStmtList() { result = node.getStmtList() }
+
+      /**
+       * Holds if `getStmtList()` exists.
+       */
+      predicate hasStmtList() { exists(this.getStmtList()) }
+    }
+
+    final private class ParentBoxPat extends ParentAstNode, BoxPat {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getPat()
+      }
+    }
+
+    /**
+     * A box pattern. For example:
+     * ```rust
+     * match x {
+     *     box Option::Some(y) => y,
+     *     box Option::None => 0,
+     * };
+     * ```
+     */
+    final class BoxPatCfgNode extends CfgNodeFinal, PatCfgNode {
+      private BoxPat node;
+
+      BoxPatCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `BoxPat`. */
+      BoxPat getBoxPat() { result = node }
+
+      /**
+       * Gets the pattern of this box pattern, if it exists.
+       */
+      PatCfgNode getPat() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getPat(), this, result)
+      }
+
+      /**
+       * Holds if `getPat()` exists.
+       */
+      predicate hasPat() { exists(this.getPat()) }
+    }
+
+    final private class ParentBreakExpr extends ParentAstNode, BreakExpr {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getExpr()
+      }
+    }
+
+    /**
+     * A break expression. For example:
+     * ```rust
+     * loop {
+     *     if not_ready() {
+     *         break;
+     *      }
+     * }
+     * ```
+     * ```rust
+     * let x = 'label: loop {
+     *     if done() {
+     *         break 'label 42;
+     *     }
+     * };
+     * ```
+     * ```rust
+     * let x = 'label: {
+     *     if exit() {
+     *         break 'label 42;
+     *     }
+     *     0;
+     * };
+     * ```
+     */
+    final class BreakExprCfgNode extends CfgNodeFinal, ExprCfgNode {
+      private BreakExpr node;
+
+      BreakExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `BreakExpr`. */
+      BreakExpr getBreakExpr() { result = node }
+
+      /**
+       * Gets the `index`th attr of this break expression (0-based).
+       */
+      Attr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this break expression.
+       */
+      Attr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this break expression.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+      /**
+       * Gets the expression of this break expression, if it exists.
+       */
+      ExprCfgNode getExpr() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getExpr(), this, result)
+      }
+
+      /**
+       * Holds if `getExpr()` exists.
+       */
+      predicate hasExpr() { exists(this.getExpr()) }
+
+      /**
+       * Gets the lifetime of this break expression, if it exists.
+       */
+      Lifetime getLifetime() { result = node.getLifetime() }
+
+      /**
+       * Holds if `getLifetime()` exists.
+       */
+      predicate hasLifetime() { exists(this.getLifetime()) }
+    }
+
+    final private class ParentCallExpr extends ParentAstNode, CallExpr {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getFunction()
+      }
+    }
+
+    /**
+     * A function call expression. For example:
+     * ```rust
+     * foo(42);
+     * foo::<u32, u64>(42);
+     * foo[0](42);
+     * foo(1) = 4;
+     * ```
+     */
+    final class CallExprCfgNode extends CfgNodeFinal, CallExprBaseCfgNode {
+      private CallExpr node;
+
+      CallExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `CallExpr`. */
+      CallExpr getCallExpr() { result = node }
+
+      /**
+       * Gets the function of this call expression, if it exists.
+       */
+      ExprCfgNode getFunction() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getFunction(), this, result)
+      }
+
+      /**
+       * Holds if `getFunction()` exists.
+       */
+      predicate hasFunction() { exists(this.getFunction()) }
+    }
+
+    final private class ParentCallExprBase extends ParentAstNode, CallExprBase {
+      override predicate relevantChild(AstNode child) { none() }
+    }
+
+    /**
+     * A function or method call expression. See `CallExpr` and `MethodCallExpr` for further details.
+     */
+    final class CallExprBaseCfgNode extends CfgNodeFinal, ExprCfgNode {
+      private CallExprBase node;
+
+      CallExprBaseCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `CallExprBase`. */
+      CallExprBase getCallExprBase() { result = node }
+
+      /**
+       * Gets the argument list of this call expression base, if it exists.
+       */
+      ArgList getArgList() { result = node.getArgList() }
+
+      /**
+       * Holds if `getArgList()` exists.
+       */
+      predicate hasArgList() { exists(this.getArgList()) }
+
+      /**
+       * Gets the `index`th attr of this call expression base (0-based).
+       */
+      Attr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this call expression base.
+       */
+      Attr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this call expression base.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+    }
+
+    final private class ParentConstBlockPat extends ParentAstNode, ConstBlockPat {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getBlockExpr()
+      }
+    }
+
+    /**
+     * A const block pattern. For example:
+     * ```rust
+     * match x {
+     *     const { 1 + 2 + 3 } => "ok",
+     *     _ => "fail",
+     * };
+     * ```
+     */
+    final class ConstBlockPatCfgNode extends CfgNodeFinal, PatCfgNode {
+      private ConstBlockPat node;
+
+      ConstBlockPatCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `ConstBlockPat`. */
+      ConstBlockPat getConstBlockPat() { result = node }
+
+      /**
+       * Gets the block expression of this const block pattern, if it exists.
+       */
+      BlockExprCfgNode getBlockExpr() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getBlockExpr(), this, result)
+      }
+
+      /**
+       * Holds if `getBlockExpr()` exists.
+       */
+      predicate hasBlockExpr() { exists(this.getBlockExpr()) }
+
+      /**
+       * Holds if this const block pattern is const.
+       */
+      predicate isConst() { node.isConst() }
+    }
+
+    final private class ParentContinueExpr extends ParentAstNode, ContinueExpr {
+      override predicate relevantChild(AstNode child) { none() }
+    }
+
+    /**
+     * A continue expression. For example:
+     * ```rust
+     * loop {
+     *     if not_ready() {
+     *         continue;
+     *     }
+     * }
+     * ```
+     * ```rust
+     * 'label: loop {
+     *     if not_ready() {
+     *         continue 'label;
+     *     }
+     * }
+     * ```
+     */
+    final class ContinueExprCfgNode extends CfgNodeFinal, ExprCfgNode {
+      private ContinueExpr node;
+
+      ContinueExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `ContinueExpr`. */
+      ContinueExpr getContinueExpr() { result = node }
+
+      /**
+       * Gets the `index`th attr of this continue expression (0-based).
+       */
+      Attr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this continue expression.
+       */
+      Attr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this continue expression.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+      /**
+       * Gets the lifetime of this continue expression, if it exists.
+       */
+      Lifetime getLifetime() { result = node.getLifetime() }
+
+      /**
+       * Holds if `getLifetime()` exists.
+       */
+      predicate hasLifetime() { exists(this.getLifetime()) }
+    }
+
+    final private class ParentExpr extends ParentAstNode, Expr {
+      override predicate relevantChild(AstNode child) { none() }
+    }
+
+    /**
+     * The base class for expressions.
+     */
+    final class ExprCfgNode extends CfgNodeFinal {
+      private Expr node;
+
+      ExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `Expr`. */
+      Expr getExpr() { result = node }
+    }
+
+    final private class ParentFieldExpr extends ParentAstNode, FieldExpr {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getExpr()
+      }
+    }
+
+    /**
+     * A field access expression. For example:
+     * ```rust
+     * x.foo
+     * ```
+     */
+    final class FieldExprCfgNode extends CfgNodeFinal, ExprCfgNode {
+      private FieldExpr node;
+
+      FieldExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `FieldExpr`. */
+      FieldExpr getFieldExpr() { result = node }
+
+      /**
+       * Gets the `index`th attr of this field expression (0-based).
+       */
+      Attr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this field expression.
+       */
+      Attr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this field expression.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+      /**
+       * Gets the expression of this field expression, if it exists.
+       */
+      ExprCfgNode getExpr() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getExpr(), this, result)
+      }
+
+      /**
+       * Holds if `getExpr()` exists.
+       */
+      predicate hasExpr() { exists(this.getExpr()) }
+
+      /**
+       * Gets the name reference of this field expression, if it exists.
+       */
+      NameRef getNameRef() { result = node.getNameRef() }
+
+      /**
+       * Holds if `getNameRef()` exists.
+       */
+      predicate hasNameRef() { exists(this.getNameRef()) }
+    }
+
+    final private class ParentForExpr extends ParentAstNode, ForExpr {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getIterable()
+        or
+        child = this.getPat()
+      }
+    }
+
+    /**
+     * A ForExpr. For example:
+     * ```rust
+     * todo!()
+     * ```
+     */
+    final class ForExprCfgNode extends CfgNodeFinal, LoopingExprCfgNode {
+      private ForExpr node;
+
+      ForExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `ForExpr`. */
+      ForExpr getForExpr() { result = node }
+
+      /**
+       * Gets the `index`th attr of this for expression (0-based).
+       */
+      Attr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this for expression.
+       */
+      Attr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this for expression.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+      /**
+       * Gets the iterable of this for expression, if it exists.
+       */
+      ExprCfgNode getIterable() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getIterable(), this, result)
+      }
+
+      /**
+       * Holds if `getIterable()` exists.
+       */
+      predicate hasIterable() { exists(this.getIterable()) }
+
+      /**
+       * Gets the pattern of this for expression, if it exists.
+       */
+      PatCfgNode getPat() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getPat(), this, result)
+      }
+
+      /**
+       * Holds if `getPat()` exists.
+       */
+      predicate hasPat() { exists(this.getPat()) }
+    }
+
+    final private class ParentFormatArgsExpr extends ParentAstNode, FormatArgsExpr {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getTemplate()
+      }
+    }
+
+    /**
+     * A FormatArgsExpr. For example:
+     * ```rust
+     * format_args!("no args");
+     * format_args!("{} foo {:?}", 1, 2);
+     * format_args!("{b} foo {a:?}", a=1, b=2);
+     * let (x, y) = (1, 42);
+     * format_args!("{x}, {y}");
+     * ```
+     */
+    final class FormatArgsExprCfgNode extends CfgNodeFinal, ExprCfgNode {
+      private FormatArgsExpr node;
+
+      FormatArgsExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `FormatArgsExpr`. */
+      FormatArgsExpr getFormatArgsExpr() { result = node }
+
+      /**
+       * Gets the `index`th argument of this format arguments expression (0-based).
+       */
+      FormatArgsArg getArg(int index) { result = node.getArg(index) }
+
+      /**
+       * Gets any of the arguments of this format arguments expression.
+       */
+      FormatArgsArg getAnArg() { result = this.getArg(_) }
+
+      /**
+       * Gets the number of arguments of this format arguments expression.
+       */
+      int getNumberOfArgs() { result = count(int i | exists(this.getArg(i))) }
+
+      /**
+       * Gets the `index`th attr of this format arguments expression (0-based).
+       */
+      Attr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this format arguments expression.
+       */
+      Attr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this format arguments expression.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+      /**
+       * Gets the template of this format arguments expression, if it exists.
+       */
+      ExprCfgNode getTemplate() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getTemplate(), this, result)
+      }
+
+      /**
+       * Holds if `getTemplate()` exists.
+       */
+      predicate hasTemplate() { exists(this.getTemplate()) }
+
+      /**
+       * Gets the `index`th format of this format arguments expression (0-based).
+       */
+      Format getFormat(int index) { result = node.getFormat(index) }
+
+      /**
+       * Gets any of the formats of this format arguments expression.
+       */
+      Format getAFormat() { result = this.getFormat(_) }
+
+      /**
+       * Gets the number of formats of this format arguments expression.
+       */
+      int getNumberOfFormats() { result = count(int i | exists(this.getFormat(i))) }
+    }
+
+    final private class ParentFormatTemplateVariableAccess extends ParentAstNode,
+      FormatTemplateVariableAccess
+    {
+      override predicate relevantChild(AstNode child) { none() }
+    }
+
+    /**
+     */
+    final class FormatTemplateVariableAccessCfgNode extends CfgNodeFinal, PathExprBaseCfgNode {
+      private FormatTemplateVariableAccess node;
+
+      FormatTemplateVariableAccessCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `FormatTemplateVariableAccess`. */
+      FormatTemplateVariableAccess getFormatTemplateVariableAccess() { result = node }
+    }
+
+    final private class ParentIdentPat extends ParentAstNode, IdentPat {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getPat()
+      }
+    }
+
+    /**
+     * A binding pattern. For example:
+     * ```rust
+     * match x {
+     *     Option::Some(y) => y,
+     *     Option::None => 0,
+     * };
+     * ```
+     * ```rust
+     * match x {
+     *     y@Option::Some(_) => y,
+     *     Option::None => 0,
+     * };
+     * ```
+     */
+    final class IdentPatCfgNode extends CfgNodeFinal, PatCfgNode {
+      private IdentPat node;
+
+      IdentPatCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `IdentPat`. */
+      IdentPat getIdentPat() { result = node }
+
+      /**
+       * Gets the `index`th attr of this ident pattern (0-based).
+       */
+      Attr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this ident pattern.
+       */
+      Attr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this ident pattern.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+      /**
+       * Holds if this ident pattern is mut.
+       */
+      predicate isMut() { node.isMut() }
+
+      /**
+       * Holds if this ident pattern is reference.
+       */
+      predicate isRef() { node.isRef() }
+
+      /**
+       * Gets the name of this ident pattern, if it exists.
+       */
+      Name getName() { result = node.getName() }
+
+      /**
+       * Holds if `getName()` exists.
+       */
+      predicate hasName() { exists(this.getName()) }
+
+      /**
+       * Gets the pattern of this ident pattern, if it exists.
+       */
+      PatCfgNode getPat() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getPat(), this, result)
+      }
+
+      /**
+       * Holds if `getPat()` exists.
+       */
+      predicate hasPat() { exists(this.getPat()) }
+    }
+
+    final private class ParentIfExpr extends ParentAstNode, IfExpr {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getCondition()
+        or
+        child = this.getElse()
+        or
+        child = this.getThen()
+      }
+    }
+
+    /**
+     * An `if` expression. For example:
+     * ```rust
+     * if x == 42 {
+     *     println!("that's the answer");
+     * }
+     * ```
+     * ```rust
+     * let y = if x > 0 {
+     *     1
+     * } else {
+     *     0
+     * };
+     * ```
+     */
+    final class IfExprCfgNode extends CfgNodeFinal, ExprCfgNode {
+      private IfExpr node;
+
+      IfExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `IfExpr`. */
+      IfExpr getIfExpr() { result = node }
+
+      /**
+       * Gets the `index`th attr of this if expression (0-based).
+       */
+      Attr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this if expression.
+       */
+      Attr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this if expression.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+      /**
+       * Gets the condition of this if expression, if it exists.
+       */
+      ExprCfgNode getCondition() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getCondition(), this, result)
+      }
+
+      /**
+       * Holds if `getCondition()` exists.
+       */
+      predicate hasCondition() { exists(this.getCondition()) }
+
+      /**
+       * Gets the else of this if expression, if it exists.
+       */
+      ExprCfgNode getElse() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getElse(), this, result)
+      }
+
+      /**
+       * Holds if `getElse()` exists.
+       */
+      predicate hasElse() { exists(this.getElse()) }
+
+      /**
+       * Gets the then of this if expression, if it exists.
+       */
+      BlockExprCfgNode getThen() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getThen(), this, result)
+      }
+
+      /**
+       * Holds if `getThen()` exists.
+       */
+      predicate hasThen() { exists(this.getThen()) }
+    }
+
+    final private class ParentIndexExpr extends ParentAstNode, IndexExpr {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getBase()
+        or
+        child = this.getIndex()
+      }
+    }
+
+    /**
+     * An index expression. For example:
+     * ```rust
+     * list[42];
+     * list[42] = 1;
+     * ```
+     */
+    final class IndexExprCfgNode extends CfgNodeFinal, ExprCfgNode {
+      private IndexExpr node;
+
+      IndexExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `IndexExpr`. */
+      IndexExpr getIndexExpr() { result = node }
+
+      /**
+       * Gets the `index`th attr of this index expression (0-based).
+       */
+      Attr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this index expression.
+       */
+      Attr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this index expression.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+      /**
+       * Gets the base of this index expression, if it exists.
+       */
+      ExprCfgNode getBase() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getBase(), this, result)
+      }
+
+      /**
+       * Holds if `getBase()` exists.
+       */
+      predicate hasBase() { exists(this.getBase()) }
+
+      /**
+       * Gets the index of this index expression, if it exists.
+       */
+      ExprCfgNode getIndex() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getIndex(), this, result)
+      }
+
+      /**
+       * Holds if `getIndex()` exists.
+       */
+      predicate hasIndex() { exists(this.getIndex()) }
+    }
+
+    final private class ParentLabelableExpr extends ParentAstNode, LabelableExpr {
+      override predicate relevantChild(AstNode child) { none() }
+    }
+
+    /**
+     * The base class for expressions that can be labeled (`LoopExpr`, `ForExpr`, `WhileExpr` or `BlockExpr`).
+     */
+    final class LabelableExprCfgNode extends CfgNodeFinal, ExprCfgNode {
+      private LabelableExpr node;
+
+      LabelableExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `LabelableExpr`. */
+      LabelableExpr getLabelableExpr() { result = node }
+
+      /**
+       * Gets the label of this labelable expression, if it exists.
+       */
+      Label getLabel() { result = node.getLabel() }
+
+      /**
+       * Holds if `getLabel()` exists.
+       */
+      predicate hasLabel() { exists(this.getLabel()) }
+    }
+
+    final private class ParentLetExpr extends ParentAstNode, LetExpr {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getScrutinee()
+        or
+        child = this.getPat()
+      }
+    }
+
+    /**
+     * A `let` expression. For example:
+     * ```rust
+     * if let Some(x) = maybe_some {
+     *     println!("{}", x);
+     * }
+     * ```
+     */
+    final class LetExprCfgNode extends CfgNodeFinal, ExprCfgNode {
+      private LetExpr node;
+
+      LetExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `LetExpr`. */
+      LetExpr getLetExpr() { result = node }
+
+      /**
+       * Gets the `index`th attr of this let expression (0-based).
+       */
+      Attr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this let expression.
+       */
+      Attr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this let expression.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+      /**
+       * Gets the scrutinee of this let expression, if it exists.
+       */
+      ExprCfgNode getScrutinee() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getScrutinee(), this, result)
+      }
+
+      /**
+       * Holds if `getScrutinee()` exists.
+       */
+      predicate hasScrutinee() { exists(this.getScrutinee()) }
+
+      /**
+       * Gets the pattern of this let expression, if it exists.
+       */
+      PatCfgNode getPat() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getPat(), this, result)
+      }
+
+      /**
+       * Holds if `getPat()` exists.
+       */
+      predicate hasPat() { exists(this.getPat()) }
+    }
+
+    final private class ParentLetStmt extends ParentAstNode, LetStmt {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getInitializer()
+        or
+        child = this.getPat()
+      }
+    }
+
+    /**
+     * A let statement. For example:
+     * ```rust
+     * let x = 42;
+     * let x: i32 = 42;
+     * let x: i32;
+     * let x;
+     * let (x, y) = (1, 2);
+     * let Some(x) = std::env::var("FOO") else {
+     *     return;
+     * };
+     * ```
+     */
+    final class LetStmtCfgNode extends CfgNodeFinal {
+      private LetStmt node;
+
+      LetStmtCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `LetStmt`. */
+      LetStmt getLetStmt() { result = node }
+
+      /**
+       * Gets the `index`th attr of this let statement (0-based).
+       */
+      Attr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this let statement.
+       */
+      Attr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this let statement.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+      /**
+       * Gets the initializer of this let statement, if it exists.
+       */
+      ExprCfgNode getInitializer() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getInitializer(), this, result)
+      }
+
+      /**
+       * Holds if `getInitializer()` exists.
+       */
+      predicate hasInitializer() { exists(this.getInitializer()) }
+
+      /**
+       * Gets the let else of this let statement, if it exists.
+       */
+      LetElse getLetElse() { result = node.getLetElse() }
+
+      /**
+       * Holds if `getLetElse()` exists.
+       */
+      predicate hasLetElse() { exists(this.getLetElse()) }
+
+      /**
+       * Gets the pattern of this let statement, if it exists.
+       */
+      PatCfgNode getPat() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getPat(), this, result)
+      }
+
+      /**
+       * Holds if `getPat()` exists.
+       */
+      predicate hasPat() { exists(this.getPat()) }
+
+      /**
+       * Gets the type representation of this let statement, if it exists.
+       */
+      TypeRepr getTypeRepr() { result = node.getTypeRepr() }
+
+      /**
+       * Holds if `getTypeRepr()` exists.
+       */
+      predicate hasTypeRepr() { exists(this.getTypeRepr()) }
+    }
+
+    final private class ParentLiteralExpr extends ParentAstNode, LiteralExpr {
+      override predicate relevantChild(AstNode child) { none() }
+    }
+
+    /**
+     * A literal expression. For example:
+     * ```rust
+     * 42;
+     * 42.0;
+     * "Hello, world!";
+     * b"Hello, world!";
+     * 'x';
+     * b'x';
+     * r"Hello, world!";
+     * true;
+     * ```
+     */
+    final class LiteralExprCfgNode extends CfgNodeFinal, ExprCfgNode {
+      private LiteralExpr node;
+
+      LiteralExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `LiteralExpr`. */
+      LiteralExpr getLiteralExpr() { result = node }
+
+      /**
+       * Gets the `index`th attr of this literal expression (0-based).
+       */
+      Attr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this literal expression.
+       */
+      Attr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this literal expression.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+      /**
+       * Gets the text value of this literal expression, if it exists.
+       */
+      string getTextValue() { result = node.getTextValue() }
+
+      /**
+       * Holds if `getTextValue()` exists.
+       */
+      predicate hasTextValue() { exists(this.getTextValue()) }
+    }
+
+    final private class ParentLiteralPat extends ParentAstNode, LiteralPat {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getLiteral()
+      }
+    }
+
+    /**
+     * A literal pattern. For example:
+     * ```rust
+     * match x {
+     *     42 => "ok",
+     *     _ => "fail",
+     * }
+     * ```
+     */
+    final class LiteralPatCfgNode extends CfgNodeFinal, PatCfgNode {
+      private LiteralPat node;
+
+      LiteralPatCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `LiteralPat`. */
+      LiteralPat getLiteralPat() { result = node }
+
+      /**
+       * Gets the literal of this literal pattern, if it exists.
+       */
+      LiteralExprCfgNode getLiteral() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getLiteral(), this, result)
+      }
+
+      /**
+       * Holds if `getLiteral()` exists.
+       */
+      predicate hasLiteral() { exists(this.getLiteral()) }
+    }
+
+    final private class ParentLoopExpr extends ParentAstNode, LoopExpr {
+      override predicate relevantChild(AstNode child) { none() }
+    }
+
+    /**
+     * A loop expression. For example:
+     * ```rust
+     * loop {
+     *     println!("Hello, world (again)!");
+     * };
+     * ```
+     * ```rust
+     * 'label: loop {
+     *     println!("Hello, world (once)!");
+     *     break 'label;
+     * };
+     * ```
+     * ```rust
+     * let mut x = 0;
+     * loop {
+     *     if x < 10 {
+     *         x += 1;
+     *     } else {
+     *         break;
+     *     }
+     * };
+     * ```
+     */
+    final class LoopExprCfgNode extends CfgNodeFinal, LoopingExprCfgNode {
+      private LoopExpr node;
+
+      LoopExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `LoopExpr`. */
+      LoopExpr getLoopExpr() { result = node }
+
+      /**
+       * Gets the `index`th attr of this loop expression (0-based).
+       */
+      Attr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this loop expression.
+       */
+      Attr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this loop expression.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+    }
+
+    final private class ParentLoopingExpr extends ParentAstNode, LoopingExpr {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getLoopBody()
+      }
+    }
+
+    /**
+     * The base class for expressions that loop (`LoopExpr`, `ForExpr` or `WhileExpr`).
+     */
+    final class LoopingExprCfgNode extends CfgNodeFinal, LabelableExprCfgNode {
+      private LoopingExpr node;
+
+      LoopingExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `LoopingExpr`. */
+      LoopingExpr getLoopingExpr() { result = node }
+
+      /**
+       * Gets the loop body of this looping expression, if it exists.
+       */
+      BlockExprCfgNode getLoopBody() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getLoopBody(), this, result)
+      }
+
+      /**
+       * Holds if `getLoopBody()` exists.
+       */
+      predicate hasLoopBody() { exists(this.getLoopBody()) }
+    }
+
+    final private class ParentMacroCall extends ParentAstNode, MacroCall {
+      override predicate relevantChild(AstNode child) { none() }
+    }
+
+    /**
+     * A MacroCall. For example:
+     * ```rust
+     * todo!()
+     * ```
+     */
+    final class MacroCallCfgNode extends CfgNodeFinal {
+      private MacroCall node;
+
+      MacroCallCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `MacroCall`. */
+      MacroCall getMacroCall() { result = node }
+
+      /**
+       * Gets the `index`th attr of this macro call (0-based).
+       */
+      Attr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this macro call.
+       */
+      Attr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this macro call.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+      /**
+       * Gets the path of this macro call, if it exists.
+       */
+      Path getPath() { result = node.getPath() }
+
+      /**
+       * Holds if `getPath()` exists.
+       */
+      predicate hasPath() { exists(this.getPath()) }
+
+      /**
+       * Gets the token tree of this macro call, if it exists.
+       */
+      TokenTree getTokenTree() { result = node.getTokenTree() }
+
+      /**
+       * Holds if `getTokenTree()` exists.
+       */
+      predicate hasTokenTree() { exists(this.getTokenTree()) }
+
+      /**
+       * Gets the expanded of this macro call, if it exists.
+       */
+      AstNode getExpanded() { result = node.getExpanded() }
+
+      /**
+       * Holds if `getExpanded()` exists.
+       */
+      predicate hasExpanded() { exists(this.getExpanded()) }
+    }
+
+    final private class ParentMacroExpr extends ParentAstNode, MacroExpr {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getMacroCall()
+      }
+    }
+
+    /**
+     * A MacroExpr. For example:
+     * ```rust
+     * todo!()
+     * ```
+     */
+    final class MacroExprCfgNode extends CfgNodeFinal, ExprCfgNode {
+      private MacroExpr node;
+
+      MacroExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `MacroExpr`. */
+      MacroExpr getMacroExpr() { result = node }
+
+      /**
+       * Gets the macro call of this macro expression, if it exists.
+       */
+      MacroCallCfgNode getMacroCall() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getMacroCall(), this, result)
+      }
+
+      /**
+       * Holds if `getMacroCall()` exists.
+       */
+      predicate hasMacroCall() { exists(this.getMacroCall()) }
+    }
+
+    final private class ParentMacroPat extends ParentAstNode, MacroPat {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getMacroCall()
+      }
+    }
+
+    /**
+     * A MacroPat. For example:
+     * ```rust
+     * todo!()
+     * ```
+     */
+    final class MacroPatCfgNode extends CfgNodeFinal, PatCfgNode {
+      private MacroPat node;
+
+      MacroPatCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `MacroPat`. */
+      MacroPat getMacroPat() { result = node }
+
+      /**
+       * Gets the macro call of this macro pattern, if it exists.
+       */
+      MacroCallCfgNode getMacroCall() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getMacroCall(), this, result)
+      }
+
+      /**
+       * Holds if `getMacroCall()` exists.
+       */
+      predicate hasMacroCall() { exists(this.getMacroCall()) }
+    }
+
+    final private class ParentMatchExpr extends ParentAstNode, MatchExpr {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getScrutinee()
+      }
+    }
+
+    /**
+     * A match expression. For example:
+     * ```rust
+     * match x {
+     *     Option::Some(y) => y,
+     *     Option::None => 0,
+     * }
+     * ```
+     * ```rust
+     * match x {
+     *     Some(y) if y != 0 => 1 / y,
+     *     _ => 0,
+     * }
+     * ```
+     */
+    final class MatchExprCfgNode extends CfgNodeFinal, ExprCfgNode {
+      private MatchExpr node;
+
+      MatchExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `MatchExpr`. */
+      MatchExpr getMatchExpr() { result = node }
+
+      /**
+       * Gets the `index`th attr of this match expression (0-based).
+       */
+      Attr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this match expression.
+       */
+      Attr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this match expression.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+      /**
+       * Gets the scrutinee (the expression being matched) of this match expression, if it exists.
+       */
+      ExprCfgNode getScrutinee() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getScrutinee(), this, result)
+      }
+
+      /**
+       * Holds if `getScrutinee()` exists.
+       */
+      predicate hasScrutinee() { exists(this.getScrutinee()) }
+
+      /**
+       * Gets the match arm list of this match expression, if it exists.
+       */
+      MatchArmList getMatchArmList() { result = node.getMatchArmList() }
+
+      /**
+       * Holds if `getMatchArmList()` exists.
+       */
+      predicate hasMatchArmList() { exists(this.getMatchArmList()) }
+    }
+
+    final private class ParentMethodCallExpr extends ParentAstNode, MethodCallExpr {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getReceiver()
+      }
+    }
+
+    /**
+     * A method call expression. For example:
+     * ```rust
+     * x.foo(42);
+     * x.foo::<u32, u64>(42);
+     * ```
+     */
+    final class MethodCallExprCfgNode extends CfgNodeFinal, CallExprBaseCfgNode {
+      private MethodCallExpr node;
+
+      MethodCallExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `MethodCallExpr`. */
+      MethodCallExpr getMethodCallExpr() { result = node }
+
+      /**
+       * Gets the generic argument list of this method call expression, if it exists.
+       */
+      GenericArgList getGenericArgList() { result = node.getGenericArgList() }
+
+      /**
+       * Holds if `getGenericArgList()` exists.
+       */
+      predicate hasGenericArgList() { exists(this.getGenericArgList()) }
+
+      /**
+       * Gets the name reference of this method call expression, if it exists.
+       */
+      NameRef getNameRef() { result = node.getNameRef() }
+
+      /**
+       * Holds if `getNameRef()` exists.
+       */
+      predicate hasNameRef() { exists(this.getNameRef()) }
+
+      /**
+       * Gets the receiver of this method call expression, if it exists.
+       */
+      ExprCfgNode getReceiver() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getReceiver(), this, result)
+      }
+
+      /**
+       * Holds if `getReceiver()` exists.
+       */
+      predicate hasReceiver() { exists(this.getReceiver()) }
+    }
+
+    final private class ParentOffsetOfExpr extends ParentAstNode, OffsetOfExpr {
+      override predicate relevantChild(AstNode child) { none() }
+    }
+
+    /**
+     *  An `offset_of` expression. For example:
+     * ```rust
+     * builtin # offset_of(Struct, field);
+     * ```
+     */
+    final class OffsetOfExprCfgNode extends CfgNodeFinal, ExprCfgNode {
+      private OffsetOfExpr node;
+
+      OffsetOfExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `OffsetOfExpr`. */
+      OffsetOfExpr getOffsetOfExpr() { result = node }
+
+      /**
+       * Gets the `index`th attr of this offset of expression (0-based).
+       */
+      Attr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this offset of expression.
+       */
+      Attr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this offset of expression.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+      /**
+       * Gets the `index`th field of this offset of expression (0-based).
+       */
+      NameRef getField(int index) { result = node.getField(index) }
+
+      /**
+       * Gets any of the fields of this offset of expression.
+       */
+      NameRef getAField() { result = this.getField(_) }
+
+      /**
+       * Gets the number of fields of this offset of expression.
+       */
+      int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
+
+      /**
+       * Gets the type representation of this offset of expression, if it exists.
+       */
+      TypeRepr getTypeRepr() { result = node.getTypeRepr() }
+
+      /**
+       * Holds if `getTypeRepr()` exists.
+       */
+      predicate hasTypeRepr() { exists(this.getTypeRepr()) }
+    }
+
+    final private class ParentOrPat extends ParentAstNode, OrPat {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getPat(_)
+      }
+    }
+
+    /**
+     * An or pattern. For example:
+     * ```rust
+     * match x {
+     *     Option::Some(y) | Option::None => 0,
+     * }
+     * ```
+     */
+    final class OrPatCfgNode extends CfgNodeFinal, PatCfgNode {
+      private OrPat node;
+
+      OrPatCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `OrPat`. */
+      OrPat getOrPat() { result = node }
+
+      /**
+       * Gets the `index`th pattern of this or pattern (0-based).
+       */
+      PatCfgNode getPat(int index) {
+        any(ChildMapping mapping).hasCfgChild(node, node.getPat(index), this, result)
+      }
+
+      /**
+       * Gets any of the patterns of this or pattern.
+       */
+      PatCfgNode getAPat() { result = this.getPat(_) }
+
+      /**
+       * Gets the number of patterns of this or pattern.
+       */
+      int getNumberOfPats() { result = count(int i | exists(this.getPat(i))) }
+    }
+
+    final private class ParentParam extends ParentAstNode, Param {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getPat()
+      }
+    }
+
+    /**
+     * A parameter in a function or method. For example `x` in:
+     * ```rust
+     * fn new(x: T) -> Foo<T> {
+     *   // ...
+     * }
+     * ```
+     */
+    final class ParamCfgNode extends CfgNodeFinal, ParamBaseCfgNode {
+      private Param node;
+
+      ParamCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `Param`. */
+      Param getParam() { result = node }
+
+      /**
+       * Gets the pattern of this parameter, if it exists.
+       */
+      PatCfgNode getPat() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getPat(), this, result)
+      }
+
+      /**
+       * Holds if `getPat()` exists.
+       */
+      predicate hasPat() { exists(this.getPat()) }
+    }
+
+    final private class ParentParamBase extends ParentAstNode, ParamBase {
+      override predicate relevantChild(AstNode child) { none() }
+    }
+
+    /**
+     * A normal parameter, `Param`, or a self parameter `SelfParam`.
+     */
+    final class ParamBaseCfgNode extends CfgNodeFinal {
+      private ParamBase node;
+
+      ParamBaseCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `ParamBase`. */
+      ParamBase getParamBase() { result = node }
+
+      /**
+       * Gets the `index`th attr of this parameter base (0-based).
+       */
+      Attr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this parameter base.
+       */
+      Attr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this parameter base.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+      /**
+       * Gets the type representation of this parameter base, if it exists.
+       */
+      TypeRepr getTypeRepr() { result = node.getTypeRepr() }
+
+      /**
+       * Holds if `getTypeRepr()` exists.
+       */
+      predicate hasTypeRepr() { exists(this.getTypeRepr()) }
+    }
+
+    final private class ParentPat extends ParentAstNode, Pat {
+      override predicate relevantChild(AstNode child) { none() }
+    }
+
+    /**
+     * The base class for patterns.
+     */
+    final class PatCfgNode extends CfgNodeFinal {
+      private Pat node;
+
+      PatCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `Pat`. */
+      Pat getPat() { result = node }
+    }
+
+    final private class ParentPathExpr extends ParentAstNode, PathExpr {
+      override predicate relevantChild(AstNode child) { none() }
+    }
+
+    /**
+     * A path expression. For example:
+     * ```rust
+     * let x = variable;
+     * let x = foo::bar;
+     * let y = <T>::foo;
+     * let z = <TypeRepr as Trait>::foo;
+     * ```
+     */
+    final class PathExprCfgNode extends CfgNodeFinal, PathExprBaseCfgNode {
+      private PathExpr node;
+
+      PathExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `PathExpr`. */
+      PathExpr getPathExpr() { result = node }
+
+      /**
+       * Gets the `index`th attr of this path expression (0-based).
+       */
+      Attr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this path expression.
+       */
+      Attr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this path expression.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+      /**
+       * Gets the path of this path expression, if it exists.
+       */
+      Path getPath() { result = node.getPath() }
+
+      /**
+       * Holds if `getPath()` exists.
+       */
+      predicate hasPath() { exists(this.getPath()) }
+    }
+
+    final private class ParentPathExprBase extends ParentAstNode, PathExprBase {
+      override predicate relevantChild(AstNode child) { none() }
+    }
+
+    /**
+     * A path expression or a variable access in a formatting template. See `PathExpr` and `FormatTemplateVariableAccess` for further details.
+     */
+    final class PathExprBaseCfgNode extends CfgNodeFinal, ExprCfgNode {
+      private PathExprBase node;
+
+      PathExprBaseCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `PathExprBase`. */
+      PathExprBase getPathExprBase() { result = node }
+    }
+
+    final private class ParentPathPat extends ParentAstNode, PathPat {
+      override predicate relevantChild(AstNode child) { none() }
+    }
+
+    /**
+     * A path pattern. For example:
+     * ```rust
+     * match x {
+     *     Foo::Bar => "ok",
+     *     _ => "fail",
+     * }
+     * ```
+     */
+    final class PathPatCfgNode extends CfgNodeFinal, PatCfgNode {
+      private PathPat node;
+
+      PathPatCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `PathPat`. */
+      PathPat getPathPat() { result = node }
+
+      /**
+       * Gets the path of this path pattern, if it exists.
+       */
+      Path getPath() { result = node.getPath() }
+
+      /**
+       * Holds if `getPath()` exists.
+       */
+      predicate hasPath() { exists(this.getPath()) }
+    }
+
+    final private class ParentPrefixExpr extends ParentAstNode, PrefixExpr {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getExpr()
+      }
+    }
+
+    /**
+     * A unary operation expression. For example:
+     * ```rust
+     * let x = -42;
+     * let y = !true;
+     * let z = *ptr;
+     * ```
+     */
+    final class PrefixExprCfgNode extends CfgNodeFinal, ExprCfgNode {
+      private PrefixExpr node;
+
+      PrefixExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `PrefixExpr`. */
+      PrefixExpr getPrefixExpr() { result = node }
+
+      /**
+       * Gets the `index`th attr of this prefix expression (0-based).
+       */
+      Attr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this prefix expression.
+       */
+      Attr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this prefix expression.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+      /**
+       * Gets the expression of this prefix expression, if it exists.
+       */
+      ExprCfgNode getExpr() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getExpr(), this, result)
+      }
+
+      /**
+       * Holds if `getExpr()` exists.
+       */
+      predicate hasExpr() { exists(this.getExpr()) }
+
+      /**
+       * Gets the operator name of this prefix expression, if it exists.
+       */
+      string getOperatorName() { result = node.getOperatorName() }
+
+      /**
+       * Holds if `getOperatorName()` exists.
+       */
+      predicate hasOperatorName() { exists(this.getOperatorName()) }
+    }
+
+    final private class ParentRangeExpr extends ParentAstNode, RangeExpr {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getEnd()
+        or
+        child = this.getStart()
+      }
+    }
+
+    /**
+     * A range expression. For example:
+     * ```rust
+     * let x = 1..=10;
+     * let x = 1..10;
+     * let x = 10..;
+     * let x = ..10;
+     * let x = ..=10;
+     * let x = ..;
+     * ```
+     */
+    final class RangeExprCfgNode extends CfgNodeFinal, ExprCfgNode {
+      private RangeExpr node;
+
+      RangeExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `RangeExpr`. */
+      RangeExpr getRangeExpr() { result = node }
+
+      /**
+       * Gets the `index`th attr of this range expression (0-based).
+       */
+      Attr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this range expression.
+       */
+      Attr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this range expression.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+      /**
+       * Gets the end of this range expression, if it exists.
+       */
+      ExprCfgNode getEnd() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getEnd(), this, result)
+      }
+
+      /**
+       * Holds if `getEnd()` exists.
+       */
+      predicate hasEnd() { exists(this.getEnd()) }
+
+      /**
+       * Gets the operator name of this range expression, if it exists.
+       */
+      string getOperatorName() { result = node.getOperatorName() }
+
+      /**
+       * Holds if `getOperatorName()` exists.
+       */
+      predicate hasOperatorName() { exists(this.getOperatorName()) }
+
+      /**
+       * Gets the start of this range expression, if it exists.
+       */
+      ExprCfgNode getStart() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getStart(), this, result)
+      }
+
+      /**
+       * Holds if `getStart()` exists.
+       */
+      predicate hasStart() { exists(this.getStart()) }
+    }
+
+    final private class ParentRangePat extends ParentAstNode, RangePat {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getEnd()
+        or
+        child = this.getStart()
+      }
+    }
+
+    /**
+     * A range pattern. For example:
+     * ```rust
+     * match x {
+     *     ..15 => "too cold",
+     *     16..=25 => "just right",
+     *     26.. => "too hot",
+     * }
+     * ```
+     */
+    final class RangePatCfgNode extends CfgNodeFinal, PatCfgNode {
+      private RangePat node;
+
+      RangePatCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `RangePat`. */
+      RangePat getRangePat() { result = node }
+
+      /**
+       * Gets the end of this range pattern, if it exists.
+       */
+      PatCfgNode getEnd() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getEnd(), this, result)
+      }
+
+      /**
+       * Holds if `getEnd()` exists.
+       */
+      predicate hasEnd() { exists(this.getEnd()) }
+
+      /**
+       * Gets the operator name of this range pattern, if it exists.
+       */
+      string getOperatorName() { result = node.getOperatorName() }
+
+      /**
+       * Holds if `getOperatorName()` exists.
+       */
+      predicate hasOperatorName() { exists(this.getOperatorName()) }
+
+      /**
+       * Gets the start of this range pattern, if it exists.
+       */
+      PatCfgNode getStart() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getStart(), this, result)
+      }
+
+      /**
+       * Holds if `getStart()` exists.
+       */
+      predicate hasStart() { exists(this.getStart()) }
+    }
+
+    final private class ParentRecordExpr extends ParentAstNode, RecordExpr {
+      override predicate relevantChild(AstNode child) { none() }
+    }
+
+    /**
+     * A record expression. For example:
+     * ```rust
+     * let first = Foo { a: 1, b: 2 };
+     * let second = Foo { a: 2, ..first };
+     * Foo { a: 1, b: 2 }[2] = 10;
+     * Foo { .. } = second;
+     * ```
+     */
+    final class RecordExprCfgNode extends CfgNodeFinal, ExprCfgNode {
+      private RecordExpr node;
+
+      RecordExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `RecordExpr`. */
+      RecordExpr getRecordExpr() { result = node }
+
+      /**
+       * Gets the path of this record expression, if it exists.
+       */
+      Path getPath() { result = node.getPath() }
+
+      /**
+       * Holds if `getPath()` exists.
+       */
+      predicate hasPath() { exists(this.getPath()) }
+
+      /**
+       * Gets the record expression field list of this record expression, if it exists.
+       */
+      RecordExprFieldList getRecordExprFieldList() { result = node.getRecordExprFieldList() }
+
+      /**
+       * Holds if `getRecordExprFieldList()` exists.
+       */
+      predicate hasRecordExprFieldList() { exists(this.getRecordExprFieldList()) }
+    }
+
+    final private class ParentRecordPat extends ParentAstNode, RecordPat {
+      override predicate relevantChild(AstNode child) { none() }
+    }
+
+    /**
+     * A record pattern. For example:
+     * ```rust
+     * match x {
+     *     Foo { a: 1, b: 2 } => "ok",
+     *     Foo { .. } => "fail",
+     * }
+     * ```
+     */
+    final class RecordPatCfgNode extends CfgNodeFinal, PatCfgNode {
+      private RecordPat node;
+
+      RecordPatCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `RecordPat`. */
+      RecordPat getRecordPat() { result = node }
+
+      /**
+       * Gets the path of this record pattern, if it exists.
+       */
+      Path getPath() { result = node.getPath() }
+
+      /**
+       * Holds if `getPath()` exists.
+       */
+      predicate hasPath() { exists(this.getPath()) }
+
+      /**
+       * Gets the record pattern field list of this record pattern, if it exists.
+       */
+      RecordPatFieldList getRecordPatFieldList() { result = node.getRecordPatFieldList() }
+
+      /**
+       * Holds if `getRecordPatFieldList()` exists.
+       */
+      predicate hasRecordPatFieldList() { exists(this.getRecordPatFieldList()) }
+    }
+
+    final private class ParentRefExpr extends ParentAstNode, RefExpr {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getExpr()
+      }
+    }
+
+    /**
+     * A reference expression. For example:
+     * ```rust
+     *     let ref_const = &foo;
+     *     let ref_mut = &mut foo;
+     *     let raw_const: &mut i32 = &raw const foo;
+     *     let raw_mut: &mut i32 = &raw mut foo;
+     * ```
+     */
+    final class RefExprCfgNode extends CfgNodeFinal, ExprCfgNode {
+      private RefExpr node;
+
+      RefExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `RefExpr`. */
+      RefExpr getRefExpr() { result = node }
+
+      /**
+       * Gets the `index`th attr of this reference expression (0-based).
+       */
+      Attr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this reference expression.
+       */
+      Attr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this reference expression.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+      /**
+       * Gets the expression of this reference expression, if it exists.
+       */
+      ExprCfgNode getExpr() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getExpr(), this, result)
+      }
+
+      /**
+       * Holds if `getExpr()` exists.
+       */
+      predicate hasExpr() { exists(this.getExpr()) }
+
+      /**
+       * Holds if this reference expression is const.
+       */
+      predicate isConst() { node.isConst() }
+
+      /**
+       * Holds if this reference expression is mut.
+       */
+      predicate isMut() { node.isMut() }
+
+      /**
+       * Holds if this reference expression is raw.
+       */
+      predicate isRaw() { node.isRaw() }
+    }
+
+    final private class ParentRefPat extends ParentAstNode, RefPat {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getPat()
+      }
+    }
+
+    /**
+     * A reference pattern. For example:
+     * ```rust
+     * match x {
+     *     &mut Option::Some(y) => y,
+     *     &Option::None => 0,
+     * };
+     * ```
+     */
+    final class RefPatCfgNode extends CfgNodeFinal, PatCfgNode {
+      private RefPat node;
+
+      RefPatCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `RefPat`. */
+      RefPat getRefPat() { result = node }
+
+      /**
+       * Holds if this reference pattern is mut.
+       */
+      predicate isMut() { node.isMut() }
+
+      /**
+       * Gets the pattern of this reference pattern, if it exists.
+       */
+      PatCfgNode getPat() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getPat(), this, result)
+      }
+
+      /**
+       * Holds if `getPat()` exists.
+       */
+      predicate hasPat() { exists(this.getPat()) }
+    }
+
+    final private class ParentRestPat extends ParentAstNode, RestPat {
+      override predicate relevantChild(AstNode child) { none() }
+    }
+
+    /**
+     * A RestPat. For example:
+     * ```rust
+     * todo!()
+     * ```
+     */
+    final class RestPatCfgNode extends CfgNodeFinal, PatCfgNode {
+      private RestPat node;
+
+      RestPatCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `RestPat`. */
+      RestPat getRestPat() { result = node }
+
+      /**
+       * Gets the `index`th attr of this rest pattern (0-based).
+       */
+      Attr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this rest pattern.
+       */
+      Attr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this rest pattern.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+    }
+
+    final private class ParentReturnExpr extends ParentAstNode, ReturnExpr {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getExpr()
+      }
+    }
+
+    /**
+     * A return expression. For example:
+     * ```rust
+     * fn some_value() -> i32 {
+     *     return 42;
+     * }
+     * ```
+     * ```rust
+     * fn no_value() -> () {
+     *     return;
+     * }
+     * ```
+     */
+    final class ReturnExprCfgNode extends CfgNodeFinal, ExprCfgNode {
+      private ReturnExpr node;
+
+      ReturnExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `ReturnExpr`. */
+      ReturnExpr getReturnExpr() { result = node }
+
+      /**
+       * Gets the `index`th attr of this return expression (0-based).
+       */
+      Attr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this return expression.
+       */
+      Attr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this return expression.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+      /**
+       * Gets the expression of this return expression, if it exists.
+       */
+      ExprCfgNode getExpr() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getExpr(), this, result)
+      }
+
+      /**
+       * Holds if `getExpr()` exists.
+       */
+      predicate hasExpr() { exists(this.getExpr()) }
+    }
+
+    final private class ParentSelfParam extends ParentAstNode, SelfParam {
+      override predicate relevantChild(AstNode child) { none() }
+    }
+
+    /**
+     * A `self` parameter. For example `self` in:
+     * ```rust
+     * fn push(&mut self, value: T) {
+     *   // ...
+     * }
+     * ```
+     */
+    final class SelfParamCfgNode extends CfgNodeFinal, ParamBaseCfgNode {
+      private SelfParam node;
+
+      SelfParamCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `SelfParam`. */
+      SelfParam getSelfParam() { result = node }
+
+      /**
+       * Holds if this self parameter is mut.
+       */
+      predicate isMut() { node.isMut() }
+
+      /**
+       * Gets the lifetime of this self parameter, if it exists.
+       */
+      Lifetime getLifetime() { result = node.getLifetime() }
+
+      /**
+       * Holds if `getLifetime()` exists.
+       */
+      predicate hasLifetime() { exists(this.getLifetime()) }
+
+      /**
+       * Gets the name of this self parameter, if it exists.
+       */
+      Name getName() { result = node.getName() }
+
+      /**
+       * Holds if `getName()` exists.
+       */
+      predicate hasName() { exists(this.getName()) }
+    }
+
+    final private class ParentSlicePat extends ParentAstNode, SlicePat {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getPat(_)
+      }
+    }
+
+    /**
+     * A slice pattern. For example:
+     * ```rust
+     * match x {
+     *     [1, 2, 3, 4, 5] => "ok",
+     *     [1, 2, ..] => "fail",
+     *     [x, y, .., z, 7] => "fail",
+     * }
+     * ```
+     */
+    final class SlicePatCfgNode extends CfgNodeFinal, PatCfgNode {
+      private SlicePat node;
+
+      SlicePatCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `SlicePat`. */
+      SlicePat getSlicePat() { result = node }
+
+      /**
+       * Gets the `index`th pattern of this slice pattern (0-based).
+       */
+      PatCfgNode getPat(int index) {
+        any(ChildMapping mapping).hasCfgChild(node, node.getPat(index), this, result)
+      }
+
+      /**
+       * Gets any of the patterns of this slice pattern.
+       */
+      PatCfgNode getAPat() { result = this.getPat(_) }
+
+      /**
+       * Gets the number of patterns of this slice pattern.
+       */
+      int getNumberOfPats() { result = count(int i | exists(this.getPat(i))) }
+    }
+
+    final private class ParentTryExpr extends ParentAstNode, TryExpr {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getExpr()
+      }
+    }
+
+    /**
+     * A TryExpr. For example:
+     * ```rust
+     * todo!()
+     * ```
+     */
+    final class TryExprCfgNode extends CfgNodeFinal, ExprCfgNode {
+      private TryExpr node;
+
+      TryExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `TryExpr`. */
+      TryExpr getTryExpr() { result = node }
+
+      /**
+       * Gets the `index`th attr of this try expression (0-based).
+       */
+      Attr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this try expression.
+       */
+      Attr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this try expression.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+      /**
+       * Gets the expression of this try expression, if it exists.
+       */
+      ExprCfgNode getExpr() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getExpr(), this, result)
+      }
+
+      /**
+       * Holds if `getExpr()` exists.
+       */
+      predicate hasExpr() { exists(this.getExpr()) }
+    }
+
+    final private class ParentTupleExpr extends ParentAstNode, TupleExpr {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getField(_)
+      }
+    }
+
+    /**
+     * A tuple expression. For example:
+     * ```rust
+     * (1, "one");
+     * (2, "two")[0] = 3;
+     * ```
+     */
+    final class TupleExprCfgNode extends CfgNodeFinal, ExprCfgNode {
+      private TupleExpr node;
+
+      TupleExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `TupleExpr`. */
+      TupleExpr getTupleExpr() { result = node }
+
+      /**
+       * Gets the `index`th attr of this tuple expression (0-based).
+       */
+      Attr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this tuple expression.
+       */
+      Attr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this tuple expression.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+      /**
+       * Gets the `index`th field of this tuple expression (0-based).
+       */
+      ExprCfgNode getField(int index) {
+        any(ChildMapping mapping).hasCfgChild(node, node.getField(index), this, result)
+      }
+
+      /**
+       * Gets any of the fields of this tuple expression.
+       */
+      ExprCfgNode getAField() { result = this.getField(_) }
+
+      /**
+       * Gets the number of fields of this tuple expression.
+       */
+      int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
+    }
+
+    final private class ParentTuplePat extends ParentAstNode, TuplePat {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getField(_)
+      }
+    }
+
+    /**
+     * A tuple pattern. For example:
+     * ```rust
+     * let (x, y) = (1, 2);
+     * let (a, b, ..,  z) = (1, 2, 3, 4, 5);
+     * ```
+     */
+    final class TuplePatCfgNode extends CfgNodeFinal, PatCfgNode {
+      private TuplePat node;
+
+      TuplePatCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `TuplePat`. */
+      TuplePat getTuplePat() { result = node }
+
+      /**
+       * Gets the `index`th field of this tuple pattern (0-based).
+       */
+      PatCfgNode getField(int index) {
+        any(ChildMapping mapping).hasCfgChild(node, node.getField(index), this, result)
+      }
+
+      /**
+       * Gets any of the fields of this tuple pattern.
+       */
+      PatCfgNode getAField() { result = this.getField(_) }
+
+      /**
+       * Gets the number of fields of this tuple pattern.
+       */
+      int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
+    }
+
+    final private class ParentTupleStructPat extends ParentAstNode, TupleStructPat {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getField(_)
+      }
+    }
+
+    /**
+     * A tuple struct pattern. For example:
+     * ```rust
+     * match x {
+     *     Tuple("a", 1, 2, 3) => "great",
+     *     Tuple(.., 3) => "fine",
+     *     Tuple(..) => "fail",
+     * };
+     * ```
+     */
+    final class TupleStructPatCfgNode extends CfgNodeFinal, PatCfgNode {
+      private TupleStructPat node;
+
+      TupleStructPatCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `TupleStructPat`. */
+      TupleStructPat getTupleStructPat() { result = node }
+
+      /**
+       * Gets the `index`th field of this tuple struct pattern (0-based).
+       */
+      PatCfgNode getField(int index) {
+        any(ChildMapping mapping).hasCfgChild(node, node.getField(index), this, result)
+      }
+
+      /**
+       * Gets any of the fields of this tuple struct pattern.
+       */
+      PatCfgNode getAField() { result = this.getField(_) }
+
+      /**
+       * Gets the number of fields of this tuple struct pattern.
+       */
+      int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
+
+      /**
+       * Gets the path of this tuple struct pattern, if it exists.
+       */
+      Path getPath() { result = node.getPath() }
+
+      /**
+       * Holds if `getPath()` exists.
+       */
+      predicate hasPath() { exists(this.getPath()) }
+    }
+
+    final private class ParentUnderscoreExpr extends ParentAstNode, UnderscoreExpr {
+      override predicate relevantChild(AstNode child) { none() }
+    }
+
+    /**
+     * An underscore expression. For example:
+     * ```rust
+     * _ = 42;
+     * ```
+     */
+    final class UnderscoreExprCfgNode extends CfgNodeFinal, ExprCfgNode {
+      private UnderscoreExpr node;
+
+      UnderscoreExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `UnderscoreExpr`. */
+      UnderscoreExpr getUnderscoreExpr() { result = node }
+
+      /**
+       * Gets the `index`th attr of this underscore expression (0-based).
+       */
+      Attr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this underscore expression.
+       */
+      Attr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this underscore expression.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+    }
+
+    final private class ParentWhileExpr extends ParentAstNode, WhileExpr {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getCondition()
+      }
+    }
+
+    /**
+     * A WhileExpr. For example:
+     * ```rust
+     * todo!()
+     * ```
+     */
+    final class WhileExprCfgNode extends CfgNodeFinal, LoopingExprCfgNode {
+      private WhileExpr node;
+
+      WhileExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `WhileExpr`. */
+      WhileExpr getWhileExpr() { result = node }
+
+      /**
+       * Gets the `index`th attr of this while expression (0-based).
+       */
+      Attr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this while expression.
+       */
+      Attr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this while expression.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+      /**
+       * Gets the condition of this while expression, if it exists.
+       */
+      ExprCfgNode getCondition() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getCondition(), this, result)
+      }
+
+      /**
+       * Holds if `getCondition()` exists.
+       */
+      predicate hasCondition() { exists(this.getCondition()) }
+    }
+
+    final private class ParentWildcardPat extends ParentAstNode, WildcardPat {
+      override predicate relevantChild(AstNode child) { none() }
+    }
+
+    /**
+     * A wildcard pattern. For example:
+     * ```rust
+     * let _ = 42;
+     * ```
+     */
+    final class WildcardPatCfgNode extends CfgNodeFinal, PatCfgNode {
+      private WildcardPat node;
+
+      WildcardPatCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `WildcardPat`. */
+      WildcardPat getWildcardPat() { result = node }
+    }
+
+    final private class ParentYeetExpr extends ParentAstNode, YeetExpr {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getExpr()
+      }
+    }
+
+    /**
+     * A `yeet` expression. For example:
+     * ```rust
+     * if x < size {
+     *    do yeet "index out of bounds";
+     * }
+     * ```
+     */
+    final class YeetExprCfgNode extends CfgNodeFinal, ExprCfgNode {
+      private YeetExpr node;
+
+      YeetExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `YeetExpr`. */
+      YeetExpr getYeetExpr() { result = node }
+
+      /**
+       * Gets the `index`th attr of this yeet expression (0-based).
+       */
+      Attr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this yeet expression.
+       */
+      Attr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this yeet expression.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+      /**
+       * Gets the expression of this yeet expression, if it exists.
+       */
+      ExprCfgNode getExpr() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getExpr(), this, result)
+      }
+
+      /**
+       * Holds if `getExpr()` exists.
+       */
+      predicate hasExpr() { exists(this.getExpr()) }
+    }
+
+    final private class ParentYieldExpr extends ParentAstNode, YieldExpr {
+      override predicate relevantChild(AstNode child) {
+        none()
+        or
+        child = this.getExpr()
+      }
+    }
+
+    /**
+     * A `yield` expression. For example:
+     * ```rust
+     * let one = #[coroutine]
+     *     || {
+     *         yield 1;
+     *     };
+     * ```
+     */
+    final class YieldExprCfgNode extends CfgNodeFinal, ExprCfgNode {
+      private YieldExpr node;
+
+      YieldExprCfgNode() { node = this.getAstNode() }
+
+      /** Gets the underlying `YieldExpr`. */
+      YieldExpr getYieldExpr() { result = node }
+
+      /**
+       * Gets the `index`th attr of this yield expression (0-based).
+       */
+      Attr getAttr(int index) { result = node.getAttr(index) }
+
+      /**
+       * Gets any of the attrs of this yield expression.
+       */
+      Attr getAnAttr() { result = this.getAttr(_) }
+
+      /**
+       * Gets the number of attrs of this yield expression.
+       */
+      int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+      /**
+       * Gets the expression of this yield expression, if it exists.
+       */
+      ExprCfgNode getExpr() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getExpr(), this, result)
+      }
+
+      /**
+       * Holds if `getExpr()` exists.
+       */
+      predicate hasExpr() { exists(this.getExpr()) }
+    }
+  }
+
+  module Consistency {
+    private predicate hasCfgNode(AstNode astNode) { astNode = any(CfgNode cfgNode).getAstNode() }
+
+    query predicate missingCfgChild(CfgNode parent, string pred, int i, AstNode child) {
+      none()
+      or
+      pred = "getExpr" and
+      parent =
+        any(Nodes::ArrayExprCfgNode cfgNode, ArrayExpr astNode |
+          astNode = cfgNode.getArrayExpr() and
+          child = getDesugared(astNode.getExpr(i)) and
+          hasCfgNode(child) and
+          not child = cfgNode.getExpr(i).getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getRepeatOperand" and
+      parent =
+        any(Nodes::ArrayRepeatExprCfgNode cfgNode, ArrayRepeatExpr astNode |
+          astNode = cfgNode.getArrayRepeatExpr() and
+          child = getDesugared(astNode.getRepeatOperand()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getRepeatOperand().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getRepeatLength" and
+      parent =
+        any(Nodes::ArrayRepeatExprCfgNode cfgNode, ArrayRepeatExpr astNode |
+          astNode = cfgNode.getArrayRepeatExpr() and
+          child = getDesugared(astNode.getRepeatLength()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getRepeatLength().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getExpr" and
+      parent =
+        any(Nodes::AsmExprCfgNode cfgNode, AsmExpr astNode |
+          astNode = cfgNode.getAsmExpr() and
+          child = getDesugared(astNode.getExpr()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getExpr().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getExpr" and
+      parent =
+        any(Nodes::AwaitExprCfgNode cfgNode, AwaitExpr astNode |
+          astNode = cfgNode.getAwaitExpr() and
+          child = getDesugared(astNode.getExpr()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getExpr().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getExpr" and
+      parent =
+        any(Nodes::BecomeExprCfgNode cfgNode, BecomeExpr astNode |
+          astNode = cfgNode.getBecomeExpr() and
+          child = getDesugared(astNode.getExpr()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getExpr().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getLhs" and
+      parent =
+        any(Nodes::BinaryExprCfgNode cfgNode, BinaryExpr astNode |
+          astNode = cfgNode.getBinaryExpr() and
+          child = getDesugared(astNode.getLhs()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getLhs().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getRhs" and
+      parent =
+        any(Nodes::BinaryExprCfgNode cfgNode, BinaryExpr astNode |
+          astNode = cfgNode.getBinaryExpr() and
+          child = getDesugared(astNode.getRhs()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getRhs().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getPat" and
+      parent =
+        any(Nodes::BoxPatCfgNode cfgNode, BoxPat astNode |
+          astNode = cfgNode.getBoxPat() and
+          child = getDesugared(astNode.getPat()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getPat().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getExpr" and
+      parent =
+        any(Nodes::BreakExprCfgNode cfgNode, BreakExpr astNode |
+          astNode = cfgNode.getBreakExpr() and
+          child = getDesugared(astNode.getExpr()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getExpr().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getFunction" and
+      parent =
+        any(Nodes::CallExprCfgNode cfgNode, CallExpr astNode |
+          astNode = cfgNode.getCallExpr() and
+          child = getDesugared(astNode.getFunction()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getFunction().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getBlockExpr" and
+      parent =
+        any(Nodes::ConstBlockPatCfgNode cfgNode, ConstBlockPat astNode |
+          astNode = cfgNode.getConstBlockPat() and
+          child = getDesugared(astNode.getBlockExpr()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getBlockExpr().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getExpr" and
+      parent =
+        any(Nodes::FieldExprCfgNode cfgNode, FieldExpr astNode |
+          astNode = cfgNode.getFieldExpr() and
+          child = getDesugared(astNode.getExpr()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getExpr().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getIterable" and
+      parent =
+        any(Nodes::ForExprCfgNode cfgNode, ForExpr astNode |
+          astNode = cfgNode.getForExpr() and
+          child = getDesugared(astNode.getIterable()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getIterable().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getPat" and
+      parent =
+        any(Nodes::ForExprCfgNode cfgNode, ForExpr astNode |
+          astNode = cfgNode.getForExpr() and
+          child = getDesugared(astNode.getPat()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getPat().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getTemplate" and
+      parent =
+        any(Nodes::FormatArgsExprCfgNode cfgNode, FormatArgsExpr astNode |
+          astNode = cfgNode.getFormatArgsExpr() and
+          child = getDesugared(astNode.getTemplate()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getTemplate().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getPat" and
+      parent =
+        any(Nodes::IdentPatCfgNode cfgNode, IdentPat astNode |
+          astNode = cfgNode.getIdentPat() and
+          child = getDesugared(astNode.getPat()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getPat().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getCondition" and
+      parent =
+        any(Nodes::IfExprCfgNode cfgNode, IfExpr astNode |
+          astNode = cfgNode.getIfExpr() and
+          child = getDesugared(astNode.getCondition()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getCondition().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getElse" and
+      parent =
+        any(Nodes::IfExprCfgNode cfgNode, IfExpr astNode |
+          astNode = cfgNode.getIfExpr() and
+          child = getDesugared(astNode.getElse()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getElse().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getThen" and
+      parent =
+        any(Nodes::IfExprCfgNode cfgNode, IfExpr astNode |
+          astNode = cfgNode.getIfExpr() and
+          child = getDesugared(astNode.getThen()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getThen().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getBase" and
+      parent =
+        any(Nodes::IndexExprCfgNode cfgNode, IndexExpr astNode |
+          astNode = cfgNode.getIndexExpr() and
+          child = getDesugared(astNode.getBase()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getBase().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getIndex" and
+      parent =
+        any(Nodes::IndexExprCfgNode cfgNode, IndexExpr astNode |
+          astNode = cfgNode.getIndexExpr() and
+          child = getDesugared(astNode.getIndex()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getIndex().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getScrutinee" and
+      parent =
+        any(Nodes::LetExprCfgNode cfgNode, LetExpr astNode |
+          astNode = cfgNode.getLetExpr() and
+          child = getDesugared(astNode.getScrutinee()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getScrutinee().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getPat" and
+      parent =
+        any(Nodes::LetExprCfgNode cfgNode, LetExpr astNode |
+          astNode = cfgNode.getLetExpr() and
+          child = getDesugared(astNode.getPat()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getPat().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getInitializer" and
+      parent =
+        any(Nodes::LetStmtCfgNode cfgNode, LetStmt astNode |
+          astNode = cfgNode.getLetStmt() and
+          child = getDesugared(astNode.getInitializer()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getInitializer().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getPat" and
+      parent =
+        any(Nodes::LetStmtCfgNode cfgNode, LetStmt astNode |
+          astNode = cfgNode.getLetStmt() and
+          child = getDesugared(astNode.getPat()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getPat().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getLiteral" and
+      parent =
+        any(Nodes::LiteralPatCfgNode cfgNode, LiteralPat astNode |
+          astNode = cfgNode.getLiteralPat() and
+          child = getDesugared(astNode.getLiteral()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getLiteral().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getLoopBody" and
+      parent =
+        any(Nodes::LoopingExprCfgNode cfgNode, LoopingExpr astNode |
+          astNode = cfgNode.getLoopingExpr() and
+          child = getDesugared(astNode.getLoopBody()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getLoopBody().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getMacroCall" and
+      parent =
+        any(Nodes::MacroExprCfgNode cfgNode, MacroExpr astNode |
+          astNode = cfgNode.getMacroExpr() and
+          child = getDesugared(astNode.getMacroCall()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getMacroCall().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getMacroCall" and
+      parent =
+        any(Nodes::MacroPatCfgNode cfgNode, MacroPat astNode |
+          astNode = cfgNode.getMacroPat() and
+          child = getDesugared(astNode.getMacroCall()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getMacroCall().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getScrutinee" and
+      parent =
+        any(Nodes::MatchExprCfgNode cfgNode, MatchExpr astNode |
+          astNode = cfgNode.getMatchExpr() and
+          child = getDesugared(astNode.getScrutinee()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getScrutinee().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getReceiver" and
+      parent =
+        any(Nodes::MethodCallExprCfgNode cfgNode, MethodCallExpr astNode |
+          astNode = cfgNode.getMethodCallExpr() and
+          child = getDesugared(astNode.getReceiver()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getReceiver().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getPat" and
+      parent =
+        any(Nodes::OrPatCfgNode cfgNode, OrPat astNode |
+          astNode = cfgNode.getOrPat() and
+          child = getDesugared(astNode.getPat(i)) and
+          hasCfgNode(child) and
+          not child = cfgNode.getPat(i).getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getPat" and
+      parent =
+        any(Nodes::ParamCfgNode cfgNode, Param astNode |
+          astNode = cfgNode.getParam() and
+          child = getDesugared(astNode.getPat()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getPat().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getExpr" and
+      parent =
+        any(Nodes::PrefixExprCfgNode cfgNode, PrefixExpr astNode |
+          astNode = cfgNode.getPrefixExpr() and
+          child = getDesugared(astNode.getExpr()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getExpr().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getEnd" and
+      parent =
+        any(Nodes::RangeExprCfgNode cfgNode, RangeExpr astNode |
+          astNode = cfgNode.getRangeExpr() and
+          child = getDesugared(astNode.getEnd()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getEnd().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getStart" and
+      parent =
+        any(Nodes::RangeExprCfgNode cfgNode, RangeExpr astNode |
+          astNode = cfgNode.getRangeExpr() and
+          child = getDesugared(astNode.getStart()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getStart().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getEnd" and
+      parent =
+        any(Nodes::RangePatCfgNode cfgNode, RangePat astNode |
+          astNode = cfgNode.getRangePat() and
+          child = getDesugared(astNode.getEnd()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getEnd().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getStart" and
+      parent =
+        any(Nodes::RangePatCfgNode cfgNode, RangePat astNode |
+          astNode = cfgNode.getRangePat() and
+          child = getDesugared(astNode.getStart()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getStart().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getExpr" and
+      parent =
+        any(Nodes::RefExprCfgNode cfgNode, RefExpr astNode |
+          astNode = cfgNode.getRefExpr() and
+          child = getDesugared(astNode.getExpr()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getExpr().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getPat" and
+      parent =
+        any(Nodes::RefPatCfgNode cfgNode, RefPat astNode |
+          astNode = cfgNode.getRefPat() and
+          child = getDesugared(astNode.getPat()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getPat().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getExpr" and
+      parent =
+        any(Nodes::ReturnExprCfgNode cfgNode, ReturnExpr astNode |
+          astNode = cfgNode.getReturnExpr() and
+          child = getDesugared(astNode.getExpr()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getExpr().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getPat" and
+      parent =
+        any(Nodes::SlicePatCfgNode cfgNode, SlicePat astNode |
+          astNode = cfgNode.getSlicePat() and
+          child = getDesugared(astNode.getPat(i)) and
+          hasCfgNode(child) and
+          not child = cfgNode.getPat(i).getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getExpr" and
+      parent =
+        any(Nodes::TryExprCfgNode cfgNode, TryExpr astNode |
+          astNode = cfgNode.getTryExpr() and
+          child = getDesugared(astNode.getExpr()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getExpr().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getField" and
+      parent =
+        any(Nodes::TupleExprCfgNode cfgNode, TupleExpr astNode |
+          astNode = cfgNode.getTupleExpr() and
+          child = getDesugared(astNode.getField(i)) and
+          hasCfgNode(child) and
+          not child = cfgNode.getField(i).getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getField" and
+      parent =
+        any(Nodes::TuplePatCfgNode cfgNode, TuplePat astNode |
+          astNode = cfgNode.getTuplePat() and
+          child = getDesugared(astNode.getField(i)) and
+          hasCfgNode(child) and
+          not child = cfgNode.getField(i).getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getField" and
+      parent =
+        any(Nodes::TupleStructPatCfgNode cfgNode, TupleStructPat astNode |
+          astNode = cfgNode.getTupleStructPat() and
+          child = getDesugared(astNode.getField(i)) and
+          hasCfgNode(child) and
+          not child = cfgNode.getField(i).getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getCondition" and
+      parent =
+        any(Nodes::WhileExprCfgNode cfgNode, WhileExpr astNode |
+          astNode = cfgNode.getWhileExpr() and
+          child = getDesugared(astNode.getCondition()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getCondition().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getExpr" and
+      parent =
+        any(Nodes::YeetExprCfgNode cfgNode, YeetExpr astNode |
+          astNode = cfgNode.getYeetExpr() and
+          child = getDesugared(astNode.getExpr()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getExpr().getAstNode()
+        |
+          cfgNode
+        )
+      or
+      pred = "getExpr" and
+      parent =
+        any(Nodes::YieldExprCfgNode cfgNode, YieldExpr astNode |
+          astNode = cfgNode.getYieldExpr() and
+          child = getDesugared(astNode.getExpr()) and
+          i = -1 and
+          hasCfgNode(child) and
+          not child = cfgNode.getExpr().getAstNode()
+        |
+          cfgNode
+        )
+    }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/dataflow/DataFlow.qll b/rust/ql/lib/codeql/rust/dataflow/DataFlow.qll
index 3a09df2c45d..310c6eceee1 100644
--- a/rust/ql/lib/codeql/rust/dataflow/DataFlow.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/DataFlow.qll
@@ -15,10 +15,23 @@ private import DataFlowImpl::Node as Node
 module DataFlow {
   final class Node = Node::Node;
 
-  final class ParameterNode = Node::ParameterNode;
+  /**
+   * The value of a parameter at function entry, viewed as a node in a data
+   * flow graph.
+   */
+  final class ParameterNode extends Node instanceof Node::SourceParameterNode {
+    /** Gets the parameter that this node corresponds to. */
+    ParamBase getParameter() { result = super.getParameter().getParamBase() }
+  }
 
   final class PostUpdateNode = Node::PostUpdateNode;
 
+  final class Content = DataFlowImpl::Content;
+
+  final class VariantContent = DataFlowImpl::VariantContent;
+
+  final class ContentSet = DataFlowImpl::ContentSet;
+
   /**
    * Holds if data flows from `nodeFrom` to `nodeTo` in exactly one local
    * (intra-procedural) step.
diff --git a/rust/ql/lib/codeql/rust/dataflow/FlowSummary.qll b/rust/ql/lib/codeql/rust/dataflow/FlowSummary.qll
new file mode 100644
index 00000000000..f0457c960ce
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/dataflow/FlowSummary.qll
@@ -0,0 +1,69 @@
+/** Provides classes and predicates for defining flow summaries. */
+
+private import rust
+private import internal.FlowSummaryImpl as Impl
+private import codeql.rust.elements.internal.CallExprBaseImpl::Impl as CallExprBaseImpl
+
+// import all instances below
+private module Summaries {
+  private import codeql.rust.Frameworks
+
+  // TODO: Use models-as-data when it's available
+  private class UnwrapSummary extends SummarizedCallable::Range {
+    UnwrapSummary() { this = "lang:core::_::<crate::option::Option>::unwrap" }
+
+    override predicate propagatesFlow(string input, string output, boolean preservesValue) {
+      input = "Argument[self].Variant[crate::option::Option::Some(0)]" and
+      output = "ReturnValue" and
+      preservesValue = true
+    }
+  }
+}
+
+/** Provides the `Range` class used to define the extent of `LibraryCallable`. */
+module LibraryCallable {
+  /** A callable defined in library code, identified by a unique string. */
+  abstract class Range extends string {
+    bindingset[this]
+    Range() { any() }
+
+    /** Gets a call to this library callable. */
+    CallExprBase getACall() {
+      exists(Resolvable r, string crate |
+        r = CallExprBaseImpl::getCallResolvable(result) and
+        this = crate + r.getResolvedPath()
+      |
+        crate = r.getResolvedCrateOrigin() + "::_::"
+        or
+        not r.hasResolvedCrateOrigin() and
+        crate = ""
+      )
+    }
+  }
+}
+
+final class LibraryCallable = LibraryCallable::Range;
+
+/** Provides the `Range` class used to define the extent of `SummarizedCallable`. */
+module SummarizedCallable {
+  /** A callable with a flow summary, identified by a unique string. */
+  abstract class Range extends LibraryCallable::Range, Impl::Public::SummarizedCallable {
+    bindingset[this]
+    Range() { any() }
+
+    override predicate propagatesFlow(
+      string input, string output, boolean preservesValue, string model
+    ) {
+      this.propagatesFlow(input, output, preservesValue) and model = ""
+    }
+
+    /**
+     * Holds if data may flow from `input` to `output` through this callable.
+     *
+     * `preservesValue` indicates whether this is a value-preserving step or a taint-step.
+     */
+    abstract predicate propagatesFlow(string input, string output, boolean preservesValue);
+  }
+}
+
+final class SummarizedCallable = SummarizedCallable::Range;
diff --git a/rust/ql/lib/codeql/rust/dataflow/Ssa.qll b/rust/ql/lib/codeql/rust/dataflow/Ssa.qll
index ff1aae058aa..5b452a329fa 100644
--- a/rust/ql/lib/codeql/rust/dataflow/Ssa.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/Ssa.qll
@@ -9,6 +9,7 @@ module Ssa {
   private import rust
   private import codeql.rust.controlflow.BasicBlocks
   private import codeql.rust.controlflow.ControlFlowGraph
+  private import codeql.rust.controlflow.CfgNodes
   private import codeql.rust.controlflow.internal.ControlFlowGraphImpl as CfgImpl
   private import internal.SsaImpl as SsaImpl
 
@@ -26,7 +27,7 @@ module Ssa {
     }
 
     /**
-     * Gets a control-flow node that reads the value of this SSA definition.
+     * Gets a control flow node that reads the value of this SSA definition.
      *
      * Example:
      *
@@ -53,7 +54,7 @@ module Ssa {
     final CfgNode getARead() { result = SsaImpl::getARead(this) }
 
     /**
-     * Gets a first control-flow node that reads the value of this SSA definition.
+     * Gets a first control flow node that reads the value of this SSA definition.
      * That is, a read that can be reached from this definition without passing
      * through other reads.
      *
@@ -82,7 +83,7 @@ module Ssa {
     final CfgNode getAFirstRead() { SsaImpl::firstRead(this, result) }
 
     /**
-     * Gets a last control-flow node that reads the value of this SSA definition.
+     * Gets a last control flow node that reads the value of this SSA definition.
      * That is, a read that can reach the end of the enclosing CFG scope, or another
      * SSA definition for the source variable, without passing through any other read.
      *
@@ -221,11 +222,11 @@ module Ssa {
      * end
      * ```
      */
-    predicate assigns(CfgNode value) {
-      exists(AssignmentExpr ae, BasicBlock bb, int i |
+    predicate assigns(ExprCfgNode value) {
+      exists(AssignmentExprCfgNode ae, BasicBlock bb, int i |
         this.definesAt(_, bb, i) and
-        ae.getLhs() = bb.getNode(i).getAstNode() and
-        value.getAstNode() = ae.getRhs()
+        ae.getLhs() = bb.getNode(i) and
+        value = ae.getRhs()
       )
     }
 
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowConsistency.qll b/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowConsistency.qll
new file mode 100644
index 00000000000..17b74ee2884
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowConsistency.qll
@@ -0,0 +1,17 @@
+import codeql.rust.dataflow.DataFlow::DataFlow as DataFlow
+private import rust
+private import codeql.rust.dataflow.internal.DataFlowImpl
+private import codeql.rust.dataflow.internal.TaintTrackingImpl
+private import codeql.dataflow.internal.DataFlowImplConsistency
+
+private module Input implements InputSig<Location, RustDataFlow> {
+  predicate uniqueNodeLocationExclude(RustDataFlow::Node n) {
+    // Exclude nodes where the missing location can be explained by the
+    // underlying AST node not having a location.
+    not exists(n.asExpr().getLocation())
+  }
+
+  predicate missingLocationExclude(RustDataFlow::Node n) { not exists(n.asExpr().getLocation()) }
+}
+
+import MakeConsistency<Location, RustDataFlow, RustTaintTracking, Input>
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll
index c31ef9e8107..04d1e82d2a2 100644
--- a/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll
@@ -11,8 +11,8 @@ private import SsaImpl as SsaImpl
 private import codeql.rust.controlflow.ControlFlowGraph
 private import codeql.rust.controlflow.CfgNodes
 private import codeql.rust.dataflow.Ssa
-
-private newtype TReturnKind = TNormalReturnKind()
+private import codeql.rust.dataflow.FlowSummary
+private import FlowSummaryImpl as FlowSummaryImpl
 
 /**
  * A return kind. A return kind describes how a value can be returned from a
@@ -35,30 +35,92 @@ final class DataFlowCallable extends TDataFlowCallable {
    */
   CfgScope asCfgScope() { this = TCfgScope(result) }
 
+  /**
+   * Gets the underlying library callable, if any.
+   */
+  LibraryCallable asLibraryCallable() { this = TLibraryCallable(result) }
+
   /** Gets a textual representation of this callable. */
-  string toString() { result = this.asCfgScope().toString() }
+  string toString() { result = [this.asCfgScope().toString(), this.asLibraryCallable().toString()] }
 
   /** Gets the location of this callable. */
   Location getLocation() { result = this.asCfgScope().getLocation() }
 }
 
 final class DataFlowCall extends TDataFlowCall {
+  private CallExprBaseCfgNode call;
+
+  DataFlowCall() { this = TCall(call) }
+
   /** Gets the underlying call in the CFG, if any. */
-  CallExprCfgNode asCallExprCfgNode() { this = TNormalCall(result) }
+  CallExprCfgNode asCallExprCfgNode() { result = call }
 
-  MethodCallExprCfgNode asMethodCallExprCfgNode() { this = TMethodCall(result) }
+  MethodCallExprCfgNode asMethodCallExprCfgNode() { result = call }
 
-  ExprCfgNode asExprCfgNode() {
-    result = this.asCallExprCfgNode() or result = this.asMethodCallExprCfgNode()
+  CallExprBaseCfgNode asCallBaseExprCfgNode() { result = call }
+
+  predicate isSummaryCall(
+    FlowSummaryImpl::Public::SummarizedCallable c, FlowSummaryImpl::Private::SummaryNode receiver
+  ) {
+    this = TSummaryCall(c, receiver)
   }
 
   DataFlowCallable getEnclosingCallable() {
-    result = TCfgScope(this.asExprCfgNode().getExpr().getEnclosingCfgScope())
+    result = TCfgScope(call.getExpr().getEnclosingCfgScope())
+    or
+    exists(FlowSummaryImpl::Public::SummarizedCallable c |
+      this.isSummaryCall(c, _) and
+      result = TLibraryCallable(c)
+    )
   }
 
-  string toString() { result = this.asExprCfgNode().toString() }
+  string toString() {
+    result = this.asCallBaseExprCfgNode().toString()
+    or
+    exists(
+      FlowSummaryImpl::Public::SummarizedCallable c, FlowSummaryImpl::Private::SummaryNode receiver
+    |
+      this.isSummaryCall(c, receiver) and
+      result = "[summary] call to " + receiver + " in " + c
+    )
+  }
 
-  Location getLocation() { result = this.asExprCfgNode().getLocation() }
+  Location getLocation() { result = this.asCallBaseExprCfgNode().getLocation() }
+}
+
+/**
+ * The position of a parameter or an argument in a function or call.
+ *
+ * As there is a 1-to-1 correspondence between parameter positions and
+ * arguments positions in Rust we use the same type for both.
+ */
+final class ParameterPosition extends TParameterPosition {
+  /** Gets the underlying integer position, if any. */
+  int getPosition() { this = TPositionalParameterPosition(result) }
+
+  /** Holds if this position represents the `self` position. */
+  predicate isSelf() { this = TSelfParameterPosition() }
+
+  /** Gets a textual representation of this position. */
+  string toString() {
+    result = this.getPosition().toString()
+    or
+    result = "self" and this.isSelf()
+  }
+
+  ParamBase getParameterIn(ParamList ps) {
+    result = ps.getParam(this.getPosition())
+    or
+    result = ps.getSelfParam() and this.isSelf()
+  }
+}
+
+/** Holds if `arg` is an argument of `call` at the position `pos`. */
+private predicate isArgumentForCall(ExprCfgNode arg, CallExprBaseCfgNode call, ParameterPosition pos) {
+  arg = call.getArgument(pos.getPosition())
+  or
+  // The self argument in a method call.
+  arg = call.(MethodCallExprCfgNode).getReceiver() and pos.isSelf()
 }
 
 module Node {
@@ -76,7 +138,12 @@ module Node {
     /**
      * Gets the expression that corresponds to this node, if any.
      */
-    Expr asExpr() { none() }
+    ExprCfgNode asExpr() { none() }
+
+    /**
+     * Gets the pattern that corresponds to this node, if any.
+     */
+    PatCfgNode asPat() { none() }
 
     /** Gets the enclosing callable. */
     DataFlowCallable getEnclosingCallable() { result = TCfgScope(this.getCfgScope()) }
@@ -93,11 +160,6 @@ module Node {
      * Gets this node's underlying SSA definition, if any.
      */
     Ssa::Definition asDefinition() { none() }
-
-    /**
-     * Gets the parameter that corresponds to this node, if any.
-     */
-    Param asParameter() { none() }
   }
 
   /** A node type that is not implemented. */
@@ -111,24 +173,44 @@ module Node {
     override Location getLocation() { none() }
   }
 
-  /** A data flow node that corresponds to a CFG node for an AST node. */
+  /** A data flow node used to model flow summaries. */
+  class FlowSummaryNode extends Node, TFlowSummaryNode {
+    FlowSummaryImpl::Private::SummaryNode getSummaryNode() { this = TFlowSummaryNode(result) }
+
+    /** Gets the summarized callable that this node belongs to. */
+    FlowSummaryImpl::Public::SummarizedCallable getSummarizedCallable() {
+      result = this.getSummaryNode().getSummarizedCallable()
+    }
+
+    override CfgScope getCfgScope() { none() }
+
+    override DataFlowCallable getEnclosingCallable() {
+      result.asLibraryCallable() = this.getSummarizedCallable()
+    }
+
+    override EmptyLocation getLocation() { any() }
+
+    override string toString() { result = this.getSummaryNode().toString() }
+  }
+
+  /** A data flow node that corresponds directly to a CFG node for an AST node. */
   abstract class AstCfgFlowNode extends Node {
     AstCfgNode n;
 
-    override CfgNode getCfgNode() { result = n }
+    final override CfgNode getCfgNode() { result = n }
 
-    override CfgScope getCfgScope() { result = n.getAstNode().getEnclosingCfgScope() }
+    final override CfgScope getCfgScope() { result = n.getAstNode().getEnclosingCfgScope() }
 
-    override Location getLocation() { result = n.getAstNode().getLocation() }
+    final override Location getLocation() { result = n.getAstNode().getLocation() }
 
-    override string toString() { result = n.getAstNode().toString() }
+    final override string toString() { result = n.getAstNode().toString() }
   }
 
   /**
    * A node in the data flow graph that corresponds to an expression in the
    * AST.
    *
-   * Note that because of control-flow splitting, one `Expr` may correspond
+   * Note that because of control flow splitting, one `Expr` may correspond
    * to multiple `ExprNode`s, just like it may correspond to multiple
    * `ControlFlow::Node`s.
    */
@@ -137,7 +219,7 @@ module Node {
 
     ExprNode() { this = TExprNode(n) }
 
-    override Expr asExpr() { result = n.getExpr() }
+    override ExprCfgNode asExpr() { result = n }
   }
 
   final class PatNode extends AstCfgFlowNode, TPatNode {
@@ -145,24 +227,70 @@ module Node {
 
     PatNode() { this = TPatNode(n) }
 
-    /** Gets the `Pat` in the AST that this node corresponds to. */
-    Pat getPat() { result = n.getPat() }
+    override PatCfgNode asPat() { result = n }
   }
 
   /**
    * The value of a parameter at function entry, viewed as a node in a data
    * flow graph.
    */
-  final class ParameterNode extends AstCfgFlowNode, TParameterNode {
-    override ParamCfgNode n;
-
-    ParameterNode() { this = TParameterNode(n) }
-
-    /** Gets the parameter in the AST that this node corresponds to. */
-    Param getParameter() { result = n.getParam() }
+  abstract class ParameterNode extends Node {
+    abstract predicate isParameterOf(DataFlowCallable c, ParameterPosition pos);
   }
 
-  final class ArgumentNode = NaNode;
+  final class SourceParameterNode extends AstCfgFlowNode, ParameterNode, TSourceParameterNode {
+    override ParamBaseCfgNode n;
+
+    SourceParameterNode() { this = TSourceParameterNode(n) }
+
+    override predicate isParameterOf(DataFlowCallable c, ParameterPosition pos) {
+      n.getAstNode() = pos.getParameterIn(c.asCfgScope().(Callable).getParamList())
+    }
+
+    /** Gets the parameter in the CFG that this node corresponds to. */
+    ParamBaseCfgNode getParameter() { result = n }
+  }
+
+  /** A parameter for a library callable with a flow summary. */
+  final class SummaryParameterNode extends ParameterNode, FlowSummaryNode {
+    private ParameterPosition pos_;
+
+    SummaryParameterNode() {
+      FlowSummaryImpl::Private::summaryParameterNode(this.getSummaryNode(), pos_)
+    }
+
+    override predicate isParameterOf(DataFlowCallable c, ParameterPosition pos) {
+      this.getSummarizedCallable() = c.asLibraryCallable() and pos = pos_
+    }
+  }
+
+  abstract class ArgumentNode extends Node {
+    abstract predicate isArgumentOf(DataFlowCall call, RustDataFlow::ArgumentPosition pos);
+  }
+
+  final class ExprArgumentNode extends ArgumentNode, ExprNode {
+    private CallExprBaseCfgNode call_;
+    private RustDataFlow::ArgumentPosition pos_;
+
+    ExprArgumentNode() { isArgumentForCall(n, call_, pos_) }
+
+    override predicate isArgumentOf(DataFlowCall call, RustDataFlow::ArgumentPosition pos) {
+      call.asCallBaseExprCfgNode() = call_ and pos = pos_
+    }
+  }
+
+  final class SummaryArgumentNode extends FlowSummaryNode, ArgumentNode {
+    private FlowSummaryImpl::Private::SummaryNode receiver;
+    private RustDataFlow::ArgumentPosition pos_;
+
+    SummaryArgumentNode() {
+      FlowSummaryImpl::Private::summaryArgumentNode(receiver, this.getSummaryNode(), pos_)
+    }
+
+    override predicate isArgumentOf(DataFlowCall call, RustDataFlow::ArgumentPosition pos) {
+      call.isSummaryCall(_, receiver) and pos = pos_
+    }
+  }
 
   /** An SSA node. */
   class SsaNode extends Node, TSsaNode {
@@ -184,23 +312,52 @@ module Node {
   }
 
   /** A data flow node that represents a value returned by a callable. */
-  final class ReturnNode extends ExprNode {
-    ReturnNode() { this.getCfgNode().getASuccessor() instanceof ExitCfgNode }
+  abstract class ReturnNode extends Node {
+    abstract ReturnKind getKind();
+  }
 
-    ReturnKind getKind() { any() }
+  final class ExprReturnNode extends ExprNode, ReturnNode {
+    ExprReturnNode() { this.getCfgNode().getASuccessor() instanceof AnnotatedExitCfgNode }
+
+    override ReturnKind getKind() { result = TNormalReturnKind() }
+  }
+
+  final class SummaryReturnNode extends FlowSummaryNode, ReturnNode {
+    private ReturnKind rk;
+
+    SummaryReturnNode() { FlowSummaryImpl::Private::summaryReturnNode(this.getSummaryNode(), rk) }
+
+    override ReturnKind getKind() { result = rk }
   }
 
   /** A data-flow node that represents the output of a call. */
-  abstract class OutNode extends Node, ExprNode {
+  abstract class OutNode extends Node {
     /** Gets the underlying call for this node. */
-    abstract DataFlowCall getCall();
+    abstract DataFlowCall getCall(ReturnKind kind);
   }
 
   final private class ExprOutNode extends ExprNode, OutNode {
-    ExprOutNode() { this.asExpr() instanceof CallExpr }
+    ExprOutNode() { this.asExpr() instanceof CallExprBaseCfgNode }
 
     /** Gets the underlying call CFG node that includes this out node. */
-    override DataFlowCall getCall() { result.asExprCfgNode() = this.getCfgNode() }
+    override DataFlowCall getCall(ReturnKind kind) {
+      result.asCallBaseExprCfgNode() = this.getCfgNode() and
+      kind = TNormalReturnKind()
+    }
+  }
+
+  final class SummaryOutNode extends FlowSummaryNode, OutNode {
+    private DataFlowCall call;
+    private ReturnKind kind_;
+
+    SummaryOutNode() {
+      exists(FlowSummaryImpl::Private::SummaryNode receiver |
+        call.isSummaryCall(_, receiver) and
+        FlowSummaryImpl::Private::summaryOutNode(receiver, this.getSummaryNode(), kind_)
+      )
+    }
+
+    override DataFlowCall getCall(ReturnKind kind) { result = call and kind = kind_ }
   }
 
   /**
@@ -214,9 +371,35 @@ module Node {
    * Nodes corresponding to AST elements, for example `ExprNode`, usually refer
    * to the value before the update.
    */
-  final class PostUpdateNode extends Node::NaNode {
+  abstract class PostUpdateNode extends Node {
     /** Gets the node before the state update. */
-    Node getPreUpdateNode() { none() }
+    abstract Node getPreUpdateNode();
+
+    override string toString() { result = "[post] " + this.getPreUpdateNode().toString() }
+  }
+
+  final class ExprPostUpdateNode extends PostUpdateNode, TExprPostUpdateNode {
+    private ExprCfgNode n;
+
+    ExprPostUpdateNode() { this = TExprPostUpdateNode(n) }
+
+    override Node getPreUpdateNode() { result = TExprNode(n) }
+
+    override CfgScope getCfgScope() { result = n.getScope() }
+
+    override Location getLocation() { result = n.getLocation() }
+  }
+
+  final class SummaryPostUpdateNode extends FlowSummaryNode, PostUpdateNode {
+    private FlowSummaryNode pre;
+
+    SummaryPostUpdateNode() {
+      FlowSummaryImpl::Private::summaryPostUpdateNode(this.getSummaryNode(), pre.getSummaryNode())
+    }
+
+    override Node getPreUpdateNode() { result = pre }
+
+    final override string toString() { result = PostUpdateNode.super.toString() }
   }
 
   final class CastNode = NaNode;
@@ -226,78 +409,285 @@ final class Node = Node::Node;
 
 /** Provides logic related to SSA. */
 module SsaFlow {
-  private module Impl = SsaImpl::DataFlowIntegration;
+  private module SsaFlow = SsaImpl::DataFlowIntegration;
 
-  private Node::ParameterNode toParameterNode(Param p) { result.getParameter() = p }
+  private Node::ParameterNode toParameterNode(ParamCfgNode p) {
+    result.(Node::SourceParameterNode).getParameter() = p
+  }
 
   /** Converts a control flow node into an SSA control flow node. */
-  Impl::Node asNode(Node n) {
+  SsaFlow::Node asNode(Node n) {
     n = TSsaNode(result)
     or
-    result.(Impl::ExprNode).getExpr() = n.(Node::ExprNode).getCfgNode()
+    result.(SsaFlow::ExprNode).getExpr() = n.asExpr()
     or
-    n = toParameterNode(result.(Impl::ParameterNode).getParameter())
+    result.(SsaFlow::ExprPostUpdateNode).getExpr() =
+      n.(Node::PostUpdateNode).getPreUpdateNode().asExpr()
+    or
+    n = toParameterNode(result.(SsaFlow::ParameterNode).getParameter())
   }
 
   predicate localFlowStep(SsaImpl::DefinitionExt def, Node nodeFrom, Node nodeTo, boolean isUseStep) {
-    Impl::localFlowStep(def, asNode(nodeFrom), asNode(nodeTo), isUseStep)
+    SsaFlow::localFlowStep(def, asNode(nodeFrom), asNode(nodeTo), isUseStep)
   }
 
   predicate localMustFlowStep(SsaImpl::DefinitionExt def, Node nodeFrom, Node nodeTo) {
-    Impl::localMustFlowStep(def, asNode(nodeFrom), asNode(nodeTo))
+    SsaFlow::localMustFlowStep(def, asNode(nodeFrom), asNode(nodeTo))
   }
 }
 
-/**
- * Holds for expressions `e` that evaluate to the value of any last (in
- * evaluation order) subexpressions within it. E.g., expressions that propagate
- * a values from a subexpression.
- *
- * For instance, the predicate holds for if expressions as `if b { e1 } else {
- * e2 }` evalates to the value of one of the subexpressions `e1` or `e2`.
- */
-private predicate propagatesValue(Expr e) {
-  e instanceof IfExpr or
-  e instanceof LoopExpr or
-  e instanceof ReturnExpr or
-  e instanceof BreakExpr or
-  e.(BlockExpr).getStmtList().hasTailExpr() or
-  e instanceof MatchExpr
-}
-
 /**
  * Gets a node that may execute last in `n`, and which, when it executes last,
  * will be the value of `n`.
  */
-private ExprCfgNode getALastEvalNode(ExprCfgNode n) {
-  propagatesValue(n.getExpr()) and result.getASuccessor() = n
+private ExprCfgNode getALastEvalNode(ExprCfgNode e) {
+  e = any(IfExprCfgNode n | result = [n.getThen(), n.getElse()]) or
+  result = e.(LoopExprCfgNode).getLoopBody() or
+  result = e.(ReturnExprCfgNode).getExpr() or
+  result = e.(BreakExprCfgNode).getExpr() or
+  result = e.(BlockExprCfgNode).getTailExpr() or
+  result = e.(MatchExprCfgNode).getArmExpr(_) or
+  result.(BreakExprCfgNode).getTarget() = e
 }
 
 module LocalFlow {
+  predicate flowSummaryLocalStep(
+    Node::FlowSummaryNode nodeFrom, Node::FlowSummaryNode nodeTo,
+    FlowSummaryImpl::Public::SummarizedCallable c, string model
+  ) {
+    FlowSummaryImpl::Private::Steps::summaryLocalStep(nodeFrom.getSummaryNode(),
+      nodeTo.getSummaryNode(), true, model) and
+    c = nodeFrom.getSummarizedCallable()
+  }
+
   pragma[nomagic]
   predicate localFlowStepCommon(Node nodeFrom, Node nodeTo) {
     nodeFrom.getCfgNode() = getALastEvalNode(nodeTo.getCfgNode())
     or
-    exists(LetStmt s |
-      nodeFrom.getCfgNode().getAstNode() = s.getInitializer() and
-      nodeTo.getCfgNode().getAstNode() = s.getPat()
+    exists(LetStmtCfgNode s |
+      nodeFrom.getCfgNode() = s.getInitializer() and
+      nodeTo.getCfgNode() = s.getPat()
     )
     or
     // An edge from a pattern/expression to its corresponding SSA definition.
     nodeFrom.(Node::AstCfgFlowNode).getCfgNode() =
       nodeTo.(Node::SsaNode).getDefinitionExt().(Ssa::WriteDefinition).getControlFlowNode()
     or
-    SsaFlow::localFlowStep(_, nodeFrom, nodeTo, _)
+    nodeFrom.(Node::SourceParameterNode).getParameter().(ParamCfgNode).getPat() = nodeTo.asPat()
+    or
+    exists(AssignmentExprCfgNode a |
+      a.getRhs() = nodeFrom.getCfgNode() and
+      a.getLhs() = nodeTo.getCfgNode()
+    )
+    or
+    exists(MatchExprCfgNode match |
+      nodeFrom.asExpr() = match.getScrutinee() and
+      nodeTo.asPat() = match.getArmPat(_)
+    )
+    or
+    nodeFrom.asPat().(OrPatCfgNode).getAPat() = nodeTo.asPat()
   }
 }
 
-private class DataFlowCallableAlias = DataFlowCallable;
+private import codeql.util.Option
 
-private class ReturnKindAlias = ReturnKind;
+private class CrateOrigin extends string {
+  CrateOrigin() {
+    this = [any(Item i).getCrateOrigin(), any(Resolvable r).getResolvedCrateOrigin()]
+  }
+}
 
-private class DataFlowCallAlias = DataFlowCall;
+private class CrateOriginOption = Option<CrateOrigin>::Option;
+
+pragma[nomagic]
+private predicate hasExtendedCanonicalPath(Item i, CrateOriginOption crate, string path) {
+  path = i.getExtendedCanonicalPath() and
+  (
+    crate.asSome() = i.getCrateOrigin()
+    or
+    crate.isNone() and
+    not i.hasCrateOrigin()
+  )
+}
+
+pragma[nomagic]
+private predicate variantHasExtendedCanonicalPath(
+  Enum e, Variant v, CrateOriginOption crate, string path, string name
+) {
+  hasExtendedCanonicalPath(e, crate, path) and
+  v = e.getVariantList().getAVariant() and
+  name = v.getName().getText()
+}
+
+pragma[nomagic]
+private predicate resolveExtendedCanonicalPath(Resolvable r, CrateOriginOption crate, string path) {
+  path = r.getResolvedPath() and
+  (
+    crate.asSome() = r.getResolvedCrateOrigin()
+    or
+    crate.isNone() and
+    not r.hasResolvedCrateOrigin()
+  )
+}
+
+/**
+ * A path to a value contained in an object. For example a field name of a struct.
+ */
+abstract class Content extends TContent {
+  /** Gets a textual representation of this content. */
+  abstract string toString();
+}
+
+/** A canonical path pointing to an enum variant. */
+class VariantCanonicalPath extends MkVariantCanonicalPath {
+  CrateOriginOption crate;
+  string path;
+  string name;
+
+  VariantCanonicalPath() { this = MkVariantCanonicalPath(crate, path, name) }
+
+  /** Gets the underlying variant. */
+  Variant getVariant() { variantHasExtendedCanonicalPath(_, result, crate, path, name) }
+
+  string getExtendedCanonicalPath() { result = path + "::" + name }
+
+  string toString() { result = name }
+
+  Location getLocation() { result = this.getVariant().getLocation() }
+}
+
+/**
+ * A variant of an `enum`. In addition to the variant itself, this also includes the
+ * position (for tuple variants) or the field name (for record variants).
+ */
+abstract class VariantContent extends Content { }
+
+/** A tuple variant. */
+private class VariantPositionContent extends VariantContent, TVariantPositionContent {
+  private VariantCanonicalPath v;
+  private int pos_;
+
+  VariantPositionContent() { this = TVariantPositionContent(v, pos_) }
+
+  VariantCanonicalPath getVariantCanonicalPath(int pos) { result = v and pos = pos_ }
+
+  final override string toString() {
+    // only print indices when the arity is > 1
+    if exists(TVariantPositionContent(v, 1))
+    then result = v.toString() + "(" + pos_ + ")"
+    else result = v.toString()
+  }
+}
+
+/** A record variant. */
+private class VariantFieldContent extends VariantContent, TVariantFieldContent {
+  private VariantCanonicalPath v;
+  private string field_;
+
+  VariantFieldContent() { this = TVariantFieldContent(v, field_) }
+
+  VariantCanonicalPath getVariantCanonicalPath(string field) { result = v and field = field_ }
+
+  final override string toString() {
+    // only print field when the arity is > 1
+    if strictcount(string f | exists(TVariantFieldContent(v, f))) > 1
+    then result = v.toString() + "{" + field_ + "}"
+    else result = v.toString()
+  }
+}
+
+/** A canonical path pointing to a struct. */
+private class StructCanonicalPath extends MkStructCanonicalPath {
+  CrateOriginOption crate;
+  string path;
+
+  StructCanonicalPath() { this = MkStructCanonicalPath(crate, path) }
+
+  /** Gets the underlying struct. */
+  Struct getStruct() { hasExtendedCanonicalPath(result, crate, path) }
+
+  string toString() { result = this.getStruct().getName().getText() }
+
+  Location getLocation() { result = this.getStruct().getLocation() }
+}
+
+/** Content stored in a field on a struct. */
+private class StructFieldContent extends Content, TStructFieldContent {
+  private StructCanonicalPath s;
+  private string field_;
+
+  StructFieldContent() { this = TStructFieldContent(s, field_) }
+
+  StructCanonicalPath getStructCanonicalPath(string field) { result = s and field = field_ }
+
+  override string toString() { result = s.toString() + "." + field_.toString() }
+}
+
+/**
+ * Content stored at a position in a tuple.
+ *
+ * NOTE: Unlike `struct`s and `enum`s tuples are structural and not nominal,
+ * hence we don't store a canonical path for them.
+ */
+private class TuplePositionContent extends Content, TTuplePositionContent {
+  private int pos;
+
+  TuplePositionContent() { this = TTuplePositionContent(pos) }
+
+  int getPosition() { result = pos }
+
+  override string toString() { result = "tuple." + pos.toString() }
+}
+
+/** Holds if `access` indexes a tuple at an index corresponding to `c`. */
+private predicate fieldTuplePositionContent(FieldExprCfgNode access, TuplePositionContent c) {
+  access.getNameRef().getText().toInt() = c.getPosition()
+}
+
+/** A value that represents a set of `Content`s. */
+abstract class ContentSet extends TContentSet {
+  /** Gets a textual representation of this element. */
+  abstract string toString();
+
+  /** Gets a content that may be stored into when storing into this set. */
+  abstract Content getAStoreContent();
+
+  /** Gets a content that may be read from when reading from this set. */
+  abstract Content getAReadContent();
+}
+
+final private class SingletonContentSet extends ContentSet, TSingletonContentSet {
+  private Content c;
+
+  SingletonContentSet() { this = TSingletonContentSet(c) }
+
+  Content getContent() { result = c }
+
+  override string toString() { result = c.toString() }
+
+  override Content getAStoreContent() { result = c }
+
+  override Content getAReadContent() { result = c }
+}
+
+// Defines a set of aliases needed for the `RustDataFlow` module
+private module Aliases {
+  class DataFlowCallableAlias = DataFlowCallable;
+
+  class ReturnKindAlias = ReturnKind;
+
+  class DataFlowCallAlias = DataFlowCall;
+
+  class ParameterPositionAlias = ParameterPosition;
+
+  class ContentAlias = Content;
+
+  class ContentSetAlias = ContentSet;
+}
 
 module RustDataFlow implements InputSig<Location> {
+  private import Aliases
+
   /**
    * An element, viewed as a node in a data flow graph. Either an expression
    * (`ExprNode`) or a parameter (`ParameterNode`).
@@ -316,20 +706,30 @@ module RustDataFlow implements InputSig<Location> {
 
   final class CastNode = Node::NaNode;
 
-  predicate isParameterNode(ParameterNode p, DataFlowCallable c, ParameterPosition pos) { none() }
+  /** Holds if `p` is a parameter of `c` at the position `pos`. */
+  predicate isParameterNode(ParameterNode p, DataFlowCallable c, ParameterPosition pos) {
+    p.isParameterOf(c, pos)
+  }
 
-  predicate isArgumentNode(ArgumentNode n, DataFlowCall call, ArgumentPosition pos) { none() }
+  /** Holds if `n` is an argument of `c` at the position `pos`. */
+  predicate isArgumentNode(ArgumentNode n, DataFlowCall call, ArgumentPosition pos) {
+    n.isArgumentOf(call, pos)
+  }
 
   DataFlowCallable nodeGetEnclosingCallable(Node node) { result = node.getEnclosingCallable() }
 
   DataFlowType getNodeType(Node node) { any() }
 
-  predicate nodeIsHidden(Node node) { node instanceof Node::SsaNode }
+  predicate nodeIsHidden(Node node) {
+    node instanceof Node::SsaNode
+    or
+    node instanceof Node::FlowSummaryNode
+  }
 
   class DataFlowExpr = ExprCfgNode;
 
   /** Gets the node corresponding to `e`. */
-  Node exprNode(DataFlowExpr e) { result.getCfgNode() = e }
+  Node exprNode(DataFlowExpr e) { result.asExpr() = e }
 
   final class DataFlowCall = DataFlowCallAlias;
 
@@ -338,72 +738,66 @@ module RustDataFlow implements InputSig<Location> {
   final class ReturnKind = ReturnKindAlias;
 
   /** Gets a viable implementation of the target of the given `Call`. */
-  DataFlowCallable viableCallable(DataFlowCall c) {
-    exists(Function f, string name | result.asCfgScope() = f and name = f.getName().toString() |
-      if f.getParamList().hasSelfParam()
-      then name = c.asMethodCallExprCfgNode().getMethodCallExpr().getNameRef().getText()
-      else
-        name =
-          c.asCallExprCfgNode().getCallExpr().getExpr().(PathExpr).getPath().getPart().toString()
-    )
+  DataFlowCallable viableCallable(DataFlowCall call) {
+    result.asCfgScope() = call.asCallBaseExprCfgNode().getCallExprBase().getStaticTarget()
+    or
+    result.asLibraryCallable().getACall() = call.asCallBaseExprCfgNode().getCallExprBase()
   }
 
   /**
    * Gets a node that can read the value returned from `call` with return kind
    * `kind`.
    */
-  OutNode getAnOutNode(DataFlowCall call, ReturnKind kind) {
-    call = result.getCall() and exists(kind)
-  }
+  OutNode getAnOutNode(DataFlowCall call, ReturnKind kind) { call = result.getCall(kind) }
 
   // NOTE: For now we use the type `Unit` and do not benefit from type
   // information in the data flow analysis.
-  final class DataFlowType = Unit;
+  final class DataFlowType extends Unit {
+    string toString() { result = "" }
+  }
 
   predicate compatibleTypes(DataFlowType t1, DataFlowType t2) { any() }
 
   predicate typeStrongerThan(DataFlowType t1, DataFlowType t2) { none() }
 
-  final class Content = Void;
+  class Content = ContentAlias;
+
+  class ContentSet = ContentSetAlias;
 
   predicate forceHighPrecision(Content c) { none() }
 
-  class ContentSet extends TContentSet {
-    /** Gets a textual representation of this element. */
-    string toString() { result = "ContentSet" }
+  final class ContentApprox = Content; // TODO: Implement if needed
 
-    /** Gets a content that may be stored into when storing into this set. */
-    Content getAStoreContent() { none() }
+  ContentApprox getContentApprox(Content c) { result = c }
 
-    /** Gets a content that may be read from when reading from this set. */
-    Content getAReadContent() { none() }
-  }
+  class ParameterPosition = ParameterPositionAlias;
 
-  final class ContentApprox = Void;
-
-  ContentApprox getContentApprox(Content c) { any() }
-
-  class ParameterPosition extends string {
-    ParameterPosition() { this = "pos" }
-  }
-
-  class ArgumentPosition extends string {
-    ArgumentPosition() { this = "pos" }
-  }
+  class ArgumentPosition = ParameterPosition;
 
   /**
    * Holds if the parameter position `ppos` matches the argument position
    * `apos`.
    */
-  predicate parameterMatch(ParameterPosition ppos, ArgumentPosition apos) { none() }
+  predicate parameterMatch(ParameterPosition ppos, ArgumentPosition apos) { ppos = apos }
 
   /**
    * Holds if there is a simple local flow step from `node1` to `node2`. These
    * are the value-preserving intra-callable flow steps.
    */
   predicate simpleLocalFlowStep(Node nodeFrom, Node nodeTo, string model) {
-    LocalFlow::localFlowStepCommon(nodeFrom, nodeTo) and
+    (
+      LocalFlow::localFlowStepCommon(nodeFrom, nodeTo)
+      or
+      exists(boolean isUseStep | SsaFlow::localFlowStep(_, nodeFrom, nodeTo, isUseStep) |
+        isUseStep = false
+        or
+        isUseStep = true and
+        not FlowSummaryImpl::Private::Steps::prohibitsUseUseFlow(nodeFrom, _)
+      )
+    ) and
     model = ""
+    or
+    LocalFlow::flowSummaryLocalStep(nodeFrom, nodeTo, _, model)
   }
 
   /**
@@ -411,34 +805,185 @@ module RustDataFlow implements InputSig<Location> {
    * that does not follow a call edge. For example, a step through a global
    * variable.
    */
-  predicate jumpStep(Node node1, Node node2) { none() }
+  predicate jumpStep(Node node1, Node node2) {
+    FlowSummaryImpl::Private::Steps::summaryJumpStep(node1.(Node::FlowSummaryNode).getSummaryNode(),
+      node2.(Node::FlowSummaryNode).getSummaryNode())
+  }
+
+  /** Holds if path `p` resolves to struct `s`. */
+  private predicate pathResolveToStructCanonicalPath(Path p, StructCanonicalPath s) {
+    exists(CrateOriginOption crate, string path |
+      resolveExtendedCanonicalPath(p, crate, path) and
+      s = MkStructCanonicalPath(crate, path)
+    )
+  }
+
+  /** Holds if path `p` resolves to variant `v`. */
+  private predicate pathResolveToVariantCanonicalPath(Path p, VariantCanonicalPath v) {
+    exists(CrateOriginOption crate, string path |
+      resolveExtendedCanonicalPath(p.getQualifier(), crate, path) and
+      v = MkVariantCanonicalPath(crate, path, p.getPart().getNameRef().getText())
+      or
+      exists(string name |
+        not p.hasQualifier() and
+        resolveExtendedCanonicalPath(p, crate, path + "::" + name) and
+        v = MkVariantCanonicalPath(crate, path, name)
+      )
+    )
+  }
+
+  /** Holds if `p` destructs an enum variant `v`. */
+  pragma[nomagic]
+  private predicate tupleVariantDestruction(TupleStructPat p, VariantCanonicalPath v) {
+    pathResolveToVariantCanonicalPath(p.getPath(), v)
+  }
+
+  /** Holds if `p` destructs an enum variant `v`. */
+  pragma[nomagic]
+  private predicate recordVariantDestruction(RecordPat p, VariantCanonicalPath v) {
+    pathResolveToVariantCanonicalPath(p.getPath(), v)
+  }
+
+  /** Holds if `p` destructs a struct `s`. */
+  pragma[nomagic]
+  private predicate structDestruction(RecordPat p, StructCanonicalPath s) {
+    pathResolveToStructCanonicalPath(p.getPath(), s)
+  }
 
   /**
    * Holds if data can flow from `node1` to `node2` via a read of `c`.  Thus,
    * `node1` references an object with a content `c.getAReadContent()` whose
    * value ends up in `node2`.
    */
-  predicate readStep(Node node1, ContentSet c, Node node2) { none() }
+  predicate readStep(Node node1, ContentSet cs, Node node2) {
+    exists(Content c | c = cs.(SingletonContentSet).getContent() |
+      exists(TupleStructPatCfgNode pat, int pos |
+        pat = node1.asPat() and
+        tupleVariantDestruction(pat.getPat(),
+          c.(VariantPositionContent).getVariantCanonicalPath(pos)) and
+        node2.asPat() = pat.getField(pos)
+      )
+      or
+      exists(RecordPatCfgNode pat, string field |
+        pat = node1.asPat() and
+        (
+          // Pattern destructs a struct-like variant.
+          recordVariantDestruction(pat.getPat(),
+            c.(VariantFieldContent).getVariantCanonicalPath(field))
+          or
+          // Pattern destructs a struct.
+          structDestruction(pat.getPat(), c.(StructFieldContent).getStructCanonicalPath(field))
+        ) and
+        node2.asPat() = pat.getFieldPat(field)
+      )
+      or
+      exists(FieldExprCfgNode access |
+        // Read of a tuple entry
+        fieldTuplePositionContent(access, c) and
+        // TODO: Handle read of a struct field.
+        node1.asExpr() = access.getExpr() and
+        node2.asExpr() = access
+      )
+      or
+      exists(TryExprCfgNode try |
+        node1.asExpr() = try.getExpr() and
+        node2.asExpr() = try and
+        c.(VariantPositionContent).getVariantCanonicalPath(0).getExtendedCanonicalPath() =
+          ["crate::option::Option::Some", "crate::result::Result::Ok"]
+      )
+    )
+    or
+    FlowSummaryImpl::Private::Steps::summaryReadStep(node1.(Node::FlowSummaryNode).getSummaryNode(),
+      cs, node2.(Node::FlowSummaryNode).getSummaryNode())
+  }
+
+  /** Holds if `ce` constructs an enum value of type `v`. */
+  pragma[nomagic]
+  private predicate tupleVariantConstruction(CallExpr ce, VariantCanonicalPath v) {
+    pathResolveToVariantCanonicalPath(ce.getFunction().(PathExpr).getPath(), v)
+  }
+
+  /** Holds if `re` constructs an enum value of type `v`. */
+  pragma[nomagic]
+  private predicate recordVariantConstruction(RecordExpr re, VariantCanonicalPath v) {
+    pathResolveToVariantCanonicalPath(re.getPath(), v)
+  }
+
+  /** Holds if `re` constructs a struct value of type `s`. */
+  pragma[nomagic]
+  private predicate structConstruction(RecordExpr re, StructCanonicalPath s) {
+    pathResolveToStructCanonicalPath(re.getPath(), s)
+  }
+
+  private predicate tupleAssignment(Node node1, Node node2, TuplePositionContent c) {
+    exists(AssignmentExprCfgNode assignment, FieldExprCfgNode access |
+      assignment.getLhs() = access and
+      fieldTuplePositionContent(access, c) and
+      node1.asExpr() = assignment.getRhs() and
+      node2.asExpr() = access.getExpr()
+    )
+  }
 
   /**
    * Holds if data can flow from `node1` to `node2` via a store into `c`.  Thus,
    * `node2` references an object with a content `c.getAStoreContent()` that
    * contains the value of `node1`.
    */
-  predicate storeStep(Node node1, ContentSet c, Node node2) { none() }
+  predicate storeStep(Node node1, ContentSet cs, Node node2) {
+    exists(Content c | c = cs.(SingletonContentSet).getContent() |
+      exists(CallExprCfgNode call, int pos |
+        tupleVariantConstruction(call.getCallExpr(),
+          c.(VariantPositionContent).getVariantCanonicalPath(pos)) and
+        node1.asExpr() = call.getArgument(pos) and
+        node2.asExpr() = call
+      )
+      or
+      exists(RecordExprCfgNode re, string field |
+        (
+          // Expression is for a struct-like enum variant.
+          recordVariantConstruction(re.getRecordExpr(),
+            c.(VariantFieldContent).getVariantCanonicalPath(field))
+          or
+          // Expression is for a struct.
+          structConstruction(re.getRecordExpr(),
+            c.(StructFieldContent).getStructCanonicalPath(field))
+        ) and
+        node1.asExpr() = re.getFieldExpr(field) and
+        node2.asExpr() = re
+      )
+      or
+      exists(TupleExprCfgNode tuple |
+        node1.asExpr() = tuple.getField(c.(TuplePositionContent).getPosition()) and
+        node2.asExpr() = tuple
+      )
+      or
+      tupleAssignment(node1, node2.(PostUpdateNode).getPreUpdateNode(), c)
+    )
+    or
+    FlowSummaryImpl::Private::Steps::summaryStoreStep(node1.(Node::FlowSummaryNode).getSummaryNode(),
+      cs, node2.(Node::FlowSummaryNode).getSummaryNode())
+  }
 
   /**
    * Holds if values stored inside content `c` are cleared at node `n`. For example,
    * any value stored inside `f` is cleared at the pre-update node associated with `x`
    * in `x.f = newValue`.
    */
-  predicate clearsContent(Node n, ContentSet c) { none() }
+  predicate clearsContent(Node n, ContentSet cs) {
+    tupleAssignment(_, n, cs.(SingletonContentSet).getContent())
+    or
+    FlowSummaryImpl::Private::Steps::summaryClearsContent(n.(Node::FlowSummaryNode).getSummaryNode(),
+      cs)
+  }
 
   /**
    * Holds if the value that is being tracked is expected to be stored inside content `c`
    * at node `n`.
    */
-  predicate expectsContent(Node n, ContentSet c) { none() }
+  predicate expectsContent(Node n, ContentSet cs) {
+    FlowSummaryImpl::Private::Steps::summaryExpectsContent(n.(Node::FlowSummaryNode)
+          .getSummaryNode(), cs)
+  }
 
   class NodeRegion instanceof Void {
     string toString() { result = "NodeRegion" }
@@ -458,7 +1003,12 @@ module RustDataFlow implements InputSig<Location> {
    * One example would be to allow flow like `p.foo = p.bar;`, which is disallowed
    * by default as a heuristic.
    */
-  predicate allowParameterReturnInSelf(ParameterNode p) { none() }
+  predicate allowParameterReturnInSelf(ParameterNode p) {
+    exists(DataFlowCallable c, ParameterPosition pos |
+      p.isParameterOf(c, pos) and
+      FlowSummaryImpl::Private::summaryAllowParameterReturnInSelf(c.asLibraryCallable(), pos)
+    )
+  }
 
   /**
    * Holds if the value of `node2` is given by `node1`.
@@ -471,16 +1021,35 @@ module RustDataFlow implements InputSig<Location> {
    */
   predicate localMustFlowStep(Node node1, Node node2) {
     SsaFlow::localMustFlowStep(_, node1, node2)
+    or
+    FlowSummaryImpl::Private::Steps::summaryLocalMustFlowStep(node1
+          .(Node::FlowSummaryNode)
+          .getSummaryNode(), node2.(Node::FlowSummaryNode).getSummaryNode())
   }
 
-  class LambdaCallKind = Void;
+  class LambdaCallKind = Unit;
 
-  // class LambdaCallKind;
   /** Holds if `creation` is an expression that creates a lambda of kind `kind` for `c`. */
-  predicate lambdaCreation(Node creation, LambdaCallKind kind, DataFlowCallable c) { none() }
+  predicate lambdaCreation(Node creation, LambdaCallKind kind, DataFlowCallable c) {
+    exists(ClosureExpr cl |
+      cl = creation.asExpr().getExpr() and
+      cl = c.asCfgScope()
+    ) and
+    exists(kind)
+  }
 
-  /** Holds if `call` is a lambda call of kind `kind` where `receiver` is the lambda expression. */
-  predicate lambdaCall(DataFlowCall call, LambdaCallKind kind, Node receiver) { none() }
+  /**
+   * Holds if `call` is a lambda call of kind `kind` where `receiver` is the
+   * invoked expression.
+   */
+  predicate lambdaCall(DataFlowCall call, LambdaCallKind kind, Node receiver) {
+    receiver.asExpr() = call.asCallExprCfgNode().getFunction() and
+    // All calls to complex expressions and local variable accesses are lambda call.
+    exists(Expr f | f = receiver.asExpr().getExpr() |
+      f instanceof PathExpr implies f = any(Variable v).getAnAccess()
+    ) and
+    exists(kind)
+  }
 
   /** Extra data flow steps needed for lambda flow analysis. */
   predicate additionalLambdaFlowStep(Node nodeFrom, Node nodeTo, boolean preservesValue) { none() }
@@ -492,8 +1061,6 @@ module RustDataFlow implements InputSig<Location> {
   class DataFlowSecondLevelScope = Void;
 }
 
-final class ContentSet = RustDataFlow::ContentSet;
-
 import MakeImpl<Location, RustDataFlow>
 
 /** A collection of cached types and predicates to be evaluated in the same stage. */
@@ -502,31 +1069,108 @@ private module Cached {
   cached
   newtype TNode =
     TExprNode(ExprCfgNode n) or
-    TParameterNode(ParamCfgNode p) or
+    TSourceParameterNode(ParamBaseCfgNode p) or
     TPatNode(PatCfgNode p) or
-    TSsaNode(SsaImpl::DataFlowIntegration::SsaNode node)
+    TExprPostUpdateNode(ExprCfgNode e) {
+      isArgumentForCall(e, _, _) or
+      e = [any(FieldExprCfgNode access).getExpr(), any(TryExprCfgNode try).getExpr()]
+    } or
+    TSsaNode(SsaImpl::DataFlowIntegration::SsaNode node) or
+    TFlowSummaryNode(FlowSummaryImpl::Private::SummaryNode sn)
 
   cached
   newtype TDataFlowCall =
-    TNormalCall(CallExprCfgNode c) or
-    TMethodCall(MethodCallExprCfgNode c)
+    TCall(CallExprBaseCfgNode c) or
+    TSummaryCall(
+      FlowSummaryImpl::Public::SummarizedCallable c, FlowSummaryImpl::Private::SummaryNode receiver
+    ) {
+      FlowSummaryImpl::Private::summaryCallbackRange(c, receiver)
+    }
 
   cached
-  newtype TOptionalContentSet =
-    TAnyElementContent() or
-    TAnyContent()
-
-  cached
-  class TContentSet = TAnyElementContent or TAnyContent;
-
-  cached
-  newtype TDataFlowCallable = TCfgScope(CfgScope scope)
+  newtype TDataFlowCallable =
+    TCfgScope(CfgScope scope) or
+    TLibraryCallable(LibraryCallable c)
 
   /** This is the local flow predicate that is exposed. */
   cached
   predicate localFlowStepImpl(Node::Node nodeFrom, Node::Node nodeTo) {
     LocalFlow::localFlowStepCommon(nodeFrom, nodeTo)
+    or
+    SsaFlow::localFlowStep(_, nodeFrom, nodeTo, _)
+    or
+    // Simple flow through library code is included in the exposed local
+    // step relation, even though flow is technically inter-procedural
+    FlowSummaryImpl::Private::Steps::summaryThroughStepValue(nodeFrom, nodeTo, _)
   }
+
+  cached
+  newtype TParameterPosition =
+    TPositionalParameterPosition(int i) {
+      i in [0 .. max([any(ParamList l).getNumberOfParams(), any(ArgList l).getNumberOfArgs()]) - 1]
+      or
+      FlowSummaryImpl::ParsePositions::isParsedArgumentPosition(_, i)
+      or
+      FlowSummaryImpl::ParsePositions::isParsedParameterPosition(_, i)
+    } or
+    TSelfParameterPosition()
+
+  cached
+  newtype TReturnKind = TNormalReturnKind()
+
+  private CrateOriginOption langCoreCrate() { result.asSome() = "lang:core" }
+
+  cached
+  newtype TVariantCanonicalPath =
+    MkVariantCanonicalPath(CrateOriginOption crate, string path, string name) {
+      variantHasExtendedCanonicalPath(_, _, crate, path, name)
+      or
+      // TODO: Remove once library types are extracted
+      crate = langCoreCrate() and
+      (
+        path = "crate::option::Option" and
+        name = "Some"
+        or
+        path = "crate::result::Result" and
+        name = ["Ok", "Err"]
+      )
+    }
+
+  cached
+  newtype TStructCanonicalPath =
+    MkStructCanonicalPath(CrateOriginOption crate, string path) {
+      exists(Struct s | hasExtendedCanonicalPath(s, crate, path))
+    }
+
+  cached
+  newtype TContent =
+    TVariantPositionContent(VariantCanonicalPath v, int pos) {
+      pos in [0 .. v.getVariant().getFieldList().(TupleFieldList).getNumberOfFields() - 1]
+      or
+      // TODO: Remove once library types are extracted
+      v = MkVariantCanonicalPath(langCoreCrate(), "crate::option::Option", "Some") and
+      pos = 0
+      or
+      // TODO: Remove once library types are extracted
+      v = MkVariantCanonicalPath(langCoreCrate(), "crate::result::Result", ["Ok", "Err"]) and
+      pos = 0
+    } or
+    TVariantFieldContent(VariantCanonicalPath v, string field) {
+      field = v.getVariant().getFieldList().(RecordFieldList).getAField().getName().getText()
+    } or
+    TTuplePositionContent(int pos) {
+      pos in [0 .. max([
+                any(TuplePat pat).getNumberOfFields(),
+                any(FieldExpr access).getNameRef().getText().toInt()
+              ]
+          )]
+    } or
+    TStructFieldContent(StructCanonicalPath s, string field) {
+      field = s.getStruct().getFieldList().(RecordFieldList).getAField().getName().getText()
+    }
+
+  cached
+  newtype TContentSet = TSingletonContentSet(Content c)
 }
 
 import Cached
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/FlowSummaryImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/FlowSummaryImpl.qll
new file mode 100644
index 00000000000..3503ad07332
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/FlowSummaryImpl.qll
@@ -0,0 +1,103 @@
+/**
+ * Provides classes and predicates for defining flow summaries.
+ */
+
+private import rust
+private import codeql.dataflow.internal.FlowSummaryImpl
+private import codeql.dataflow.internal.AccessPathSyntax as AccessPath
+private import codeql.rust.dataflow.internal.DataFlowImpl
+private import codeql.rust.dataflow.FlowSummary
+
+module Input implements InputSig<Location, RustDataFlow> {
+  class SummarizedCallableBase = string;
+
+  RustDataFlow::ArgumentPosition callbackSelfParameterPosition() { none() }
+
+  ReturnKind getStandardReturnValueKind() { result = TNormalReturnKind() }
+
+  string encodeParameterPosition(ParameterPosition pos) { result = pos.toString() }
+
+  predicate encodeArgumentPosition = encodeParameterPosition/1;
+
+  string encodeContent(ContentSet cs, string arg) {
+    exists(Content c | cs = TSingletonContentSet(c) |
+      exists(VariantCanonicalPath v | result = "Variant" |
+        exists(int pos |
+          c = TVariantPositionContent(v, pos) and
+          arg = v.getExtendedCanonicalPath() + "(" + pos + ")"
+        )
+        or
+        exists(string field |
+          c = TVariantFieldContent(v, field) and
+          arg = v.getExtendedCanonicalPath() + "::" + field
+        )
+      )
+    )
+  }
+
+  string encodeReturn(ReturnKind rk, string arg) { none() }
+
+  string encodeWithoutContent(ContentSet c, string arg) {
+    result = "Without" + encodeContent(c, arg)
+  }
+
+  string encodeWithContent(ContentSet c, string arg) { result = "With" + encodeContent(c, arg) }
+
+  bindingset[token]
+  ParameterPosition decodeUnknownParameterPosition(AccessPath::AccessPathTokenBase token) {
+    // needed to support `Argument[x..y]` ranges
+    token.getName() = "Argument" and
+    result.getPosition() = AccessPath::parseInt(token.getAnArgument())
+  }
+
+  bindingset[token]
+  RustDataFlow::ArgumentPosition decodeUnknownArgumentPosition(AccessPath::AccessPathTokenBase token) {
+    // needed to support `Parameter[x..y]` ranges
+    token.getName() = "Parameter" and
+    result.getPosition() = AccessPath::parseInt(token.getAnArgument())
+  }
+
+  bindingset[token]
+  ContentSet decodeUnknownContent(AccessPath::AccessPathTokenBase token) { none() }
+
+  bindingset[token]
+  ContentSet decodeUnknownWithContent(AccessPath::AccessPathTokenBase token) { none() }
+}
+
+private import Make<Location, RustDataFlow, Input> as Impl
+
+private module StepsInput implements Impl::Private::StepsInputSig {
+  DataFlowCall getACall(Public::SummarizedCallable sc) {
+    result.asCallBaseExprCfgNode().getCallExprBase() = sc.(LibraryCallable).getACall()
+  }
+}
+
+module Private {
+  import Impl::Private
+
+  module Steps = Impl::Private::Steps<StepsInput>;
+}
+
+module Public = Impl::Public;
+
+module ParsePositions {
+  private import Private
+
+  private predicate isParamBody(string body) {
+    body = any(AccessPathToken tok).getAnArgument("Parameter")
+  }
+
+  private predicate isArgBody(string body) {
+    body = any(AccessPathToken tok).getAnArgument("Argument")
+  }
+
+  predicate isParsedParameterPosition(string c, int i) {
+    isParamBody(c) and
+    i = AccessPath::parseInt(c)
+  }
+
+  predicate isParsedArgumentPosition(string c, int i) {
+    isArgBody(c) and
+    i = AccessPath::parseInt(c)
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll
index d5263fca810..64e2d54722d 100644
--- a/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll
@@ -24,6 +24,8 @@ predicate variableWrite(AstNode write, Variable v) {
     not isUnitializedLet(pat, v)
   )
   or
+  exists(SelfParam self | self = write and self = v.getSelfParam())
+  or
   exists(VariableAccess access |
     access = write and
     access.getVariable() = v
@@ -474,14 +476,14 @@ private module DataFlowIntegrationInput implements Impl::DataFlowIntegrationInpu
 
   /** Holds if SSA definition `def` assigns `value` to the underlying variable. */
   predicate ssaDefAssigns(WriteDefinition def, Expr value) {
-    exists(BasicBlock bb, int i | def.definesAt(_, bb, i) and value = bb.getNode(i))
+    none() // handled in `DataFlowImpl.qll` instead
   }
 
-  class Parameter = Param;
+  class Parameter = CfgNodes::ParamBaseCfgNode;
 
   /** Holds if SSA definition `def` initializes parameter `p` at function entry. */
   predicate ssaDefInitializesParam(WriteDefinition def, Parameter p) {
-    exists(BasicBlock bb, int i | bb.getNode(i).getAstNode() = p and def.definesAt(_, bb, i))
+    none() // handled in `DataFlowImpl.qll` instead
   }
 
   class Guard extends CfgNodes::AstCfgNode {
diff --git a/rust/ql/lib/codeql/rust/elements.qll b/rust/ql/lib/codeql/rust/elements.qll
index b516d8a9d18..ca3cccabb5f 100644
--- a/rust/ql/lib/codeql/rust/elements.qll
+++ b/rust/ql/lib/codeql/rust/elements.qll
@@ -3,10 +3,14 @@
  * This module exports all modules providing `Element` subclasses.
  */
 
+import codeql.files.FileSystem
 import codeql.rust.elements.Abi
+import codeql.rust.elements.Addressable
 import codeql.rust.elements.ArgList
 import codeql.rust.elements.ArrayExpr
-import codeql.rust.elements.ArrayType
+import codeql.rust.elements.ArrayListExpr
+import codeql.rust.elements.ArrayRepeatExpr
+import codeql.rust.elements.ArrayTypeRepr
 import codeql.rust.elements.AsmExpr
 import codeql.rust.elements.AssocItem
 import codeql.rust.elements.AssocItemList
@@ -31,7 +35,7 @@ import codeql.rust.elements.ConstArg
 import codeql.rust.elements.ConstBlockPat
 import codeql.rust.elements.ConstParam
 import codeql.rust.elements.ContinueExpr
-import codeql.rust.elements.DynTraitType
+import codeql.rust.elements.DynTraitTypeRepr
 import codeql.rust.elements.Element
 import codeql.rust.elements.Enum
 import codeql.rust.elements.Expr
@@ -42,9 +46,9 @@ import codeql.rust.elements.ExternItem
 import codeql.rust.elements.ExternItemList
 import codeql.rust.elements.FieldExpr
 import codeql.rust.elements.FieldList
-import codeql.rust.elements.FnPtrType
+import codeql.rust.elements.FnPtrTypeRepr
 import codeql.rust.elements.ForExpr
-import codeql.rust.elements.ForType
+import codeql.rust.elements.ForTypeRepr
 import codeql.rust.elements.Format
 import codeql.rust.elements.FormatArgsArg
 import codeql.rust.elements.FormatArgsExpr
@@ -58,12 +62,13 @@ import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.IdentPat
 import codeql.rust.elements.IfExpr
 import codeql.rust.elements.Impl
-import codeql.rust.elements.ImplTraitType
+import codeql.rust.elements.ImplTraitTypeRepr
 import codeql.rust.elements.IndexExpr
-import codeql.rust.elements.InferType
+import codeql.rust.elements.InferTypeRepr
 import codeql.rust.elements.Item
 import codeql.rust.elements.ItemList
 import codeql.rust.elements.Label
+import codeql.rust.elements.LabelableExpr
 import codeql.rust.elements.LetElse
 import codeql.rust.elements.LetExpr
 import codeql.rust.elements.LetStmt
@@ -74,6 +79,7 @@ import codeql.rust.elements.LiteralExpr
 import codeql.rust.elements.LiteralPat
 import codeql.rust.elements.Locatable
 import codeql.rust.elements.LoopExpr
+import codeql.rust.elements.LoopingExpr
 import codeql.rust.elements.MacroCall
 import codeql.rust.elements.MacroDef
 import codeql.rust.elements.MacroExpr
@@ -81,7 +87,7 @@ import codeql.rust.elements.MacroItems
 import codeql.rust.elements.MacroPat
 import codeql.rust.elements.MacroRules
 import codeql.rust.elements.MacroStmts
-import codeql.rust.elements.MacroType
+import codeql.rust.elements.MacroTypeRepr
 import codeql.rust.elements.MatchArm
 import codeql.rust.elements.MatchArmList
 import codeql.rust.elements.MatchExpr
@@ -92,23 +98,24 @@ import codeql.rust.elements.Missing
 import codeql.rust.elements.Module
 import codeql.rust.elements.Name
 import codeql.rust.elements.NameRef
-import codeql.rust.elements.NeverType
+import codeql.rust.elements.NeverTypeRepr
 import codeql.rust.elements.OffsetOfExpr
 import codeql.rust.elements.OrPat
 import codeql.rust.elements.Param
+import codeql.rust.elements.ParamBase
 import codeql.rust.elements.ParamList
 import codeql.rust.elements.ParenExpr
 import codeql.rust.elements.ParenPat
-import codeql.rust.elements.ParenType
+import codeql.rust.elements.ParenTypeRepr
 import codeql.rust.elements.Pat
 import codeql.rust.elements.Path
 import codeql.rust.elements.PathExpr
 import codeql.rust.elements.PathExprBase
 import codeql.rust.elements.PathPat
 import codeql.rust.elements.PathSegment
-import codeql.rust.elements.PathType
+import codeql.rust.elements.PathTypeRepr
 import codeql.rust.elements.PrefixExpr
-import codeql.rust.elements.PtrType
+import codeql.rust.elements.PtrTypeRepr
 import codeql.rust.elements.RangeExpr
 import codeql.rust.elements.RangePat
 import codeql.rust.elements.RecordExpr
@@ -121,16 +128,16 @@ import codeql.rust.elements.RecordPatField
 import codeql.rust.elements.RecordPatFieldList
 import codeql.rust.elements.RefExpr
 import codeql.rust.elements.RefPat
-import codeql.rust.elements.RefType
+import codeql.rust.elements.RefTypeRepr
 import codeql.rust.elements.Rename
 import codeql.rust.elements.Resolvable
 import codeql.rust.elements.RestPat
-import codeql.rust.elements.RetType
+import codeql.rust.elements.RetTypeRepr
 import codeql.rust.elements.ReturnExpr
 import codeql.rust.elements.ReturnTypeSyntax
 import codeql.rust.elements.SelfParam
 import codeql.rust.elements.SlicePat
-import codeql.rust.elements.SliceType
+import codeql.rust.elements.SliceTypeRepr
 import codeql.rust.elements.SourceFile
 import codeql.rust.elements.Static
 import codeql.rust.elements.Stmt
@@ -146,13 +153,13 @@ import codeql.rust.elements.TupleField
 import codeql.rust.elements.TupleFieldList
 import codeql.rust.elements.TuplePat
 import codeql.rust.elements.TupleStructPat
-import codeql.rust.elements.TupleType
+import codeql.rust.elements.TupleTypeRepr
 import codeql.rust.elements.TypeAlias
 import codeql.rust.elements.TypeArg
 import codeql.rust.elements.TypeBound
 import codeql.rust.elements.TypeBoundList
 import codeql.rust.elements.TypeParam
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.UnderscoreExpr
 import codeql.rust.elements.Unextracted
 import codeql.rust.elements.Unimplemented
diff --git a/rust/ql/lib/codeql/rust/elements/Addressable.qll b/rust/ql/lib/codeql/rust/elements/Addressable.qll
new file mode 100644
index 00000000000..c5edd19adcb
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Addressable.qll
@@ -0,0 +1,14 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `Addressable`.
+ */
+
+private import internal.AddressableImpl
+import codeql.rust.elements.AstNode
+
+/**
+ * Something that can be addressed by a path.
+ *
+ * TODO: This does not yet include all possible cases.
+ */
+final class Addressable = Impl::Addressable;
diff --git a/rust/ql/lib/codeql/rust/elements/ArrayExpr.qll b/rust/ql/lib/codeql/rust/elements/ArrayExpr.qll
index 9b039cc1534..b1895a1295a 100644
--- a/rust/ql/lib/codeql/rust/elements/ArrayExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/ArrayExpr.qll
@@ -8,7 +8,7 @@ import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 
 /**
- * An array expression. For example:
+ * The base class for array expressions. For example:
  * ```rust
  * [1, 2, 3];
  * [1; 10];
diff --git a/rust/ql/lib/codeql/rust/elements/ArrayListExpr.qll b/rust/ql/lib/codeql/rust/elements/ArrayListExpr.qll
new file mode 100644
index 00000000000..0bca9602d8a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ArrayListExpr.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ArrayListExpr`.
+ */
+
+private import internal.ArrayListExprImpl
+import codeql.rust.elements.ArrayExpr
+
+/**
+ * An array expression with a list of elements. For example:
+ * ```rust
+ * [1, 2, 3];
+ * ```
+ */
+final class ArrayListExpr = Impl::ArrayListExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/ArrayRepeatExpr.qll b/rust/ql/lib/codeql/rust/elements/ArrayRepeatExpr.qll
new file mode 100644
index 00000000000..7e6be8cc263
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ArrayRepeatExpr.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ArrayRepeatExpr`.
+ */
+
+private import internal.ArrayRepeatExprImpl
+import codeql.rust.elements.ArrayExpr
+import codeql.rust.elements.Expr
+
+/**
+ * An array expression with a repeat operand and a repeat length. For example:
+ * ```rust
+ * [1; 10];
+ * ```
+ */
+final class ArrayRepeatExpr = Impl::ArrayRepeatExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/ArrayType.qll b/rust/ql/lib/codeql/rust/elements/ArrayType.qll
deleted file mode 100644
index 85054d11329..00000000000
--- a/rust/ql/lib/codeql/rust/elements/ArrayType.qll
+++ /dev/null
@@ -1,16 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `ArrayType`.
- */
-
-private import internal.ArrayTypeImpl
-import codeql.rust.elements.ConstArg
-import codeql.rust.elements.TypeRef
-
-/**
- * A ArrayType. For example:
- * ```rust
- * todo!()
- * ```
- */
-final class ArrayType = Impl::ArrayType;
diff --git a/rust/ql/lib/codeql/rust/elements/ArrayTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/ArrayTypeRepr.qll
new file mode 100644
index 00000000000..f1d2b20a8e0
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ArrayTypeRepr.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ArrayTypeRepr`.
+ */
+
+private import internal.ArrayTypeReprImpl
+import codeql.rust.elements.ConstArg
+import codeql.rust.elements.TypeRepr
+
+/**
+ * A ArrayTypeRepr. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class ArrayTypeRepr = Impl::ArrayTypeRepr;
diff --git a/rust/ql/lib/codeql/rust/elements/AssocTypeArg.qll b/rust/ql/lib/codeql/rust/elements/AssocTypeArg.qll
index bd8f6aca76d..eded63ad7cc 100644
--- a/rust/ql/lib/codeql/rust/elements/AssocTypeArg.qll
+++ b/rust/ql/lib/codeql/rust/elements/AssocTypeArg.qll
@@ -9,10 +9,10 @@ import codeql.rust.elements.GenericArg
 import codeql.rust.elements.GenericArgList
 import codeql.rust.elements.NameRef
 import codeql.rust.elements.ParamList
-import codeql.rust.elements.RetType
+import codeql.rust.elements.RetTypeRepr
 import codeql.rust.elements.ReturnTypeSyntax
 import codeql.rust.elements.TypeBoundList
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * A AssocTypeArg. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/BlockExpr.qll b/rust/ql/lib/codeql/rust/elements/BlockExpr.qll
index a87bbe47252..9e87d381525 100644
--- a/rust/ql/lib/codeql/rust/elements/BlockExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/BlockExpr.qll
@@ -5,8 +5,7 @@
 
 private import internal.BlockExprImpl
 import codeql.rust.elements.Attr
-import codeql.rust.elements.Expr
-import codeql.rust.elements.Label
+import codeql.rust.elements.LabelableExpr
 import codeql.rust.elements.StmtList
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/CastExpr.qll b/rust/ql/lib/codeql/rust/elements/CastExpr.qll
index 8dfbcfc2e4f..f7a892e7399 100644
--- a/rust/ql/lib/codeql/rust/elements/CastExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/CastExpr.qll
@@ -6,7 +6,7 @@
 private import internal.CastExprImpl
 import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * A cast expression. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/ClosureExpr.qll b/rust/ql/lib/codeql/rust/elements/ClosureExpr.qll
index cfcf18e48b2..d1f73bfaadb 100644
--- a/rust/ql/lib/codeql/rust/elements/ClosureExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/ClosureExpr.qll
@@ -7,7 +7,7 @@ private import internal.ClosureExprImpl
 import codeql.rust.elements.Callable
 import codeql.rust.elements.ClosureBinder
 import codeql.rust.elements.Expr
-import codeql.rust.elements.RetType
+import codeql.rust.elements.RetTypeRepr
 
 /**
  * A closure expression. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/Const.qll b/rust/ql/lib/codeql/rust/elements/Const.qll
index c069f1ae56c..12fde1ef28b 100644
--- a/rust/ql/lib/codeql/rust/elements/Const.qll
+++ b/rust/ql/lib/codeql/rust/elements/Const.qll
@@ -9,7 +9,7 @@ import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.Item
 import codeql.rust.elements.Name
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.Visibility
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/ConstParam.qll b/rust/ql/lib/codeql/rust/elements/ConstParam.qll
index 625e603cb8a..ad7ff707272 100644
--- a/rust/ql/lib/codeql/rust/elements/ConstParam.qll
+++ b/rust/ql/lib/codeql/rust/elements/ConstParam.qll
@@ -8,7 +8,7 @@ import codeql.rust.elements.Attr
 import codeql.rust.elements.ConstArg
 import codeql.rust.elements.GenericParam
 import codeql.rust.elements.Name
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * A ConstParam. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/DynTraitType.qll b/rust/ql/lib/codeql/rust/elements/DynTraitType.qll
deleted file mode 100644
index 237e7d4704a..00000000000
--- a/rust/ql/lib/codeql/rust/elements/DynTraitType.qll
+++ /dev/null
@@ -1,16 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `DynTraitType`.
- */
-
-private import internal.DynTraitTypeImpl
-import codeql.rust.elements.TypeBoundList
-import codeql.rust.elements.TypeRef
-
-/**
- * A DynTraitType. For example:
- * ```rust
- * todo!()
- * ```
- */
-final class DynTraitType = Impl::DynTraitType;
diff --git a/rust/ql/lib/codeql/rust/elements/DynTraitTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/DynTraitTypeRepr.qll
new file mode 100644
index 00000000000..0ddf36aced6
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/DynTraitTypeRepr.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `DynTraitTypeRepr`.
+ */
+
+private import internal.DynTraitTypeReprImpl
+import codeql.rust.elements.TypeBoundList
+import codeql.rust.elements.TypeRepr
+
+/**
+ * A DynTraitTypeRepr. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class DynTraitTypeRepr = Impl::DynTraitTypeRepr;
diff --git a/rust/ql/lib/codeql/rust/elements/FnPtrType.qll b/rust/ql/lib/codeql/rust/elements/FnPtrType.qll
deleted file mode 100644
index e0ed6490b5f..00000000000
--- a/rust/ql/lib/codeql/rust/elements/FnPtrType.qll
+++ /dev/null
@@ -1,18 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `FnPtrType`.
- */
-
-private import internal.FnPtrTypeImpl
-import codeql.rust.elements.Abi
-import codeql.rust.elements.ParamList
-import codeql.rust.elements.RetType
-import codeql.rust.elements.TypeRef
-
-/**
- * A FnPtrType. For example:
- * ```rust
- * todo!()
- * ```
- */
-final class FnPtrType = Impl::FnPtrType;
diff --git a/rust/ql/lib/codeql/rust/elements/FnPtrTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/FnPtrTypeRepr.qll
new file mode 100644
index 00000000000..290b9b9d8fd
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/FnPtrTypeRepr.qll
@@ -0,0 +1,18 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `FnPtrTypeRepr`.
+ */
+
+private import internal.FnPtrTypeReprImpl
+import codeql.rust.elements.Abi
+import codeql.rust.elements.ParamList
+import codeql.rust.elements.RetTypeRepr
+import codeql.rust.elements.TypeRepr
+
+/**
+ * A FnPtrTypeRepr. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class FnPtrTypeRepr = Impl::FnPtrTypeRepr;
diff --git a/rust/ql/lib/codeql/rust/elements/ForExpr.qll b/rust/ql/lib/codeql/rust/elements/ForExpr.qll
index c4ef6f9faff..cfb2586202e 100644
--- a/rust/ql/lib/codeql/rust/elements/ForExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/ForExpr.qll
@@ -5,9 +5,8 @@
 
 private import internal.ForExprImpl
 import codeql.rust.elements.Attr
-import codeql.rust.elements.BlockExpr
 import codeql.rust.elements.Expr
-import codeql.rust.elements.Label
+import codeql.rust.elements.LoopingExpr
 import codeql.rust.elements.Pat
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/ForType.qll b/rust/ql/lib/codeql/rust/elements/ForType.qll
deleted file mode 100644
index ec6bae3ab95..00000000000
--- a/rust/ql/lib/codeql/rust/elements/ForType.qll
+++ /dev/null
@@ -1,16 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `ForType`.
- */
-
-private import internal.ForTypeImpl
-import codeql.rust.elements.GenericParamList
-import codeql.rust.elements.TypeRef
-
-/**
- * A ForType. For example:
- * ```rust
- * todo!()
- * ```
- */
-final class ForType = Impl::ForType;
diff --git a/rust/ql/lib/codeql/rust/elements/ForTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/ForTypeRepr.qll
new file mode 100644
index 00000000000..d734fdd8253
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ForTypeRepr.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ForTypeRepr`.
+ */
+
+private import internal.ForTypeReprImpl
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.TypeRepr
+
+/**
+ * A ForTypeRepr. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class ForTypeRepr = Impl::ForTypeRepr;
diff --git a/rust/ql/lib/codeql/rust/elements/Format.qll b/rust/ql/lib/codeql/rust/elements/Format.qll
index 0c8b5d1c541..f8b705be4fd 100644
--- a/rust/ql/lib/codeql/rust/elements/Format.qll
+++ b/rust/ql/lib/codeql/rust/elements/Format.qll
@@ -5,6 +5,7 @@
 
 private import internal.FormatImpl
 import codeql.rust.elements.FormatArgsExpr
+import codeql.rust.elements.FormatArgument
 import codeql.rust.elements.Locatable
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/FormatArgsExpr.qll b/rust/ql/lib/codeql/rust/elements/FormatArgsExpr.qll
index 226b4d211aa..419a48a5335 100644
--- a/rust/ql/lib/codeql/rust/elements/FormatArgsExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/FormatArgsExpr.qll
@@ -6,12 +6,17 @@
 private import internal.FormatArgsExprImpl
 import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
+import codeql.rust.elements.Format
 import codeql.rust.elements.FormatArgsArg
 
 /**
  * A FormatArgsExpr. For example:
  * ```rust
- * todo!()
+ * format_args!("no args");
+ * format_args!("{} foo {:?}", 1, 2);
+ * format_args!("{b} foo {a:?}", a=1, b=2);
+ * let (x, y) = (1, 42);
+ * format_args!("{x}, {y}");
  * ```
  */
 final class FormatArgsExpr = Impl::FormatArgsExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/FormatArgument.qll b/rust/ql/lib/codeql/rust/elements/FormatArgument.qll
index 62313c52372..00e9007434b 100644
--- a/rust/ql/lib/codeql/rust/elements/FormatArgument.qll
+++ b/rust/ql/lib/codeql/rust/elements/FormatArgument.qll
@@ -5,6 +5,7 @@
 
 private import internal.FormatArgumentImpl
 import codeql.rust.elements.Format
+import codeql.rust.elements.FormatTemplateVariableAccess
 import codeql.rust.elements.Locatable
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/Function.qll b/rust/ql/lib/codeql/rust/elements/Function.qll
index 2557429f60f..2f2a151f453 100644
--- a/rust/ql/lib/codeql/rust/elements/Function.qll
+++ b/rust/ql/lib/codeql/rust/elements/Function.qll
@@ -12,7 +12,7 @@ import codeql.rust.elements.ExternItem
 import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.Item
 import codeql.rust.elements.Name
-import codeql.rust.elements.RetType
+import codeql.rust.elements.RetTypeRepr
 import codeql.rust.elements.Visibility
 import codeql.rust.elements.WhereClause
 
diff --git a/rust/ql/lib/codeql/rust/elements/Impl.qll b/rust/ql/lib/codeql/rust/elements/Impl.qll
index 747cbe90cc6..868f5b6f201 100644
--- a/rust/ql/lib/codeql/rust/elements/Impl.qll
+++ b/rust/ql/lib/codeql/rust/elements/Impl.qll
@@ -8,7 +8,7 @@ import codeql.rust.elements.AssocItemList
 import codeql.rust.elements.Attr
 import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.Item
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.Visibility
 import codeql.rust.elements.WhereClause
 
diff --git a/rust/ql/lib/codeql/rust/elements/ImplTraitType.qll b/rust/ql/lib/codeql/rust/elements/ImplTraitType.qll
deleted file mode 100644
index 7f3a8a96159..00000000000
--- a/rust/ql/lib/codeql/rust/elements/ImplTraitType.qll
+++ /dev/null
@@ -1,16 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `ImplTraitType`.
- */
-
-private import internal.ImplTraitTypeImpl
-import codeql.rust.elements.TypeBoundList
-import codeql.rust.elements.TypeRef
-
-/**
- * A ImplTraitType. For example:
- * ```rust
- * todo!()
- * ```
- */
-final class ImplTraitType = Impl::ImplTraitType;
diff --git a/rust/ql/lib/codeql/rust/elements/ImplTraitTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/ImplTraitTypeRepr.qll
new file mode 100644
index 00000000000..72aa3048363
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ImplTraitTypeRepr.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ImplTraitTypeRepr`.
+ */
+
+private import internal.ImplTraitTypeReprImpl
+import codeql.rust.elements.TypeBoundList
+import codeql.rust.elements.TypeRepr
+
+/**
+ * A ImplTraitTypeRepr. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class ImplTraitTypeRepr = Impl::ImplTraitTypeRepr;
diff --git a/rust/ql/lib/codeql/rust/elements/InferType.qll b/rust/ql/lib/codeql/rust/elements/InferType.qll
deleted file mode 100644
index ae0f6eff7d5..00000000000
--- a/rust/ql/lib/codeql/rust/elements/InferType.qll
+++ /dev/null
@@ -1,15 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `InferType`.
- */
-
-private import internal.InferTypeImpl
-import codeql.rust.elements.TypeRef
-
-/**
- * A InferType. For example:
- * ```rust
- * todo!()
- * ```
- */
-final class InferType = Impl::InferType;
diff --git a/rust/ql/lib/codeql/rust/elements/InferTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/InferTypeRepr.qll
new file mode 100644
index 00000000000..79ff4934a56
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/InferTypeRepr.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `InferTypeRepr`.
+ */
+
+private import internal.InferTypeReprImpl
+import codeql.rust.elements.TypeRepr
+
+/**
+ * A InferTypeRepr. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class InferTypeRepr = Impl::InferTypeRepr;
diff --git a/rust/ql/lib/codeql/rust/elements/Item.qll b/rust/ql/lib/codeql/rust/elements/Item.qll
index 838ba32b964..b95620551ba 100644
--- a/rust/ql/lib/codeql/rust/elements/Item.qll
+++ b/rust/ql/lib/codeql/rust/elements/Item.qll
@@ -4,6 +4,7 @@
  */
 
 private import internal.ItemImpl
+import codeql.rust.elements.Addressable
 import codeql.rust.elements.Stmt
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/LabelableExpr.qll b/rust/ql/lib/codeql/rust/elements/LabelableExpr.qll
new file mode 100644
index 00000000000..c2a042595a1
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/LabelableExpr.qll
@@ -0,0 +1,13 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `LabelableExpr`.
+ */
+
+private import internal.LabelableExprImpl
+import codeql.rust.elements.Expr
+import codeql.rust.elements.Label
+
+/**
+ * The base class for expressions that can be labeled (`LoopExpr`, `ForExpr`, `WhileExpr` or `BlockExpr`).
+ */
+final class LabelableExpr = Impl::LabelableExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/LetStmt.qll b/rust/ql/lib/codeql/rust/elements/LetStmt.qll
index 63bf60e3e6f..48960e3a5c6 100644
--- a/rust/ql/lib/codeql/rust/elements/LetStmt.qll
+++ b/rust/ql/lib/codeql/rust/elements/LetStmt.qll
@@ -9,7 +9,7 @@ import codeql.rust.elements.Expr
 import codeql.rust.elements.LetElse
 import codeql.rust.elements.Pat
 import codeql.rust.elements.Stmt
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * A let statement. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/LoopExpr.qll b/rust/ql/lib/codeql/rust/elements/LoopExpr.qll
index 6abc449c626..cdb6d743b50 100644
--- a/rust/ql/lib/codeql/rust/elements/LoopExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/LoopExpr.qll
@@ -5,9 +5,7 @@
 
 private import internal.LoopExprImpl
 import codeql.rust.elements.Attr
-import codeql.rust.elements.BlockExpr
-import codeql.rust.elements.Expr
-import codeql.rust.elements.Label
+import codeql.rust.elements.LoopingExpr
 
 /**
  * A loop expression. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/LoopingExpr.qll b/rust/ql/lib/codeql/rust/elements/LoopingExpr.qll
new file mode 100644
index 00000000000..6078afdf762
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/LoopingExpr.qll
@@ -0,0 +1,13 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `LoopingExpr`.
+ */
+
+private import internal.LoopingExprImpl
+import codeql.rust.elements.BlockExpr
+import codeql.rust.elements.LabelableExpr
+
+/**
+ * The base class for expressions that loop (`LoopExpr`, `ForExpr` or `WhileExpr`).
+ */
+final class LoopingExpr = Impl::LoopingExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/MacroType.qll b/rust/ql/lib/codeql/rust/elements/MacroType.qll
deleted file mode 100644
index 38be0fa4a20..00000000000
--- a/rust/ql/lib/codeql/rust/elements/MacroType.qll
+++ /dev/null
@@ -1,16 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `MacroType`.
- */
-
-private import internal.MacroTypeImpl
-import codeql.rust.elements.MacroCall
-import codeql.rust.elements.TypeRef
-
-/**
- * A MacroType. For example:
- * ```rust
- * todo!()
- * ```
- */
-final class MacroType = Impl::MacroType;
diff --git a/rust/ql/lib/codeql/rust/elements/MacroTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/MacroTypeRepr.qll
new file mode 100644
index 00000000000..780fb3d709c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/MacroTypeRepr.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `MacroTypeRepr`.
+ */
+
+private import internal.MacroTypeReprImpl
+import codeql.rust.elements.MacroCall
+import codeql.rust.elements.TypeRepr
+
+/**
+ * A MacroTypeRepr. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class MacroTypeRepr = Impl::MacroTypeRepr;
diff --git a/rust/ql/lib/codeql/rust/elements/NeverType.qll b/rust/ql/lib/codeql/rust/elements/NeverType.qll
deleted file mode 100644
index 3c46acd33ca..00000000000
--- a/rust/ql/lib/codeql/rust/elements/NeverType.qll
+++ /dev/null
@@ -1,15 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `NeverType`.
- */
-
-private import internal.NeverTypeImpl
-import codeql.rust.elements.TypeRef
-
-/**
- * A NeverType. For example:
- * ```rust
- * todo!()
- * ```
- */
-final class NeverType = Impl::NeverType;
diff --git a/rust/ql/lib/codeql/rust/elements/NeverTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/NeverTypeRepr.qll
new file mode 100644
index 00000000000..8eec61da058
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/NeverTypeRepr.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `NeverTypeRepr`.
+ */
+
+private import internal.NeverTypeReprImpl
+import codeql.rust.elements.TypeRepr
+
+/**
+ * A NeverTypeRepr. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class NeverTypeRepr = Impl::NeverTypeRepr;
diff --git a/rust/ql/lib/codeql/rust/elements/OffsetOfExpr.qll b/rust/ql/lib/codeql/rust/elements/OffsetOfExpr.qll
index 3cd31677a69..4136158913a 100644
--- a/rust/ql/lib/codeql/rust/elements/OffsetOfExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/OffsetOfExpr.qll
@@ -7,7 +7,7 @@ private import internal.OffsetOfExprImpl
 import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.NameRef
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  *  An `offset_of` expression. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/Param.qll b/rust/ql/lib/codeql/rust/elements/Param.qll
index eb46d206ba4..74eda683740 100644
--- a/rust/ql/lib/codeql/rust/elements/Param.qll
+++ b/rust/ql/lib/codeql/rust/elements/Param.qll
@@ -4,15 +4,15 @@
  */
 
 private import internal.ParamImpl
-import codeql.rust.elements.AstNode
-import codeql.rust.elements.Attr
+import codeql.rust.elements.ParamBase
 import codeql.rust.elements.Pat
-import codeql.rust.elements.TypeRef
 
 /**
- * A Param. For example:
+ * A parameter in a function or method. For example `x` in:
  * ```rust
- * todo!()
+ * fn new(x: T) -> Foo<T> {
+ *   // ...
+ * }
  * ```
  */
 final class Param = Impl::Param;
diff --git a/rust/ql/lib/codeql/rust/elements/ParamBase.qll b/rust/ql/lib/codeql/rust/elements/ParamBase.qll
new file mode 100644
index 00000000000..ca46906a14f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ParamBase.qll
@@ -0,0 +1,14 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ParamBase`.
+ */
+
+private import internal.ParamBaseImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.Attr
+import codeql.rust.elements.TypeRepr
+
+/**
+ * A normal parameter, `Param`, or a self parameter `SelfParam`.
+ */
+final class ParamBase = Impl::ParamBase;
diff --git a/rust/ql/lib/codeql/rust/elements/ParenType.qll b/rust/ql/lib/codeql/rust/elements/ParenType.qll
deleted file mode 100644
index cbf1b89dc5c..00000000000
--- a/rust/ql/lib/codeql/rust/elements/ParenType.qll
+++ /dev/null
@@ -1,15 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `ParenType`.
- */
-
-private import internal.ParenTypeImpl
-import codeql.rust.elements.TypeRef
-
-/**
- * A ParenType. For example:
- * ```rust
- * todo!()
- * ```
- */
-final class ParenType = Impl::ParenType;
diff --git a/rust/ql/lib/codeql/rust/elements/ParenTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/ParenTypeRepr.qll
new file mode 100644
index 00000000000..881d1a805fc
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/ParenTypeRepr.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `ParenTypeRepr`.
+ */
+
+private import internal.ParenTypeReprImpl
+import codeql.rust.elements.TypeRepr
+
+/**
+ * A ParenTypeRepr. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class ParenTypeRepr = Impl::ParenTypeRepr;
diff --git a/rust/ql/lib/codeql/rust/elements/Path.qll b/rust/ql/lib/codeql/rust/elements/Path.qll
index 530c40397c3..cb228373cf5 100644
--- a/rust/ql/lib/codeql/rust/elements/Path.qll
+++ b/rust/ql/lib/codeql/rust/elements/Path.qll
@@ -10,6 +10,7 @@ import codeql.rust.elements.Resolvable
 /**
  * A path. For example:
  * ```rust
+ * use some_crate::some_module::some_item;
  * foo::bar;
  * ```
  */
diff --git a/rust/ql/lib/codeql/rust/elements/PathExpr.qll b/rust/ql/lib/codeql/rust/elements/PathExpr.qll
index e1bf10488e3..3e7d6e5e40f 100644
--- a/rust/ql/lib/codeql/rust/elements/PathExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/PathExpr.qll
@@ -14,7 +14,7 @@ import codeql.rust.elements.PathExprBase
  * let x = variable;
  * let x = foo::bar;
  * let y = <T>::foo;
- * let z = <TypeRef as Trait>::foo;
+ * let z = <TypeRepr as Trait>::foo;
  * ```
  */
 final class PathExpr = Impl::PathExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/PathSegment.qll b/rust/ql/lib/codeql/rust/elements/PathSegment.qll
index 5566ba322b6..9eb0830a354 100644
--- a/rust/ql/lib/codeql/rust/elements/PathSegment.qll
+++ b/rust/ql/lib/codeql/rust/elements/PathSegment.qll
@@ -8,15 +8,12 @@ import codeql.rust.elements.AstNode
 import codeql.rust.elements.GenericArgList
 import codeql.rust.elements.NameRef
 import codeql.rust.elements.ParamList
-import codeql.rust.elements.PathType
-import codeql.rust.elements.RetType
+import codeql.rust.elements.PathTypeRepr
+import codeql.rust.elements.RetTypeRepr
 import codeql.rust.elements.ReturnTypeSyntax
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
- * A PathSegment. For example:
- * ```rust
- * todo!()
- * ```
+ * A path segment, which is one part of a whole path.
  */
 final class PathSegment = Impl::PathSegment;
diff --git a/rust/ql/lib/codeql/rust/elements/PathType.qll b/rust/ql/lib/codeql/rust/elements/PathType.qll
deleted file mode 100644
index e313b9d1b56..00000000000
--- a/rust/ql/lib/codeql/rust/elements/PathType.qll
+++ /dev/null
@@ -1,16 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `PathType`.
- */
-
-private import internal.PathTypeImpl
-import codeql.rust.elements.Path
-import codeql.rust.elements.TypeRef
-
-/**
- * A PathType. For example:
- * ```rust
- * todo!()
- * ```
- */
-final class PathType = Impl::PathType;
diff --git a/rust/ql/lib/codeql/rust/elements/PathTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/PathTypeRepr.qll
new file mode 100644
index 00000000000..684d4429e5f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/PathTypeRepr.qll
@@ -0,0 +1,17 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `PathTypeRepr`.
+ */
+
+private import internal.PathTypeReprImpl
+import codeql.rust.elements.Path
+import codeql.rust.elements.TypeRepr
+
+/**
+ * A type referring to a path. For example:
+ * ```rust
+ * type X = std::collections::HashMap<i32, i32>;
+ * type Y = X::Item;
+ * ```
+ */
+final class PathTypeRepr = Impl::PathTypeRepr;
diff --git a/rust/ql/lib/codeql/rust/elements/PtrType.qll b/rust/ql/lib/codeql/rust/elements/PtrType.qll
deleted file mode 100644
index 4a40eaeeb48..00000000000
--- a/rust/ql/lib/codeql/rust/elements/PtrType.qll
+++ /dev/null
@@ -1,15 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `PtrType`.
- */
-
-private import internal.PtrTypeImpl
-import codeql.rust.elements.TypeRef
-
-/**
- * A PtrType. For example:
- * ```rust
- * todo!()
- * ```
- */
-final class PtrType = Impl::PtrType;
diff --git a/rust/ql/lib/codeql/rust/elements/PtrTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/PtrTypeRepr.qll
new file mode 100644
index 00000000000..219b8aad565
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/PtrTypeRepr.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `PtrTypeRepr`.
+ */
+
+private import internal.PtrTypeReprImpl
+import codeql.rust.elements.TypeRepr
+
+/**
+ * A PtrTypeRepr. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class PtrTypeRepr = Impl::PtrTypeRepr;
diff --git a/rust/ql/lib/codeql/rust/elements/RecordField.qll b/rust/ql/lib/codeql/rust/elements/RecordField.qll
index d5f4a6a021d..4a5e749b905 100644
--- a/rust/ql/lib/codeql/rust/elements/RecordField.qll
+++ b/rust/ql/lib/codeql/rust/elements/RecordField.qll
@@ -7,7 +7,7 @@ private import internal.RecordFieldImpl
 import codeql.rust.elements.AstNode
 import codeql.rust.elements.Attr
 import codeql.rust.elements.Name
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.Visibility
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/RefType.qll b/rust/ql/lib/codeql/rust/elements/RefType.qll
deleted file mode 100644
index 71ecac73f53..00000000000
--- a/rust/ql/lib/codeql/rust/elements/RefType.qll
+++ /dev/null
@@ -1,16 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `RefType`.
- */
-
-private import internal.RefTypeImpl
-import codeql.rust.elements.Lifetime
-import codeql.rust.elements.TypeRef
-
-/**
- * A RefType. For example:
- * ```rust
- * todo!()
- * ```
- */
-final class RefType = Impl::RefType;
diff --git a/rust/ql/lib/codeql/rust/elements/RefTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/RefTypeRepr.qll
new file mode 100644
index 00000000000..95e4e54196f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/RefTypeRepr.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `RefTypeRepr`.
+ */
+
+private import internal.RefTypeReprImpl
+import codeql.rust.elements.Lifetime
+import codeql.rust.elements.TypeRepr
+
+/**
+ * A RefTypeRepr. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class RefTypeRepr = Impl::RefTypeRepr;
diff --git a/rust/ql/lib/codeql/rust/elements/RetType.qll b/rust/ql/lib/codeql/rust/elements/RetType.qll
deleted file mode 100644
index edca3af1b7a..00000000000
--- a/rust/ql/lib/codeql/rust/elements/RetType.qll
+++ /dev/null
@@ -1,16 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `RetType`.
- */
-
-private import internal.RetTypeImpl
-import codeql.rust.elements.AstNode
-import codeql.rust.elements.TypeRef
-
-/**
- * A RetType. For example:
- * ```rust
- * todo!()
- * ```
- */
-final class RetType = Impl::RetType;
diff --git a/rust/ql/lib/codeql/rust/elements/RetTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/RetTypeRepr.qll
new file mode 100644
index 00000000000..05f7cc73e2c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/RetTypeRepr.qll
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `RetTypeRepr`.
+ */
+
+private import internal.RetTypeReprImpl
+import codeql.rust.elements.AstNode
+import codeql.rust.elements.TypeRepr
+
+/**
+ * A RetTypeRepr. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class RetTypeRepr = Impl::RetTypeRepr;
diff --git a/rust/ql/lib/codeql/rust/elements/SelfParam.qll b/rust/ql/lib/codeql/rust/elements/SelfParam.qll
index 74d2fb5e2eb..88c1a05d837 100644
--- a/rust/ql/lib/codeql/rust/elements/SelfParam.qll
+++ b/rust/ql/lib/codeql/rust/elements/SelfParam.qll
@@ -4,16 +4,16 @@
  */
 
 private import internal.SelfParamImpl
-import codeql.rust.elements.AstNode
-import codeql.rust.elements.Attr
 import codeql.rust.elements.Lifetime
 import codeql.rust.elements.Name
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.ParamBase
 
 /**
- * A SelfParam. For example:
+ * A `self` parameter. For example `self` in:
  * ```rust
- * todo!()
+ * fn push(&mut self, value: T) {
+ *   // ...
+ * }
  * ```
  */
 final class SelfParam = Impl::SelfParam;
diff --git a/rust/ql/lib/codeql/rust/elements/SliceType.qll b/rust/ql/lib/codeql/rust/elements/SliceType.qll
deleted file mode 100644
index f8774678411..00000000000
--- a/rust/ql/lib/codeql/rust/elements/SliceType.qll
+++ /dev/null
@@ -1,15 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `SliceType`.
- */
-
-private import internal.SliceTypeImpl
-import codeql.rust.elements.TypeRef
-
-/**
- * A SliceType. For example:
- * ```rust
- * todo!()
- * ```
- */
-final class SliceType = Impl::SliceType;
diff --git a/rust/ql/lib/codeql/rust/elements/SliceTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/SliceTypeRepr.qll
new file mode 100644
index 00000000000..051eceb5cc2
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/SliceTypeRepr.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `SliceTypeRepr`.
+ */
+
+private import internal.SliceTypeReprImpl
+import codeql.rust.elements.TypeRepr
+
+/**
+ * A SliceTypeRepr. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class SliceTypeRepr = Impl::SliceTypeRepr;
diff --git a/rust/ql/lib/codeql/rust/elements/Static.qll b/rust/ql/lib/codeql/rust/elements/Static.qll
index 6bc791bd403..74467dcb705 100644
--- a/rust/ql/lib/codeql/rust/elements/Static.qll
+++ b/rust/ql/lib/codeql/rust/elements/Static.qll
@@ -9,7 +9,7 @@ import codeql.rust.elements.Expr
 import codeql.rust.elements.ExternItem
 import codeql.rust.elements.Item
 import codeql.rust.elements.Name
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.Visibility
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/TupleField.qll b/rust/ql/lib/codeql/rust/elements/TupleField.qll
index a7ad4706e8e..10e22fd21ae 100644
--- a/rust/ql/lib/codeql/rust/elements/TupleField.qll
+++ b/rust/ql/lib/codeql/rust/elements/TupleField.qll
@@ -6,7 +6,7 @@
 private import internal.TupleFieldImpl
 import codeql.rust.elements.AstNode
 import codeql.rust.elements.Attr
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.Visibility
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/TupleType.qll b/rust/ql/lib/codeql/rust/elements/TupleType.qll
deleted file mode 100644
index a82799ee9de..00000000000
--- a/rust/ql/lib/codeql/rust/elements/TupleType.qll
+++ /dev/null
@@ -1,15 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `TupleType`.
- */
-
-private import internal.TupleTypeImpl
-import codeql.rust.elements.TypeRef
-
-/**
- * A TupleType. For example:
- * ```rust
- * todo!()
- * ```
- */
-final class TupleType = Impl::TupleType;
diff --git a/rust/ql/lib/codeql/rust/elements/TupleTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/TupleTypeRepr.qll
new file mode 100644
index 00000000000..66e0645cd1b
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/TupleTypeRepr.qll
@@ -0,0 +1,15 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the public class `TupleTypeRepr`.
+ */
+
+private import internal.TupleTypeReprImpl
+import codeql.rust.elements.TypeRepr
+
+/**
+ * A TupleTypeRepr. For example:
+ * ```rust
+ * todo!()
+ * ```
+ */
+final class TupleTypeRepr = Impl::TupleTypeRepr;
diff --git a/rust/ql/lib/codeql/rust/elements/TypeAlias.qll b/rust/ql/lib/codeql/rust/elements/TypeAlias.qll
index 2f20a6c0ec6..a3bd36bf728 100644
--- a/rust/ql/lib/codeql/rust/elements/TypeAlias.qll
+++ b/rust/ql/lib/codeql/rust/elements/TypeAlias.qll
@@ -11,7 +11,7 @@ import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.Item
 import codeql.rust.elements.Name
 import codeql.rust.elements.TypeBoundList
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.Visibility
 import codeql.rust.elements.WhereClause
 
diff --git a/rust/ql/lib/codeql/rust/elements/TypeArg.qll b/rust/ql/lib/codeql/rust/elements/TypeArg.qll
index b93f0781adc..42fa984506a 100644
--- a/rust/ql/lib/codeql/rust/elements/TypeArg.qll
+++ b/rust/ql/lib/codeql/rust/elements/TypeArg.qll
@@ -5,7 +5,7 @@
 
 private import internal.TypeArgImpl
 import codeql.rust.elements.GenericArg
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * A TypeArg. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/TypeBound.qll b/rust/ql/lib/codeql/rust/elements/TypeBound.qll
index 77990f6425b..6760b562e8f 100644
--- a/rust/ql/lib/codeql/rust/elements/TypeBound.qll
+++ b/rust/ql/lib/codeql/rust/elements/TypeBound.qll
@@ -7,7 +7,7 @@ private import internal.TypeBoundImpl
 import codeql.rust.elements.AstNode
 import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.Lifetime
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * A TypeBound. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/TypeParam.qll b/rust/ql/lib/codeql/rust/elements/TypeParam.qll
index 8de967d4f91..bf01aaf6f1f 100644
--- a/rust/ql/lib/codeql/rust/elements/TypeParam.qll
+++ b/rust/ql/lib/codeql/rust/elements/TypeParam.qll
@@ -8,7 +8,7 @@ import codeql.rust.elements.Attr
 import codeql.rust.elements.GenericParam
 import codeql.rust.elements.Name
 import codeql.rust.elements.TypeBoundList
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * A TypeParam. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/TypeRef.qll b/rust/ql/lib/codeql/rust/elements/TypeRepr.qll
similarity index 61%
rename from rust/ql/lib/codeql/rust/elements/TypeRef.qll
rename to rust/ql/lib/codeql/rust/elements/TypeRepr.qll
index f30bd7a0a61..0a9b3066df0 100644
--- a/rust/ql/lib/codeql/rust/elements/TypeRef.qll
+++ b/rust/ql/lib/codeql/rust/elements/TypeRepr.qll
@@ -1,9 +1,9 @@
 // generated by codegen, do not edit
 /**
- * This module provides the public class `TypeRef`.
+ * This module provides the public class `TypeRepr`.
  */
 
-private import internal.TypeRefImpl
+private import internal.TypeReprImpl
 import codeql.rust.elements.AstNode
 
 /**
@@ -14,4 +14,4 @@ import codeql.rust.elements.AstNode
  * let z: Option<i32>;
  * ```
  */
-final class TypeRef = Impl::TypeRef;
+final class TypeRepr = Impl::TypeRepr;
diff --git a/rust/ql/lib/codeql/rust/elements/Variant.qll b/rust/ql/lib/codeql/rust/elements/Variant.qll
index 6100928696e..658143dbfa2 100644
--- a/rust/ql/lib/codeql/rust/elements/Variant.qll
+++ b/rust/ql/lib/codeql/rust/elements/Variant.qll
@@ -4,7 +4,7 @@
  */
 
 private import internal.VariantImpl
-import codeql.rust.elements.AstNode
+import codeql.rust.elements.Addressable
 import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.FieldList
diff --git a/rust/ql/lib/codeql/rust/elements/WherePred.qll b/rust/ql/lib/codeql/rust/elements/WherePred.qll
index 2300be0ad45..3f0bb8c5fe7 100644
--- a/rust/ql/lib/codeql/rust/elements/WherePred.qll
+++ b/rust/ql/lib/codeql/rust/elements/WherePred.qll
@@ -8,7 +8,7 @@ import codeql.rust.elements.AstNode
 import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.Lifetime
 import codeql.rust.elements.TypeBoundList
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * A WherePred. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/WhileExpr.qll b/rust/ql/lib/codeql/rust/elements/WhileExpr.qll
index 9dcbe9c6346..fc704d35095 100644
--- a/rust/ql/lib/codeql/rust/elements/WhileExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/WhileExpr.qll
@@ -5,9 +5,8 @@
 
 private import internal.WhileExprImpl
 import codeql.rust.elements.Attr
-import codeql.rust.elements.BlockExpr
 import codeql.rust.elements.Expr
-import codeql.rust.elements.Label
+import codeql.rust.elements.LoopingExpr
 
 /**
  * A WhileExpr. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/internal/AddressableImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/AddressableImpl.qll
new file mode 100644
index 00000000000..b3fe47b294a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/AddressableImpl.qll
@@ -0,0 +1,21 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `Addressable`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Addressable
+
+/**
+ * INTERNAL: This module contains the customizable definition of `Addressable` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * Something that can be addressed by a path.
+   *
+   * TODO: This does not yet include all possible cases.
+   */
+  class Addressable extends Generated::Addressable { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ArrayExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ArrayExprImpl.qll
index ff4ce224820..13abb32bcce 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ArrayExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ArrayExprImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `ArrayExpr`.
  *
@@ -6,18 +5,34 @@
  */
 
 private import codeql.rust.elements.internal.generated.ArrayExpr
+private import codeql.rust.elements.internal.generated.Raw
+private import codeql.rust.elements.internal.generated.Synth
 
 /**
  * INTERNAL: This module contains the customizable definition of `ArrayExpr` and should not
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
-   * An array expression. For example:
+   * The base class for array expressions. For example:
    * ```rust
    * [1, 2, 3];
    * [1; 10];
    * ```
    */
-  class ArrayExpr extends Generated::ArrayExpr { }
+  class ArrayExpr extends Generated::ArrayExpr {
+    cached
+    private Raw::ArrayExprInternal getUnderlyingEntity() {
+      this = Synth::TArrayListExpr(result) or this = Synth::TArrayRepeatExpr(result)
+    }
+
+    override Expr getExpr(int index) {
+      result = Synth::convertExprFromRaw(this.getUnderlyingEntity().getExpr(index))
+    }
+
+    override Attr getAttr(int index) {
+      result = Synth::convertAttrFromRaw(this.getUnderlyingEntity().getAttr(index))
+    }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ArrayExprInternal.qll b/rust/ql/lib/codeql/rust/elements/internal/ArrayExprInternal.qll
new file mode 100644
index 00000000000..d904ecd23e8
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ArrayExprInternal.qll
@@ -0,0 +1,13 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the class `ArrayExprInternal`.
+ */
+
+private import ArrayExprInternalImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+
+/**
+ * INTERNAL: Do not use.
+ */
+final class ArrayExprInternal = Impl::ArrayExprInternal;
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ArrayExprInternalConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ArrayExprInternalConstructor.qll
new file mode 100644
index 00000000000..a4b29741d26
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ArrayExprInternalConstructor.qll
@@ -0,0 +1,17 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ArrayExprInternal` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+private import codeql.rust.elements.internal.generated.PureSynthConstructors
+
+/**
+ *  The characteristic predicate of `ArrayExprInternal` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructArrayExprInternal(Raw::ArrayExprInternal id) {
+  not constructArrayListExpr(id) and not constructArrayRepeatExpr(id)
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RetTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ArrayExprInternalImpl.qll
similarity index 55%
rename from rust/ql/lib/codeql/rust/elements/internal/RetTypeImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/ArrayExprInternalImpl.qll
index 9fcda02c6e6..df972e84525 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/RetTypeImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ArrayExprInternalImpl.qll
@@ -1,22 +1,16 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `RetType`.
+ * This module provides a hand-modifiable wrapper around the generated class `ArrayExprInternal`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.RetType
+private import codeql.rust.elements.internal.generated.ArrayExprInternal
 
 /**
- * INTERNAL: This module contains the customizable definition of `RetType` and should not
+ * INTERNAL: This module contains the customizable definition of `ArrayExprInternal` and should not
  * be referenced directly.
  */
 module Impl {
-  /**
-   * A RetType. For example:
-   * ```rust
-   * todo!()
-   * ```
-   */
-  class RetType extends Generated::RetType { }
+  class ArrayExprInternal extends Generated::ArrayExprInternal { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ArrayListExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ArrayListExprConstructor.qll
new file mode 100644
index 00000000000..97ad88afa2a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ArrayListExprConstructor.qll
@@ -0,0 +1,13 @@
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ArrayListExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ArrayListExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructArrayListExpr(Raw::ArrayExprInternal id) { not id.isSemicolon() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ArrayListExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ArrayListExprImpl.qll
new file mode 100644
index 00000000000..8b22613dca3
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ArrayListExprImpl.qll
@@ -0,0 +1,27 @@
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ArrayListExpr`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ArrayListExpr
+private import codeql.rust.elements.internal.generated.Raw
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.Expr
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ArrayListExpr` and should not
+ * be referenced directly.
+ */
+module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
+  /**
+   * An array expression with a list of elements. For example:
+   * ```rust
+   * [1, 2, 3];
+   * ```
+   */
+  class ArrayListExpr extends Generated::ArrayListExpr {
+    override string toString() { result = "[...]" }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ArrayRepeatExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ArrayRepeatExprConstructor.qll
new file mode 100644
index 00000000000..3f6e661d416
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ArrayRepeatExprConstructor.qll
@@ -0,0 +1,13 @@
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ArrayRepeatExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ArrayRepeatExpr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructArrayRepeatExpr(Raw::ArrayExprInternal id) { id.isSemicolon() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ArrayRepeatExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ArrayRepeatExprImpl.qll
new file mode 100644
index 00000000000..66e83a6badb
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ArrayRepeatExprImpl.qll
@@ -0,0 +1,34 @@
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ArrayRepeatExpr`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ArrayRepeatExpr
+private import codeql.rust.elements.internal.generated.Raw
+private import codeql.rust.elements.internal.generated.Synth
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ArrayRepeatExpr` and should not
+ * be referenced directly.
+ */
+module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
+  /**
+   * An array expression with a repeat operand and a repeat length. For example:
+   * ```rust
+   * [1; 10];
+   * ```
+   */
+  class ArrayRepeatExpr extends Generated::ArrayRepeatExpr {
+    override string toString() {
+      result =
+        "[" + this.getRepeatOperand().toAbbreviatedString() + "; " +
+          this.getRepeatLength().toAbbreviatedString() + "]"
+    }
+
+    override Expr getRepeatOperand() { result = this.getExpr(0) }
+
+    override Expr getRepeatLength() { result = this.getExpr(1) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ArrayTypeReprConstructor.qll
similarity index 64%
rename from rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeConstructor.qll
rename to rust/ql/lib/codeql/rust/elements/internal/ArrayTypeReprConstructor.qll
index 242a3490708..dfa4be47dfe 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ArrayTypeReprConstructor.qll
@@ -1,14 +1,14 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
  *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `ImplTraitType` synthesized instances.
+ *  `ArrayTypeRepr` synthesized instances.
  *  INTERNAL: Do not use.
  */
 
 private import codeql.rust.elements.internal.generated.Raw
 
 /**
- *  The characteristic predicate of `ImplTraitType` synthesized instances.
+ *  The characteristic predicate of `ArrayTypeRepr` synthesized instances.
  *  INTERNAL: Do not use.
  */
-predicate constructImplTraitType(Raw::ImplTraitType id) { any() }
+predicate constructArrayTypeRepr(Raw::ArrayTypeRepr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ArrayTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ArrayTypeReprImpl.qll
similarity index 71%
rename from rust/ql/lib/codeql/rust/elements/internal/ArrayTypeImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/ArrayTypeReprImpl.qll
index d1ff17da78d..f7cf66626a0 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ArrayTypeImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ArrayTypeReprImpl.qll
@@ -1,22 +1,22 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `ArrayType`.
+ * This module provides a hand-modifiable wrapper around the generated class `ArrayTypeRepr`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.ArrayType
+private import codeql.rust.elements.internal.generated.ArrayTypeRepr
 
 /**
- * INTERNAL: This module contains the customizable definition of `ArrayType` and should not
+ * INTERNAL: This module contains the customizable definition of `ArrayTypeRepr` and should not
  * be referenced directly.
  */
 module Impl {
   /**
-   * A ArrayType. For example:
+   * A ArrayTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class ArrayType extends Generated::ArrayType { }
+  class ArrayTypeRepr extends Generated::ArrayTypeRepr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/AstNodeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/AstNodeImpl.qll
index f2784d058ae..c33b1f3dd6e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/AstNodeImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/AstNodeImpl.qll
@@ -14,6 +14,7 @@ private import codeql.rust.controlflow.ControlFlowGraph
 module Impl {
   private import rust
   private import codeql.rust.elements.internal.generated.ParentChild
+  private import codeql.rust.controlflow.ControlFlowGraph
 
   /**
    * Gets the immediate parent of a non-`AstNode` element `e`.
@@ -62,5 +63,37 @@ module Impl {
       or
       this.getParentNode().isInMacroExpansion()
     }
+
+    /**
+     * Gets a control flow node for this AST node, if any.
+     *
+     * Note that because of _control flow splitting_, one `AstNode` node may correspond
+     * to multiple `CfgNode`s. Example:
+     *
+     * ```rust
+     * if a && b {
+     *   // ...
+     * }
+     * ```
+     *
+     * The CFG for the condition above looks like
+     *
+     * ```mermaid
+     * flowchart TD
+     * 1["a"]
+     * 2["b"]
+     * 3["[false] a && b"]
+     * 4["[true] a && b"]
+     *
+     * 1 -- false --> 3
+     * 1 -- true --> 2
+     * 2 -- false --> 3
+     * 2 -- true --> 4
+     * ```
+     *
+     * That is, the AST node for `a && b` corresponds to _two_ CFG nodes (it is
+     * split into two).
+     */
+    CfgNode getACfgNode() { this = result.getAstNode() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/AwaitExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/AwaitExprImpl.qll
index 39bbe3017df..d9aa0f8bf44 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/AwaitExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/AwaitExprImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `AwaitExpr`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.AwaitExpr
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * An `await` expression. For example:
    * ```rust
@@ -21,5 +21,7 @@ module Impl {
    * }
    * ```
    */
-  class AwaitExpr extends Generated::AwaitExpr { }
+  class AwaitExpr extends Generated::AwaitExpr {
+    override string toString() { result = "await " + this.getExpr().toAbbreviatedString() }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/BecomeExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/BecomeExprImpl.qll
index 748659cfdd3..ded01ec4ef8 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/BecomeExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/BecomeExprImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `BecomeExpr`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.BecomeExpr
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A `become` expression. For example:
    * ```rust
@@ -24,5 +24,7 @@ module Impl {
    * }
    * ```
    */
-  class BecomeExpr extends Generated::BecomeExpr { }
+  class BecomeExpr extends Generated::BecomeExpr {
+    override string toString() { result = "become " + this.getExpr().toAbbreviatedString() }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/BoxPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/BoxPatImpl.qll
index 06fb2c0fbfa..45870d14297 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/BoxPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/BoxPatImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `BoxPat`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.BoxPat
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A box pattern. For example:
    * ```rust
@@ -21,5 +21,7 @@ module Impl {
    * };
    * ```
    */
-  class BoxPat extends Generated::BoxPat { }
+  class BoxPat extends Generated::BoxPat {
+    override string toString() { result = "box " + this.getPat().toAbbreviatedString() }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/BreakExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/BreakExprImpl.qll
index 4b302674a44..d156e207150 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/BreakExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/BreakExprImpl.qll
@@ -5,6 +5,7 @@
  */
 
 private import codeql.rust.elements.internal.generated.BreakExpr
+import codeql.rust.elements.LabelableExpr
 
 /**
  * INTERNAL: This module contains the customizable definition of `BreakExpr` and should not
@@ -102,5 +103,17 @@ module Impl {
         isLabelled(result, label)
       )
     }
+
+    override string toString() {
+      result = strictconcat(int i | | this.toStringPart(i), " " order by i)
+    }
+
+    private string toStringPart(int index) {
+      index = 0 and result = "break"
+      or
+      index = 1 and result = this.getLifetime().toString()
+      or
+      index = 2 and result = this.getExpr().toAbbreviatedString()
+    }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CallExprBaseImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CallExprBaseImpl.qll
index 332ba0fb6b3..3729bb8eeb7 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/CallExprBaseImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/CallExprBaseImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `CallExprBase`.
  *
@@ -12,8 +11,27 @@ private import codeql.rust.elements.internal.generated.CallExprBase
  * be referenced directly.
  */
 module Impl {
+  private import codeql.rust.elements.internal.CallableImpl::Impl
+  private import codeql.rust.elements.internal.MethodCallExprImpl::Impl
+  private import codeql.rust.elements.internal.CallExprImpl::Impl
+  private import codeql.rust.elements.internal.PathExprImpl::Impl
+
+  pragma[nomagic]
+  Resolvable getCallResolvable(CallExprBase call) {
+    result = call.(MethodCallExpr)
+    or
+    result = call.(CallExpr).getFunction().(PathExpr).getPath()
+  }
+
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A function or method call expression. See `CallExpr` and `MethodCallExpr` for further details.
    */
-  class CallExprBase extends Generated::CallExprBase { }
+  class CallExprBase extends Generated::CallExprBase {
+    /**
+     * Gets the target callable of this call, if a unique such target can
+     * be statically resolved.
+     */
+    Callable getStaticTarget() { getCallResolvable(this).resolvesAsItem(result) }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CallExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CallExprImpl.qll
index c03a7b9ac13..53e4c2de2cc 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/CallExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/CallExprImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `CallExpr`.
  *
@@ -6,12 +5,14 @@
  */
 
 private import codeql.rust.elements.internal.generated.CallExpr
+private import codeql.rust.elements.PathExpr
 
 /**
  * INTERNAL: This module contains the customizable definition of `CallExpr` and should not
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A function call expression. For example:
    * ```rust
@@ -21,5 +22,7 @@ module Impl {
    * foo(1) = 4;
    * ```
    */
-  class CallExpr extends Generated::CallExpr { }
+  class CallExpr extends Generated::CallExpr {
+    override string toString() { result = this.getFunction().toAbbreviatedString() + "(...)" }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CastExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CastExprImpl.qll
index 308c321dfbd..d44836596fb 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/CastExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/CastExprImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `CastExpr`.
  *
@@ -12,11 +11,17 @@ private import codeql.rust.elements.internal.generated.CastExpr
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A cast expression. For example:
    * ```rust
    * value as u64;
    * ```
    */
-  class CastExpr extends Generated::CastExpr { }
+  class CastExpr extends Generated::CastExpr {
+    override string toString() {
+      result =
+        this.getExpr().toAbbreviatedString() + " as " + this.getTypeRepr().toAbbreviatedString()
+    }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ClosureExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ClosureExprImpl.qll
index b1c6574b17f..17e373290b5 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ClosureExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ClosureExprImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `ClosureExpr`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.ClosureExpr
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A closure expression. For example:
    * ```rust
@@ -24,5 +24,7 @@ module Impl {
    *  static |x| yield x;
    * ```
    */
-  class ClosureExpr extends Generated::ClosureExpr { }
+  class ClosureExpr extends Generated::ClosureExpr {
+    override string toString() { result = "|...| " + this.getBody().toAbbreviatedString() }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CommentImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CommentImpl.qll
index 32a4f415ab7..85b2a4d80d3 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/CommentImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/CommentImpl.qll
@@ -20,11 +20,30 @@ module Impl {
    * ```
    */
   class Comment extends Generated::Comment {
+    override string toString() {
+      result = this.getCommentMarker() + "..." + this.getCommentEndMarker()
+    }
+
     /**
-     * Gets the text of this comment, excluding the comment marker.
+     * Gets the text of this comment, excluding the comment markers.
      */
     string getCommentText() {
-      exists(string s | s = this.getText() | result = s.regexpCapture("///?\\s*(.*)", 1))
+      exists(string s | s = this.getText() |
+        result =
+          [
+            s.regexpCapture("///?\\s*(.*)", 1),
+            s.regexpCapture("(?s)/\\*\\*?\\s*(.*?)\\s*\\*/", 1)
+          ]
+      )
+    }
+
+    /**
+     * Gets the marker of this comment, that is `"//"`, `"///"`, `"/*"` or `"/**"`.
+     */
+    string getCommentMarker() { result = this.getText().regexpCapture("(?s)(///?|/\\*\\*?).*", 1) }
+
+    private string getCommentEndMarker() {
+      if this.getCommentMarker() = ["//", "///"] then result = "" else result = "*/"
     }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ContinueExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ContinueExprImpl.qll
index 4328fdfc9f9..ecfcd1a4842 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ContinueExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ContinueExprImpl.qll
@@ -49,13 +49,23 @@ module Impl {
    * ```
    */
   class ContinueExpr extends Generated::ContinueExpr {
+    override string toString() {
+      result = strictconcat(int i | | this.toStringPart(i), " " order by i)
+    }
+
+    private string toStringPart(int index) {
+      index = 0 and result = "continue"
+      or
+      index = 1 and result = this.getLifetime().getText()
+    }
+
     /**
      * Gets the target of this `continue` expression.
      *
      * The target is either a `LoopExpr`, a `ForExpr`, or a `WhileExpr`.
      */
     pragma[nomagic]
-    Expr getTarget() {
+    LoopingExpr getTarget() {
       exists(string label |
         result = getAContinueAncestor(this, label) and
         BreakExprImpl::isLabelledLoop(result, label)
diff --git a/rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeReprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeReprConstructor.qll
new file mode 100644
index 00000000000..00e5abf9076
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeReprConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `DynTraitTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `DynTraitTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructDynTraitTypeRepr(Raw::DynTraitTypeRepr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeReprImpl.qll
similarity index 69%
rename from rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeReprImpl.qll
index bba5a65eebd..c9e6bc7ea38 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeReprImpl.qll
@@ -1,22 +1,22 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `DynTraitType`.
+ * This module provides a hand-modifiable wrapper around the generated class `DynTraitTypeRepr`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.DynTraitType
+private import codeql.rust.elements.internal.generated.DynTraitTypeRepr
 
 /**
- * INTERNAL: This module contains the customizable definition of `DynTraitType` and should not
+ * INTERNAL: This module contains the customizable definition of `DynTraitTypeRepr` and should not
  * be referenced directly.
  */
 module Impl {
   /**
-   * A DynTraitType. For example:
+   * A DynTraitTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class DynTraitType extends Generated::DynTraitType { }
+  class DynTraitTypeRepr extends Generated::DynTraitTypeRepr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ElementImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ElementImpl.qll
index 6f342c00fd3..9307a567b6e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ElementImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ElementImpl.qll
@@ -14,6 +14,14 @@ module Impl {
   class Element extends Generated::Element {
     override string toString() { result = this.getAPrimaryQlClass() }
 
+    /**
+     * Returns a string suitable to be inserted into the name of the parent. Typically `"..."`,
+     * but may be overridden by subclasses.
+     *
+     * INTERNAL: Do not use.
+     */
+    string toAbbreviatedString() { result = "..." }
+
     predicate isUnknown() { none() } // compatibility with test generation, to be fixed
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/EnumImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/EnumImpl.qll
index bef9d3da903..0299ce9f05e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/EnumImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/EnumImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `Enum`.
  *
@@ -12,11 +11,14 @@ private import codeql.rust.elements.internal.generated.Enum
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A Enum. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class Enum extends Generated::Enum { }
+  class Enum extends Generated::Enum {
+    override string toString() { result = "enum " + this.getName().getText() }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ExtractorStep.qll b/rust/ql/lib/codeql/rust/elements/internal/ExtractorStep.qll
new file mode 100644
index 00000000000..64a4931ef43
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ExtractorStep.qll
@@ -0,0 +1,13 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the class `ExtractorStep`.
+ */
+
+private import ExtractorStepImpl
+import codeql.rust.elements.Element
+import codeql.files.FileSystem
+
+/**
+ * INTERNAL: Do not use.
+ */
+final class ExtractorStep = Impl::ExtractorStep;
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ExtractorStepConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ExtractorStepConstructor.qll
new file mode 100644
index 00000000000..76050bf99f8
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ExtractorStepConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ExtractorStep` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ExtractorStep` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructExtractorStep(Raw::ExtractorStep id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ExtractorStepImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ExtractorStepImpl.qll
new file mode 100644
index 00000000000..95c677e845e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ExtractorStepImpl.qll
@@ -0,0 +1,32 @@
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ExtractorStep`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ExtractorStep
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ExtractorStep` and should not
+ * be referenced directly.
+ */
+module Impl {
+  class ExtractorStep extends Generated::ExtractorStep {
+    override string toString() {
+      result = this.getAction() + "(" + this.getFile().getAbsolutePath() + ")"
+    }
+
+    /**
+     * Provides location information for this step.
+     */
+    predicate hasLocationInfo(
+      string filepath, int startline, int startcolumn, int endline, int endcolumn
+    ) {
+      this.getFile().getAbsolutePath() = filepath and
+      startline = 0 and
+      startcolumn = 0 and
+      endline = 0 and
+      endcolumn = 0
+    }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FieldExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FieldExprImpl.qll
index 003d2789e68..b3cd63b7922 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/FieldExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/FieldExprImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `FieldExpr`.
  *
@@ -12,11 +11,20 @@ private import codeql.rust.elements.internal.generated.FieldExpr
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A field access expression. For example:
    * ```rust
    * x.foo
    * ```
    */
-  class FieldExpr extends Generated::FieldExpr { }
+  class FieldExpr extends Generated::FieldExpr {
+    override string toString() {
+      exists(string abbr, string name |
+        abbr = this.getExpr().toAbbreviatedString() and
+        name = this.getNameRef().getText() and
+        if abbr = "..." then result = "... ." + name else result = abbr + "." + name
+      )
+    }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeReprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeReprConstructor.qll
new file mode 100644
index 00000000000..fee493c3500
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeReprConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `FnPtrTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `FnPtrTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructFnPtrTypeRepr(Raw::FnPtrTypeRepr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeReprImpl.qll
similarity index 71%
rename from rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeReprImpl.qll
index 63c7420cf33..3710b4589d5 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeReprImpl.qll
@@ -1,22 +1,22 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `FnPtrType`.
+ * This module provides a hand-modifiable wrapper around the generated class `FnPtrTypeRepr`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.FnPtrType
+private import codeql.rust.elements.internal.generated.FnPtrTypeRepr
 
 /**
- * INTERNAL: This module contains the customizable definition of `FnPtrType` and should not
+ * INTERNAL: This module contains the customizable definition of `FnPtrTypeRepr` and should not
  * be referenced directly.
  */
 module Impl {
   /**
-   * A FnPtrType. For example:
+   * A FnPtrTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class FnPtrType extends Generated::FnPtrType { }
+  class FnPtrTypeRepr extends Generated::FnPtrTypeRepr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ForExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ForExprImpl.qll
index a196a6802e9..b333702c941 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ForExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ForExprImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `ForExpr`.
  *
@@ -12,11 +11,16 @@ private import codeql.rust.elements.internal.generated.ForExpr
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A ForExpr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class ForExpr extends Generated::ForExpr { }
+  class ForExpr extends Generated::ForExpr {
+    override string toStringPrefix() {
+      result = "for " + this.getPat().toAbbreviatedString() + " in ..."
+    }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ArrayExprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ForTypeReprConstructor.qll
similarity index 62%
rename from rust/ql/lib/codeql/rust/elements/internal/ArrayExprConstructor.qll
rename to rust/ql/lib/codeql/rust/elements/internal/ForTypeReprConstructor.qll
index bd4a8362cc5..dfae9aac9ee 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ArrayExprConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ForTypeReprConstructor.qll
@@ -1,14 +1,14 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
  *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `ArrayExpr` synthesized instances.
+ *  `ForTypeRepr` synthesized instances.
  *  INTERNAL: Do not use.
  */
 
 private import codeql.rust.elements.internal.generated.Raw
 
 /**
- *  The characteristic predicate of `ArrayExpr` synthesized instances.
+ *  The characteristic predicate of `ForTypeRepr` synthesized instances.
  *  INTERNAL: Do not use.
  */
-predicate constructArrayExpr(Raw::ArrayExpr id) { any() }
+predicate constructForTypeRepr(Raw::ForTypeRepr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/InferTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ForTypeReprImpl.qll
similarity index 61%
rename from rust/ql/lib/codeql/rust/elements/internal/InferTypeImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/ForTypeReprImpl.qll
index b29406661ba..67db6fdcd02 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/InferTypeImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ForTypeReprImpl.qll
@@ -1,22 +1,22 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `InferType`.
+ * This module provides a hand-modifiable wrapper around the generated class `ForTypeRepr`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.InferType
+private import codeql.rust.elements.internal.generated.ForTypeRepr
 
 /**
- * INTERNAL: This module contains the customizable definition of `InferType` and should not
+ * INTERNAL: This module contains the customizable definition of `ForTypeRepr` and should not
  * be referenced directly.
  */
 module Impl {
   /**
-   * A InferType. For example:
+   * A ForTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class InferType extends Generated::InferType { }
+  class ForTypeRepr extends Generated::ForTypeRepr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FormatArgsExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FormatArgsExprImpl.qll
index 667439777b1..6cc3aa11461 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/FormatArgsExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/FormatArgsExprImpl.qll
@@ -16,14 +16,15 @@ module Impl {
   /**
    * A FormatArgsExpr. For example:
    * ```rust
-   * todo!()
+   * format_args!("no args");
+   * format_args!("{} foo {:?}", 1, 2);
+   * format_args!("{b} foo {a:?}", a=1, b=2);
+   * let (x, y) = (1, 42);
+   * format_args!("{x}, {y}");
    * ```
    */
   class FormatArgsExpr extends Generated::FormatArgsExpr {
-    /**
-     * Gets the `index`th format of this `FormatArgsExpr`'s formatting template (0-based).
-     */
-    Format getFormat(int index) {
+    override Format getFormat(int index) {
       result =
         rank[index + 1](Format f, int i | f.getParent() = this and f.getIndex() = i | f order by i)
     }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FormatArgumentImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FormatArgumentImpl.qll
index 7370939716d..6719d9d8cb3 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/FormatArgumentImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/FormatArgumentImpl.qll
@@ -39,6 +39,8 @@ module Impl {
     override string toString() { result = name }
 
     override Format getParent() { result = Synth::TFormat(parent, index, _, _) }
+
+    override FormatTemplateVariableAccess getVariable() { result.getArgument() = this }
   }
 
   private class FormatSynthLocationImpl extends FormatArgument, LocatableImpl::SynthLocatable {
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FormatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FormatImpl.qll
index 59c66768f05..7cde91053e9 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/FormatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/FormatImpl.qll
@@ -38,6 +38,8 @@ module Impl {
 
     override int getIndex() { result = index }
 
+    override FormatArgument getArgument() { result.getParent() = this }
+
     /**
      * Gets the name or position reference of this format, if any. For example `name` and `0` in:
      * ```rust
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FunctionImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/FunctionImpl.qll
index bff68da5620..791cf4f9d7f 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/FunctionImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/FunctionImpl.qll
@@ -25,6 +25,6 @@ module Impl {
    * ```
    */
   class Function extends Generated::Function {
-    override string toString() { result = this.getName().getText() }
+    override string toString() { result = "fn " + this.getName().getText() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/GenericArgListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/GenericArgListImpl.qll
index 44d74bffbc6..a701801b68c 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/GenericArgListImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/GenericArgListImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `GenericArgList`.
  *
@@ -12,11 +11,16 @@ private import codeql.rust.elements.internal.generated.GenericArgList
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * The base class for generic arguments.
    * ```rust
    * x.foo::<u32, u64>(42);
    * ```
    */
-  class GenericArgList extends Generated::GenericArgList { }
+  class GenericArgList extends Generated::GenericArgList {
+    override string toString() { result = this.toAbbreviatedString() }
+
+    override string toAbbreviatedString() { result = "<...>" }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/IfExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/IfExprImpl.qll
index f9aec6faed3..c90ee6ccdc0 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/IfExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/IfExprImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `IfExpr`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.IfExpr
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * An `if` expression. For example:
    * ```rust
@@ -27,5 +27,17 @@ module Impl {
    * };
    * ```
    */
-  class IfExpr extends Generated::IfExpr { }
+  class IfExpr extends Generated::IfExpr {
+    override string toString() { result = concat(int i | | this.toStringPart(i), " " order by i) }
+
+    private string toStringPart(int index) {
+      index = 0 and result = "if"
+      or
+      index = 1 and result = this.getCondition().toAbbreviatedString()
+      or
+      index = 2 and result = "{...}"
+      or
+      index = 3 and this.hasElse() and result = "else {...}"
+    }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ImplImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ImplImpl.qll
index b1918d16e56..c75c36b280b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ImplImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ImplImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `Impl`.
  *
@@ -12,11 +11,23 @@ private import codeql.rust.elements.internal.generated.Impl
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A Impl. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class Impl extends Generated::Impl { }
+  class Impl extends Generated::Impl {
+    override string toString() {
+      exists(string trait |
+        (
+          trait = this.getTrait().toAbbreviatedString() + " for "
+          or
+          not this.hasTrait() and trait = ""
+        ) and
+        result = "impl " + trait + this.getSelfTy().toAbbreviatedString() + " { ... }"
+      )
+    }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeReprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeReprConstructor.qll
new file mode 100644
index 00000000000..f30ce93e677
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeReprConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ImplTraitTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ImplTraitTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructImplTraitTypeRepr(Raw::ImplTraitTypeRepr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeReprImpl.qll
similarity index 68%
rename from rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeReprImpl.qll
index b0aaa982998..74efa4f2190 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ImplTraitTypeReprImpl.qll
@@ -1,22 +1,22 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `ImplTraitType`.
+ * This module provides a hand-modifiable wrapper around the generated class `ImplTraitTypeRepr`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.ImplTraitType
+private import codeql.rust.elements.internal.generated.ImplTraitTypeRepr
 
 /**
- * INTERNAL: This module contains the customizable definition of `ImplTraitType` and should not
+ * INTERNAL: This module contains the customizable definition of `ImplTraitTypeRepr` and should not
  * be referenced directly.
  */
 module Impl {
   /**
-   * A ImplTraitType. For example:
+   * A ImplTraitTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class ImplTraitType extends Generated::ImplTraitType { }
+  class ImplTraitTypeRepr extends Generated::ImplTraitTypeRepr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/IndexExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/IndexExprImpl.qll
index 94ff116cf1d..2ace04fe389 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/IndexExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/IndexExprImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `IndexExpr`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.IndexExpr
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * An index expression. For example:
    * ```rust
@@ -19,5 +19,10 @@ module Impl {
    * list[42] = 1;
    * ```
    */
-  class IndexExpr extends Generated::IndexExpr { }
+  class IndexExpr extends Generated::IndexExpr {
+    override string toString() {
+      result =
+        this.getBase().toAbbreviatedString() + "[" + this.getIndex().toAbbreviatedString() + "]"
+    }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/InferTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/InferTypeConstructor.qll
deleted file mode 100644
index 8c3a0fcf057..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/InferTypeConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `InferType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `InferType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructInferType(Raw::InferType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/InferTypeReprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/InferTypeReprConstructor.qll
new file mode 100644
index 00000000000..c186bea5941
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/InferTypeReprConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `InferTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `InferTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructInferTypeRepr(Raw::InferTypeRepr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/InferTypeReprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/InferTypeReprImpl.qll
new file mode 100644
index 00000000000..32144265f0c
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/InferTypeReprImpl.qll
@@ -0,0 +1,26 @@
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `InferTypeRepr`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.InferTypeRepr
+
+/**
+ * INTERNAL: This module contains the customizable definition of `InferTypeRepr` and should not
+ * be referenced directly.
+ */
+module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
+  /**
+   * A InferTypeRepr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class InferTypeRepr extends Generated::InferTypeRepr {
+    override string toString() { result = this.toAbbreviatedString() }
+
+    override string toAbbreviatedString() { result = "_" }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LabelImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LabelImpl.qll
index 6740bb23ea8..822029bf3a7 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/LabelImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/LabelImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `Label`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.Label
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A label. For example:
    * ```rust
@@ -21,5 +21,14 @@ module Impl {
    * };
    * ```
    */
-  class Label extends Generated::Label { }
+  class Label extends Generated::Label {
+    override string toString() { result = this.getText() }
+
+    override string toAbbreviatedString() { result = this.getText() }
+
+    /**
+     * Gets the name of the label, together with the leading `'`.
+     */
+    string getText() { result = this.getLifetime().getText() }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LabelableExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LabelableExprImpl.qll
new file mode 100644
index 00000000000..07048181714
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/LabelableExprImpl.qll
@@ -0,0 +1,38 @@
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `LabelableExpr`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.LabelableExpr
+
+/**
+ * INTERNAL: This module contains the customizable definition of `LabelableExpr` and should not
+ * be referenced directly.
+ */
+module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
+  /**
+   * The base class for expressions that can be labeled (`LoopExpr`, `ForExpr`, `WhileExpr` or `BlockExpr`).
+   */
+  class LabelableExpr extends Generated::LabelableExpr {
+    final override string toString() {
+      result = strictconcat(int i | | this.toStringPart(i), " " order by i)
+    }
+
+    private string toStringPart(int index) {
+      index = 0 and result = this.getLabel().getText() + ":"
+      or
+      index = 1 and result = this.toStringPrefix()
+      or
+      index = 2 and result = "{ ... }"
+    }
+
+    /**
+     * Get the prefix for the string representation of this element.
+     *
+     * INTERNAL: Do not use.
+     */
+    string toStringPrefix() { none() }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LetElseImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LetElseImpl.qll
index 2399964cf1a..0ca4e58fb85 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/LetElseImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/LetElseImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `LetElse`.
  *
@@ -12,11 +11,16 @@ private import codeql.rust.elements.internal.generated.LetElse
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A LetElse. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class LetElse extends Generated::LetElse { }
+  class LetElse extends Generated::LetElse {
+    override string toString() { result = this.toAbbreviatedString() }
+
+    override string toAbbreviatedString() { result = "else {...}" }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LetExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LetExprImpl.qll
index 4a99a43ba0f..b690f2b044b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/LetExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/LetExprImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `LetExpr`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.LetExpr
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A `let` expression. For example:
    * ```rust
@@ -20,5 +20,15 @@ module Impl {
    * }
    * ```
    */
-  class LetExpr extends Generated::LetExpr { }
+  class LetExpr extends Generated::LetExpr {
+    override string toString() { result = concat(int i | | this.toStringPart(i), " " order by i) }
+
+    private string toStringPart(int index) {
+      index = 0 and result = "let"
+      or
+      index = 1 and result = this.getPat().toAbbreviatedString()
+      or
+      index = 2 and result = "= " + this.getScrutinee().toAbbreviatedString()
+    }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LetStmtImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LetStmtImpl.qll
index 2bcaa6d7905..d612c2082a6 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/LetStmtImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/LetStmtImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `LetStmt`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.LetStmt
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A let statement. For example:
    * ```rust
@@ -25,5 +25,19 @@ module Impl {
    * };
    * ```
    */
-  class LetStmt extends Generated::LetStmt { }
+  class LetStmt extends Generated::LetStmt {
+    override string toString() {
+      result = strictconcat(int i | | this.toStringPart(i), " " order by i)
+    }
+
+    private string toStringPart(int index) {
+      index = 0 and result = "let"
+      or
+      index = 1 and result = this.getPat().toAbbreviatedString()
+      or
+      index = 2 and result = "= " + this.getInitializer().toAbbreviatedString()
+      or
+      index = 3 and result = this.getLetElse().toAbbreviatedString()
+    }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LifetimeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LifetimeImpl.qll
index 3eb13ac87e5..27b29f64cc9 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/LifetimeImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/LifetimeImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `Lifetime`.
  *
@@ -12,11 +11,18 @@ private import codeql.rust.elements.internal.generated.Lifetime
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A Lifetime. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class Lifetime extends Generated::Lifetime { }
+  class Lifetime extends Generated::Lifetime {
+    override string toString() {
+      result = "'" + this.getText()
+      or
+      not this.hasText() and result = "'_"
+    }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LiteralExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LiteralExprImpl.qll
index 1b660b134c4..f68c79da16b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/LiteralExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/LiteralExprImpl.qll
@@ -26,6 +26,20 @@ module Impl {
    * ```
    */
   class LiteralExpr extends Generated::LiteralExpr {
-    override string toString() { result = this.getTextValue() }
+    override string toString() { result = this.getTrimmedText() }
+
+    override string toAbbreviatedString() { result = this.getTrimmedText() }
+
+    /**
+     * Get the text of this literal, trimmed with `...` if it is too long.
+     *
+     * INTERNAL: Do not use.
+     */
+    string getTrimmedText() {
+      exists(string v |
+        v = this.getTextValue() and
+        if v.length() > 30 then result = v.substring(0, 30) + "..." else result = v
+      )
+    }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LiteralPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LiteralPatImpl.qll
index a71d9b1bf84..1c59c3fa284 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/LiteralPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/LiteralPatImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `LiteralPat`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.LiteralPat
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A literal pattern. For example:
    * ```rust
@@ -21,5 +21,9 @@ module Impl {
    * }
    * ```
    */
-  class LiteralPat extends Generated::LiteralPat { }
+  class LiteralPat extends Generated::LiteralPat {
+    override string toString() { result = this.toAbbreviatedString() }
+
+    override string toAbbreviatedString() { result = this.getLiteral().getTrimmedText() }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LoopExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LoopExprImpl.qll
index c56ea8770d4..73214871705 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/LoopExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/LoopExprImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `LoopExpr`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.LoopExpr
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A loop expression. For example:
    * ```rust
@@ -36,5 +36,7 @@ module Impl {
    * };
    * ```
    */
-  class LoopExpr extends Generated::LoopExpr { }
+  class LoopExpr extends Generated::LoopExpr {
+    override string toStringPrefix() { result = "loop" }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/LoopingExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/LoopingExprImpl.qll
new file mode 100644
index 00000000000..45aa8f42e74
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/LoopingExprImpl.qll
@@ -0,0 +1,19 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `LoopingExpr`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.LoopingExpr
+
+/**
+ * INTERNAL: This module contains the customizable definition of `LoopingExpr` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * The base class for expressions that loop (`LoopExpr`, `ForExpr` or `WhileExpr`).
+   */
+  class LoopingExpr extends Generated::LoopingExpr { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroCallImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroCallImpl.qll
index 76fcd7645a6..a34d64c0735 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/MacroCallImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroCallImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `MacroCall`.
  *
@@ -12,11 +11,14 @@ private import codeql.rust.elements.internal.generated.MacroCall
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A MacroCall. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class MacroCall extends Generated::MacroCall { }
+  class MacroCall extends Generated::MacroCall {
+    override string toString() { result = this.getPath().toAbbreviatedString() + "!..." }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroTypeConstructor.qll
deleted file mode 100644
index cbe65a8bed7..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/MacroTypeConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `MacroType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `MacroType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructMacroType(Raw::MacroType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroTypeReprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroTypeReprConstructor.qll
new file mode 100644
index 00000000000..0464f303116
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroTypeReprConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `MacroTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `MacroTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructMacroTypeRepr(Raw::MacroTypeRepr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroTypeReprImpl.qll
similarity index 71%
rename from rust/ql/lib/codeql/rust/elements/internal/MacroTypeImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/MacroTypeReprImpl.qll
index 6feb1321888..6ef366ccdfd 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/MacroTypeImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroTypeReprImpl.qll
@@ -1,22 +1,22 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `MacroType`.
+ * This module provides a hand-modifiable wrapper around the generated class `MacroTypeRepr`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.MacroType
+private import codeql.rust.elements.internal.generated.MacroTypeRepr
 
 /**
- * INTERNAL: This module contains the customizable definition of `MacroType` and should not
+ * INTERNAL: This module contains the customizable definition of `MacroTypeRepr` and should not
  * be referenced directly.
  */
 module Impl {
   /**
-   * A MacroType. For example:
+   * A MacroTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class MacroType extends Generated::MacroType { }
+  class MacroTypeRepr extends Generated::MacroTypeRepr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MatchArmImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MatchArmImpl.qll
index 117e6eb3498..23ad2551bff 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/MatchArmImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/MatchArmImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `MatchArm`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.MatchArm
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A match arm. For example:
    * ```rust
@@ -27,5 +27,17 @@ module Impl {
    * };
    * ```
    */
-  class MatchArm extends Generated::MatchArm { }
+  class MatchArm extends Generated::MatchArm {
+    override string toString() { result = concat(int i | | this.toStringPart(i), " " order by i) }
+
+    private string toStringPart(int index) {
+      index = 0 and result = this.getPat().toAbbreviatedString()
+      or
+      index = 1 and result = "if " + this.getGuard().toAbbreviatedString()
+      or
+      index = 2 and result = "=>"
+      or
+      index = 3 and result = this.getExpr().toAbbreviatedString()
+    }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MatchExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MatchExprImpl.qll
index c8cb535b526..15fdcf7e73f 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/MatchExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/MatchExprImpl.qll
@@ -28,6 +28,10 @@ module Impl {
    * ```
    */
   class MatchExpr extends Generated::MatchExpr {
+    override string toString() {
+      result = "match " + this.getScrutinee().toAbbreviatedString() + " { ... }"
+    }
+
     /**
      * Gets the `index`th arm of this match expression.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ModuleImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ModuleImpl.qll
index 2e94fad609c..505495862b7 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ModuleImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ModuleImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `Module`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.Module
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A module declaration. For example:
    * ```rust
@@ -23,5 +23,7 @@ module Impl {
    * }
    * ```
    */
-  class Module extends Generated::Module { }
+  class Module extends Generated::Module {
+    override string toString() { result = "mod " + this.getName() }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/NeverTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/NeverTypeConstructor.qll
deleted file mode 100644
index 10b7b835e81..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/NeverTypeConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `NeverType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `NeverType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructNeverType(Raw::NeverType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/NeverTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/NeverTypeImpl.qll
deleted file mode 100644
index 9c04237f38c..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/NeverTypeImpl.qll
+++ /dev/null
@@ -1,22 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- * This module provides a hand-modifiable wrapper around the generated class `NeverType`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.NeverType
-
-/**
- * INTERNAL: This module contains the customizable definition of `NeverType` and should not
- * be referenced directly.
- */
-module Impl {
-  /**
-   * A NeverType. For example:
-   * ```rust
-   * todo!()
-   * ```
-   */
-  class NeverType extends Generated::NeverType { }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/NeverTypeReprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/NeverTypeReprConstructor.qll
new file mode 100644
index 00000000000..8587a384275
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/NeverTypeReprConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `NeverTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `NeverTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructNeverTypeRepr(Raw::NeverTypeRepr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/NeverTypeReprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/NeverTypeReprImpl.qll
new file mode 100644
index 00000000000..b5a7a725880
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/NeverTypeReprImpl.qll
@@ -0,0 +1,26 @@
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `NeverTypeRepr`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.NeverTypeRepr
+
+/**
+ * INTERNAL: This module contains the customizable definition of `NeverTypeRepr` and should not
+ * be referenced directly.
+ */
+module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
+  /**
+   * A NeverTypeRepr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class NeverTypeRepr extends Generated::NeverTypeRepr {
+    override string toString() { result = this.toAbbreviatedString() }
+
+    override string toAbbreviatedString() { result = "!" }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/OrPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/OrPatImpl.qll
index f29e3d1865f..07cc59f0dde 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/OrPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/OrPatImpl.qll
@@ -21,6 +21,10 @@ module Impl {
    * ```
    */
   class OrPat extends Generated::OrPat {
+    override string toString() {
+      result = concat(int i | | this.getPat(i).toAbbreviatedString(), " | " order by i)
+    }
+
     /** Gets the last pattern in this or pattern. */
     pragma[nomagic]
     Pat getLastPat() { result = this.getPat(this.getNumberOfPats() - 1) }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParamBaseImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ParamBaseImpl.qll
new file mode 100644
index 00000000000..3b0f82eb6c3
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParamBaseImpl.qll
@@ -0,0 +1,19 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ParamBase`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ParamBase
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ParamBase` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A normal parameter, `Param`, or a self parameter `SelfParam`.
+   */
+  class ParamBase extends Generated::ParamBase { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParamImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ParamImpl.qll
index 7015d097e9f..a76b805f951 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ParamImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParamImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `Param`.
  *
@@ -12,11 +11,22 @@ private import codeql.rust.elements.internal.generated.Param
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
-   * A Param. For example:
+   * A parameter in a function or method. For example `x` in:
    * ```rust
-   * todo!()
+   * fn new(x: T) -> Foo<T> {
+   *   // ...
+   * }
    * ```
    */
-  class Param extends Generated::Param { }
+  class Param extends Generated::Param {
+    override string toString() { result = concat(int i | | this.toStringPart(i) order by i) }
+
+    private string toStringPart(int index) {
+      index = 0 and result = this.getPat().toAbbreviatedString()
+      or
+      index = 1 and result = ": " + this.getTypeRepr().toAbbreviatedString()
+    }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParamListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ParamListImpl.qll
index e31c2734355..297b7f26fad 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ParamListImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParamListImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `ParamList`.
  *
@@ -12,11 +11,17 @@ private import codeql.rust.elements.internal.generated.ParamList
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A ParamList. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class ParamList extends Generated::ParamList { }
+  class ParamList extends Generated::ParamList {
+    /**
+     * Gets any of the parameters of this parameter list.
+     */
+    final ParamBase getAParamBase() { result = this.getParam(_) or result = this.getSelfParam() }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParenExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ParenExprImpl.qll
index 98c3cab9267..db9d19f5650 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ParenExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParenExprImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `ParenExpr`.
  *
@@ -12,11 +11,14 @@ private import codeql.rust.elements.internal.generated.ParenExpr
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A ParenExpr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class ParenExpr extends Generated::ParenExpr { }
+  class ParenExpr extends Generated::ParenExpr {
+    override string toString() { result = "(" + this.getExpr().toAbbreviatedString() + ")" }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParenPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ParenPatImpl.qll
index cdba455451c..9d9016cff98 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ParenPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParenPatImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `ParenPat`.
  *
@@ -12,11 +11,14 @@ private import codeql.rust.elements.internal.generated.ParenPat
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A ParenPat. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class ParenPat extends Generated::ParenPat { }
+  class ParenPat extends Generated::ParenPat {
+    override string toString() { result = "(" + this.getPat().toAbbreviatedString() + ")" }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParenTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ParenTypeConstructor.qll
deleted file mode 100644
index f8450946a0b..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/ParenTypeConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `ParenType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `ParenType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructParenType(Raw::ParenType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParenTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ParenTypeImpl.qll
deleted file mode 100644
index ab49c9c4fcf..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/ParenTypeImpl.qll
+++ /dev/null
@@ -1,22 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- * This module provides a hand-modifiable wrapper around the generated class `ParenType`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.ParenType
-
-/**
- * INTERNAL: This module contains the customizable definition of `ParenType` and should not
- * be referenced directly.
- */
-module Impl {
-  /**
-   * A ParenType. For example:
-   * ```rust
-   * todo!()
-   * ```
-   */
-  class ParenType extends Generated::ParenType { }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParenTypeReprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ParenTypeReprConstructor.qll
new file mode 100644
index 00000000000..a8d5e70a008
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParenTypeReprConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `ParenTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `ParenTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructParenTypeRepr(Raw::ParenTypeRepr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ParenTypeReprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ParenTypeReprImpl.qll
new file mode 100644
index 00000000000..5c06b951c19
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/ParenTypeReprImpl.qll
@@ -0,0 +1,24 @@
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `ParenTypeRepr`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.ParenTypeRepr
+
+/**
+ * INTERNAL: This module contains the customizable definition of `ParenTypeRepr` and should not
+ * be referenced directly.
+ */
+module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
+  /**
+   * A ParenTypeRepr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ParenTypeRepr extends Generated::ParenTypeRepr {
+    override string toString() { result = "(" + this.getTypeRepr().toAbbreviatedString() + ")" }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PathExprImpl.qll
index c8a2af3de33..0d7b29edabe 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/PathExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathExprImpl.qll
@@ -18,10 +18,12 @@ module Impl {
    * let x = variable;
    * let x = foo::bar;
    * let y = <T>::foo;
-   * let z = <TypeRef as Trait>::foo;
+   * let z = <TypeRepr as Trait>::foo;
    * ```
    */
   class PathExpr extends Generated::PathExpr {
-    override string toString() { result = this.getPath().toString() }
+    override string toString() { result = this.toAbbreviatedString() }
+
+    override string toAbbreviatedString() { result = this.getPath().toString() }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PathImpl.qll
index b53c86559f0..34cd16c144b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/PathImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathImpl.qll
@@ -15,14 +15,17 @@ module Impl {
   /**
    * A path. For example:
    * ```rust
+   * use some_crate::some_module::some_item;
    * foo::bar;
    * ```
    */
   class Path extends Generated::Path {
-    override string toString() {
+    override string toString() { result = this.toAbbreviatedString() }
+
+    override string toAbbreviatedString() {
       if this.hasQualifier()
-      then result = this.getQualifier().toString() + "::" + this.getPart().toString()
-      else result = this.getPart().toString()
+      then result = "...::" + this.getPart().toAbbreviatedString()
+      else result = this.getPart().toAbbreviatedString()
     }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PathPatImpl.qll
index 0acf7a588ba..27914a8f415 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/PathPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathPatImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `PathPat`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.PathPat
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A path pattern. For example:
    * ```rust
@@ -21,5 +21,9 @@ module Impl {
    * }
    * ```
    */
-  class PathPat extends Generated::PathPat { }
+  class PathPat extends Generated::PathPat {
+    override string toString() { result = this.toAbbreviatedString() }
+
+    override string toAbbreviatedString() { result = this.getPath().toAbbreviatedString() }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathSegmentImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PathSegmentImpl.qll
index 300a6c7d4a0..cbb5313897e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/PathSegmentImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathSegmentImpl.qll
@@ -13,17 +13,22 @@ private import codeql.rust.elements.internal.generated.PathSegment
 module Impl {
   // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
-   * A PathSegment. For example:
-   * ```rust
-   * todo!()
-   * ```
+   * A path segment, which is one part of a whole path.
    */
   class PathSegment extends Generated::PathSegment {
-    override string toString() {
-      // TODO: this does not cover everything
-      if this.hasGenericArgList()
-      then result = this.getNameRef().toString() + "::<...>"
-      else result = this.getNameRef().toString()
+    override string toString() { result = this.toAbbreviatedString() }
+
+    override string toAbbreviatedString() {
+      result = strictconcat(int i | | this.toAbbreviatedStringPart(i), "::" order by i)
+    }
+
+    private string toAbbreviatedStringPart(int index) {
+      index = 0 and
+      if this.hasPathType() or this.hasTypeRepr()
+      then result = "<...>"
+      else result = this.getNameRef().getText()
+      or
+      index = 1 and result = this.getGenericArgList().toAbbreviatedString()
     }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/PathTypeConstructor.qll
deleted file mode 100644
index f16371570f6..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/PathTypeConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `PathType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `PathType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructPathType(Raw::PathType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PathTypeImpl.qll
deleted file mode 100644
index 74fa536e08b..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/PathTypeImpl.qll
+++ /dev/null
@@ -1,22 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- * This module provides a hand-modifiable wrapper around the generated class `PathType`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.PathType
-
-/**
- * INTERNAL: This module contains the customizable definition of `PathType` and should not
- * be referenced directly.
- */
-module Impl {
-  /**
-   * A PathType. For example:
-   * ```rust
-   * todo!()
-   * ```
-   */
-  class PathType extends Generated::PathType { }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/PathTypeReprConstructor.qll
similarity index 64%
rename from rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeConstructor.qll
rename to rust/ql/lib/codeql/rust/elements/internal/PathTypeReprConstructor.qll
index 6ee1e461a53..5526362a5a3 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/DynTraitTypeConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathTypeReprConstructor.qll
@@ -1,14 +1,14 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
  *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `DynTraitType` synthesized instances.
+ *  `PathTypeRepr` synthesized instances.
  *  INTERNAL: Do not use.
  */
 
 private import codeql.rust.elements.internal.generated.Raw
 
 /**
- *  The characteristic predicate of `DynTraitType` synthesized instances.
+ *  The characteristic predicate of `PathTypeRepr` synthesized instances.
  *  INTERNAL: Do not use.
  */
-predicate constructDynTraitType(Raw::DynTraitType id) { any() }
+predicate constructPathTypeRepr(Raw::PathTypeRepr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PathTypeReprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PathTypeReprImpl.qll
new file mode 100644
index 00000000000..fb1e8cd380e
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/PathTypeReprImpl.qll
@@ -0,0 +1,27 @@
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `PathTypeRepr`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.PathTypeRepr
+
+/**
+ * INTERNAL: This module contains the customizable definition of `PathTypeRepr` and should not
+ * be referenced directly.
+ */
+module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
+  /**
+   * A type referring to a path. For example:
+   * ```rust
+   * type X = std::collections::HashMap<i32, i32>;
+   * type Y = X::Item;
+   * ```
+   */
+  class PathTypeRepr extends Generated::PathTypeRepr {
+    override string toString() { result = this.toAbbreviatedString() }
+
+    override string toAbbreviatedString() { result = this.getPath().toAbbreviatedString() }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PtrTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/PtrTypeConstructor.qll
deleted file mode 100644
index 48fb82aeb9e..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/PtrTypeConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `PtrType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `PtrType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructPtrType(Raw::PtrType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/PtrTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PtrTypeImpl.qll
deleted file mode 100644
index 95c558cdb81..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/PtrTypeImpl.qll
+++ /dev/null
@@ -1,22 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- * This module provides a hand-modifiable wrapper around the generated class `PtrType`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.PtrType
-
-/**
- * INTERNAL: This module contains the customizable definition of `PtrType` and should not
- * be referenced directly.
- */
-module Impl {
-  /**
-   * A PtrType. For example:
-   * ```rust
-   * todo!()
-   * ```
-   */
-  class PtrType extends Generated::PtrType { }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ArrayTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/PtrTypeReprConstructor.qll
similarity index 62%
rename from rust/ql/lib/codeql/rust/elements/internal/ArrayTypeConstructor.qll
rename to rust/ql/lib/codeql/rust/elements/internal/PtrTypeReprConstructor.qll
index 8a4ea671b28..cf9de4cd505 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ArrayTypeConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/PtrTypeReprConstructor.qll
@@ -1,14 +1,14 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
  *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `ArrayType` synthesized instances.
+ *  `PtrTypeRepr` synthesized instances.
  *  INTERNAL: Do not use.
  */
 
 private import codeql.rust.elements.internal.generated.Raw
 
 /**
- *  The characteristic predicate of `ArrayType` synthesized instances.
+ *  The characteristic predicate of `PtrTypeRepr` synthesized instances.
  *  INTERNAL: Do not use.
  */
-predicate constructArrayType(Raw::ArrayType id) { any() }
+predicate constructPtrTypeRepr(Raw::PtrTypeRepr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ForTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/PtrTypeReprImpl.qll
similarity index 61%
rename from rust/ql/lib/codeql/rust/elements/internal/ForTypeImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/PtrTypeReprImpl.qll
index d6465a76dc5..c204a22a4ee 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ForTypeImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/PtrTypeReprImpl.qll
@@ -1,22 +1,22 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `ForType`.
+ * This module provides a hand-modifiable wrapper around the generated class `PtrTypeRepr`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.ForType
+private import codeql.rust.elements.internal.generated.PtrTypeRepr
 
 /**
- * INTERNAL: This module contains the customizable definition of `ForType` and should not
+ * INTERNAL: This module contains the customizable definition of `PtrTypeRepr` and should not
  * be referenced directly.
  */
 module Impl {
   /**
-   * A ForType. For example:
+   * A PtrTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class ForType extends Generated::ForType { }
+  class PtrTypeRepr extends Generated::PtrTypeRepr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RangeExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RangeExprImpl.qll
index c015171253f..3b8989af782 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/RangeExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/RangeExprImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `RangeExpr`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.RangeExpr
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A range expression. For example:
    * ```rust
@@ -23,5 +23,29 @@ module Impl {
    * let x = ..;
    * ```
    */
-  class RangeExpr extends Generated::RangeExpr { }
+  class RangeExpr extends Generated::RangeExpr {
+    override string toString() { result = concat(int i | | this.toStringPart(i) order by i) }
+
+    private string toStringPart(int index) {
+      index = 0 and result = this.getStartAbbreviation()
+      or
+      index = 1 and result = this.getOperatorName()
+      or
+      index = 2 and result = this.getEndAbbreviation()
+    }
+
+    private string getStartAbbreviation() {
+      exists(string abbr |
+        abbr = this.getStart().toAbbreviatedString() and
+        if abbr = "..." then result = "... " else result = abbr
+      )
+    }
+
+    private string getEndAbbreviation() {
+      exists(string abbr |
+        abbr = this.getEnd().toAbbreviatedString() and
+        if abbr = "..." then result = " ..." else result = abbr
+      )
+    }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldImpl.qll
index 12b86bb1e4a..fe898c82fea 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/RecordExprFieldImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `RecordExprField`.
  *
@@ -12,11 +11,20 @@ private import codeql.rust.elements.internal.generated.RecordExprField
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A field in a record expression. For example `a: 1` in:
    * ```rust
    * Foo { a: 1, b: 2 };
    * ```
    */
-  class RecordExprField extends Generated::RecordExprField { }
+  class RecordExprField extends Generated::RecordExprField {
+    override string toString() { result = concat(int i | | this.toStringPart(i) order by i) }
+
+    private string toStringPart(int index) {
+      index = 0 and result = this.getNameRef().getText()
+      or
+      index = 1 and result = ": " + this.getExpr().toAbbreviatedString()
+    }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordExprImpl.qll
index befc9b26ebb..a59d3bc22e2 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/RecordExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/RecordExprImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `RecordExpr`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.RecordExpr
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A record expression. For example:
    * ```rust
@@ -21,5 +21,7 @@ module Impl {
    * Foo { .. } = second;
    * ```
    */
-  class RecordExpr extends Generated::RecordExpr { }
+  class RecordExpr extends Generated::RecordExpr {
+    override string toString() { result = this.getPath().toString() + " {...}" }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RecordPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RecordPatImpl.qll
index 6378e3220e0..0bed25bb779 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/RecordPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/RecordPatImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `RecordPat`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.RecordPat
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A record pattern. For example:
    * ```rust
@@ -21,5 +21,7 @@ module Impl {
    * }
    * ```
    */
-  class RecordPat extends Generated::RecordPat { }
+  class RecordPat extends Generated::RecordPat {
+    override string toString() { result = this.getPath().toAbbreviatedString() + " {...}" }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RefExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RefExprImpl.qll
index abc45e0d5c2..4ec593362d9 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/RefExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/RefExprImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `RefExpr`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.RefExpr
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A reference expression. For example:
    * ```rust
@@ -21,5 +21,19 @@ module Impl {
    *     let raw_mut: &mut i32 = &raw mut foo;
    * ```
    */
-  class RefExpr extends Generated::RefExpr { }
+  class RefExpr extends Generated::RefExpr {
+    override string toString() {
+      result = "&" + concat(int i | | this.getSpecPart(i), " " order by i)
+    }
+
+    private string getSpecPart(int index) {
+      index = 0 and this.isRaw() and result = "raw"
+      or
+      index = 1 and this.isConst() and result = "const"
+      or
+      index = 2 and this.isMut() and result = "mut"
+      or
+      index = 3 and result = this.getExpr().toAbbreviatedString()
+    }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RefPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RefPatImpl.qll
index 03b1abf5a4f..d6b1f4c2709 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/RefPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/RefPatImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `RefPat`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.RefPat
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A reference pattern. For example:
    * ```rust
@@ -21,5 +21,15 @@ module Impl {
    * };
    * ```
    */
-  class RefPat extends Generated::RefPat { }
+  class RefPat extends Generated::RefPat {
+    override string toString() {
+      result = "&" + concat(int i | | this.getSpecPart(i), " " order by i)
+    }
+
+    private string getSpecPart(int index) {
+      index = 0 and this.isMut() and result = "mut"
+      or
+      index = 1 and result = this.getPat().toAbbreviatedString()
+    }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RefTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/RefTypeConstructor.qll
deleted file mode 100644
index 89a786420a2..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/RefTypeConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `RefType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `RefType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructRefType(Raw::RefType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RefTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RefTypeImpl.qll
deleted file mode 100644
index c473ec2e8ef..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/RefTypeImpl.qll
+++ /dev/null
@@ -1,22 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- * This module provides a hand-modifiable wrapper around the generated class `RefType`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.RefType
-
-/**
- * INTERNAL: This module contains the customizable definition of `RefType` and should not
- * be referenced directly.
- */
-module Impl {
-  /**
-   * A RefType. For example:
-   * ```rust
-   * todo!()
-   * ```
-   */
-  class RefType extends Generated::RefType { }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/RefTypeReprConstructor.qll
similarity index 62%
rename from rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeConstructor.qll
rename to rust/ql/lib/codeql/rust/elements/internal/RefTypeReprConstructor.qll
index a61677766d2..9c53d3b3d69 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/FnPtrTypeConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/RefTypeReprConstructor.qll
@@ -1,14 +1,14 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
  *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `FnPtrType` synthesized instances.
+ *  `RefTypeRepr` synthesized instances.
  *  INTERNAL: Do not use.
  */
 
 private import codeql.rust.elements.internal.generated.Raw
 
 /**
- *  The characteristic predicate of `FnPtrType` synthesized instances.
+ *  The characteristic predicate of `RefTypeRepr` synthesized instances.
  *  INTERNAL: Do not use.
  */
-predicate constructFnPtrType(Raw::FnPtrType id) { any() }
+predicate constructRefTypeRepr(Raw::RefTypeRepr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RefTypeReprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RefTypeReprImpl.qll
new file mode 100644
index 00000000000..2770b12e9e5
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/RefTypeReprImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `RefTypeRepr`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.RefTypeRepr
+
+/**
+ * INTERNAL: This module contains the customizable definition of `RefTypeRepr` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A RefTypeRepr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class RefTypeRepr extends Generated::RefTypeRepr { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ResolvableImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ResolvableImpl.qll
index c6f1f2e7a69..fafb86d46c0 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ResolvableImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ResolvableImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `Resolvable`.
  *
@@ -12,8 +11,25 @@ private import codeql.rust.elements.internal.generated.Resolvable
  * be referenced directly.
  */
 module Impl {
+  private import codeql.rust.elements.internal.ItemImpl::Impl
+
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * Either a `Path`, or a `MethodCallExpr`.
    */
-  class Resolvable extends Generated::Resolvable { }
+  class Resolvable extends Generated::Resolvable {
+    /**
+     * Holds if this resolvable and the item `i` resolves to the same canonical
+     * path in the same crate
+     */
+    pragma[nomagic]
+    predicate resolvesAsItem(Item i) {
+      this.getResolvedPath() = i.getExtendedCanonicalPath() and
+      (
+        this.getResolvedCrateOrigin() = i.getCrateOrigin()
+        or
+        not this.hasResolvedCrateOrigin() and not i.hasCrateOrigin()
+      )
+    }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RestPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RestPatImpl.qll
index bd483e4ba9a..ec7d48a4d9d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/RestPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/RestPatImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `RestPat`.
  *
@@ -12,11 +11,16 @@ private import codeql.rust.elements.internal.generated.RestPat
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A RestPat. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class RestPat extends Generated::RestPat { }
+  class RestPat extends Generated::RestPat {
+    override string toString() { result = this.toAbbreviatedString() }
+
+    override string toAbbreviatedString() { result = ".." }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RetTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/RetTypeConstructor.qll
deleted file mode 100644
index c123b5f8b93..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/RetTypeConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `RetType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `RetType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructRetType(Raw::RetType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ForTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/RetTypeReprConstructor.qll
similarity index 62%
rename from rust/ql/lib/codeql/rust/elements/internal/ForTypeConstructor.qll
rename to rust/ql/lib/codeql/rust/elements/internal/RetTypeReprConstructor.qll
index 8bf00679769..df4a60c37e6 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ForTypeConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/RetTypeReprConstructor.qll
@@ -1,14 +1,14 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
  *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `ForType` synthesized instances.
+ *  `RetTypeRepr` synthesized instances.
  *  INTERNAL: Do not use.
  */
 
 private import codeql.rust.elements.internal.generated.Raw
 
 /**
- *  The characteristic predicate of `ForType` synthesized instances.
+ *  The characteristic predicate of `RetTypeRepr` synthesized instances.
  *  INTERNAL: Do not use.
  */
-predicate constructForType(Raw::ForType id) { any() }
+predicate constructRetTypeRepr(Raw::RetTypeRepr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/RetTypeReprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/RetTypeReprImpl.qll
new file mode 100644
index 00000000000..4271ec0f779
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/RetTypeReprImpl.qll
@@ -0,0 +1,22 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ * This module provides a hand-modifiable wrapper around the generated class `RetTypeRepr`.
+ *
+ * INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.RetTypeRepr
+
+/**
+ * INTERNAL: This module contains the customizable definition of `RetTypeRepr` and should not
+ * be referenced directly.
+ */
+module Impl {
+  /**
+   * A RetTypeRepr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class RetTypeRepr extends Generated::RetTypeRepr { }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ReturnExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ReturnExprImpl.qll
index fd185c01b1d..1b632587867 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ReturnExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ReturnExprImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `ReturnExpr`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.ReturnExpr
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A return expression. For example:
    * ```rust
@@ -25,5 +25,13 @@ module Impl {
    * }
    * ```
    */
-  class ReturnExpr extends Generated::ReturnExpr { }
+  class ReturnExpr extends Generated::ReturnExpr {
+    override string toString() { result = concat(int i | | this.toStringPart(i), " " order by i) }
+
+    private string toStringPart(int index) {
+      index = 0 and result = "return"
+      or
+      index = 1 and result = this.getExpr().toAbbreviatedString()
+    }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/SelfParamImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/SelfParamImpl.qll
index 2be3b75ac47..0d0d23a1e8c 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/SelfParamImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/SelfParamImpl.qll
@@ -13,9 +13,11 @@ private import codeql.rust.elements.internal.generated.SelfParam
  */
 module Impl {
   /**
-   * A SelfParam. For example:
+   * A `self` parameter. For example `self` in:
    * ```rust
-   * todo!()
+   * fn push(&mut self, value: T) {
+   *   // ...
+   * }
    * ```
    */
   class SelfParam extends Generated::SelfParam { }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/SliceTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/SliceTypeConstructor.qll
deleted file mode 100644
index d337c0f0768..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/SliceTypeConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `SliceType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `SliceType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructSliceType(Raw::SliceType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/SliceTypeReprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/SliceTypeReprConstructor.qll
new file mode 100644
index 00000000000..df33789af2d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/SliceTypeReprConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `SliceTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `SliceTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructSliceTypeRepr(Raw::SliceTypeRepr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/SliceTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/SliceTypeReprImpl.qll
similarity index 71%
rename from rust/ql/lib/codeql/rust/elements/internal/SliceTypeImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/SliceTypeReprImpl.qll
index ba7146aad7c..4acc2f6aa0a 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/SliceTypeImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/SliceTypeReprImpl.qll
@@ -1,22 +1,22 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `SliceType`.
+ * This module provides a hand-modifiable wrapper around the generated class `SliceTypeRepr`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.SliceType
+private import codeql.rust.elements.internal.generated.SliceTypeRepr
 
 /**
- * INTERNAL: This module contains the customizable definition of `SliceType` and should not
+ * INTERNAL: This module contains the customizable definition of `SliceTypeRepr` and should not
  * be referenced directly.
  */
 module Impl {
   /**
-   * A SliceType. For example:
+   * A SliceTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class SliceType extends Generated::SliceType { }
+  class SliceTypeRepr extends Generated::SliceTypeRepr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TraitImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TraitImpl.qll
index a6fa19517f4..564e54e78d6 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/TraitImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/TraitImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `Trait`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.Trait
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A Trait. For example:
    * ```
@@ -24,5 +24,7 @@ module Impl {
    * pub trait Foo<T: Frobinizable> where T::Frobinator: Eq {}
    * ```
    */
-  class Trait extends Generated::Trait { }
+  class Trait extends Generated::Trait {
+    override string toString() { result = "trait " + this.getName().getText() }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TupleStructPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TupleStructPatImpl.qll
index 1f92ed5a190..29ec980c2eb 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/TupleStructPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/TupleStructPatImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `TupleStructPat`.
  *
@@ -12,6 +11,7 @@ private import codeql.rust.elements.internal.generated.TupleStructPat
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A tuple struct pattern. For example:
    * ```rust
@@ -22,5 +22,7 @@ module Impl {
    * };
    * ```
    */
-  class TupleStructPat extends Generated::TupleStructPat { }
+  class TupleStructPat extends Generated::TupleStructPat {
+    override string toString() { result = this.getPath().toAbbreviatedString() + "(...)" }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TupleTypeConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/TupleTypeConstructor.qll
deleted file mode 100644
index f96bc1826a9..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/TupleTypeConstructor.qll
+++ /dev/null
@@ -1,14 +0,0 @@
-// generated by codegen, remove this comment if you wish to edit this file
-/**
- *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `TupleType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Raw
-
-/**
- *  The characteristic predicate of `TupleType` synthesized instances.
- *  INTERNAL: Do not use.
- */
-predicate constructTupleType(Raw::TupleType id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TupleTypeReprConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/TupleTypeReprConstructor.qll
new file mode 100644
index 00000000000..8f829ace349
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/TupleTypeReprConstructor.qll
@@ -0,0 +1,14 @@
+// generated by codegen, remove this comment if you wish to edit this file
+/**
+ *  This module defines the hook used internally to tweak the characteristic predicate of
+ *  `TupleTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+
+private import codeql.rust.elements.internal.generated.Raw
+
+/**
+ *  The characteristic predicate of `TupleTypeRepr` synthesized instances.
+ *  INTERNAL: Do not use.
+ */
+predicate constructTupleTypeRepr(Raw::TupleTypeRepr id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TupleTypeImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TupleTypeReprImpl.qll
similarity index 71%
rename from rust/ql/lib/codeql/rust/elements/internal/TupleTypeImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/TupleTypeReprImpl.qll
index 69ac32d20e4..c0ac7550920 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/TupleTypeImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/TupleTypeReprImpl.qll
@@ -1,22 +1,22 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `TupleType`.
+ * This module provides a hand-modifiable wrapper around the generated class `TupleTypeRepr`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.TupleType
+private import codeql.rust.elements.internal.generated.TupleTypeRepr
 
 /**
- * INTERNAL: This module contains the customizable definition of `TupleType` and should not
+ * INTERNAL: This module contains the customizable definition of `TupleTypeRepr` and should not
  * be referenced directly.
  */
 module Impl {
   /**
-   * A TupleType. For example:
+   * A TupleTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class TupleType extends Generated::TupleType { }
+  class TupleTypeRepr extends Generated::TupleTypeRepr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeRefImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeReprImpl.qll
similarity index 72%
rename from rust/ql/lib/codeql/rust/elements/internal/TypeRefImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/TypeReprImpl.qll
index bd2629b8484..0d8b0a9e33b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/TypeRefImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/TypeReprImpl.qll
@@ -1,14 +1,14 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `TypeRef`.
+ * This module provides a hand-modifiable wrapper around the generated class `TypeRepr`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.TypeRef
+private import codeql.rust.elements.internal.generated.TypeRepr
 
 /**
- * INTERNAL: This module contains the customizable definition of `TypeRef` and should not
+ * INTERNAL: This module contains the customizable definition of `TypeRepr` and should not
  * be referenced directly.
  */
 module Impl {
@@ -20,5 +20,5 @@ module Impl {
    * let z: Option<i32>;
    * ```
    */
-  class TypeRef extends Generated::TypeRef { }
+  class TypeRepr extends Generated::TypeRepr { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UnderscoreExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/UnderscoreExprImpl.qll
index 03709c54b54..620a09e8c3d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/UnderscoreExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/UnderscoreExprImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `UnderscoreExpr`.
  *
@@ -12,11 +11,16 @@ private import codeql.rust.elements.internal.generated.UnderscoreExpr
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * An underscore expression. For example:
    * ```rust
    * _ = 42;
    * ```
    */
-  class UnderscoreExpr extends Generated::UnderscoreExpr { }
+  class UnderscoreExpr extends Generated::UnderscoreExpr {
+    override string toString() { result = this.toAbbreviatedString() }
+
+    override string toAbbreviatedString() { result = "_" }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/UnionImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/UnionImpl.qll
index dc850eac4d1..15a79374117 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/UnionImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/UnionImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `Union`.
  *
@@ -12,11 +11,14 @@ private import codeql.rust.elements.internal.generated.Union
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A Union. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class Union extends Generated::Union { }
+  class Union extends Generated::Union {
+    override string toString() { result = "union " + this.getName().getText() }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
index 4b94546d802..01d9955b402 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
@@ -73,24 +73,35 @@ module Impl {
    * where `definingNode` is the entire `Either::Left(x) | Either::Right(x)`
    * pattern.
    */
-  private predicate variableDecl(AstNode definingNode, IdentPat p, string name) {
-    (
-      definingNode = getOutermostEnclosingOrPat(p)
-      or
-      not exists(getOutermostEnclosingOrPat(p)) and
-      definingNode = p.getName()
-    ) and
-    name = p.getName().getText() and
-    // exclude for now anything starting with an uppercase character, which may be a reference to
-    // an enum constant (e.g. `None`). This excludes static and constant variables (UPPERCASE),
-    // which we don't appear to recognize yet anyway. This also assumes programmers follow the
-    // naming guidelines, which they generally do, but they're not enforced.
-    not name.charAt(0).isUppercase() and
-    // exclude parameters from functions without a body as these are trait method declarations
-    // without implementations
-    not exists(Function f | not f.hasBody() and f.getParamList().getAParam().getPat() = p) and
-    // exclude parameters from function pointer types (e.g. `x` in `fn(x: i32) -> i32`)
-    not exists(FnPtrType fp | fp.getParamList().getParam(_).getPat() = p)
+  private predicate variableDecl(AstNode definingNode, AstNode p, string name) {
+    p =
+      any(SelfParam sp |
+        definingNode = sp.getName() and
+        name = sp.getName().getText() and
+        // exclude self parameters from functions without a body as these are
+        // trait method declarations without implementations
+        not exists(Function f | not f.hasBody() and f.getParamList().getSelfParam() = sp)
+      )
+    or
+    p =
+      any(IdentPat pat |
+        (
+          definingNode = getOutermostEnclosingOrPat(pat)
+          or
+          not exists(getOutermostEnclosingOrPat(pat)) and definingNode = pat.getName()
+        ) and
+        name = pat.getName().getText() and
+        // exclude for now anything starting with an uppercase character, which may be a reference to
+        // an enum constant (e.g. `None`). This excludes static and constant variables (UPPERCASE),
+        // which we don't appear to recognize yet anyway. This also assumes programmers follow the
+        // naming guidelines, which they generally do, but they're not enforced.
+        not name.charAt(0).isUppercase() and
+        // exclude parameters from functions without a body as these are trait method declarations
+        // without implementations
+        not exists(Function f | not f.hasBody() and f.getParamList().getAParam().getPat() = pat) and
+        // exclude parameters from function pointer types (e.g. `x` in `fn(x: i32) -> i32`)
+        not exists(FnPtrTypeRepr fp | fp.getParamList().getParam(_).getPat() = pat)
+      )
   }
 
   /** A variable. */
@@ -112,8 +123,11 @@ module Impl {
     /** Gets an access to this variable. */
     VariableAccess getAnAccess() { result.getVariable() = this }
 
+    /** Gets the `self` parameter that declares this variable, if one exists. */
+    SelfParam getSelfParam() { variableDecl(definingNode, result, name) }
+
     /**
-     * Gets the pattern that declares this variable.
+     * Gets the pattern that declares this variable, if any.
      *
      * Normally, the pattern is unique, except when introduced in an or pattern:
      *
@@ -135,7 +149,9 @@ module Impl {
     predicate isCaptured() { this.getAnAccess().isCapture() }
 
     /** Gets the parameter that introduces this variable, if any. */
-    Param getParameter() { parameterDeclInScope(result, this, _) }
+    ParamBase getParameter() {
+      result = this.getSelfParam() or result.(Param).getPat() = getAVariablePatAncestor(this)
+    }
 
     /** Hold is this variable is mutable. */
     predicate isMutable() { this.getPat().isMut() }
@@ -144,7 +160,11 @@ module Impl {
     predicate isImmutable() { not this.isMutable() }
   }
 
-  /** A path expression that may access a local variable. */
+  /**
+   * A path expression that may access a local variable. These are paths that
+   * only consists of a simple name (i.e., without generic arguments,
+   * qualifiers, etc.).
+   */
   private class VariableAccessCand extends PathExprBase {
     string name_;
 
@@ -190,10 +210,7 @@ module Impl {
   private VariableScope getEnclosingScope(AstNode n) { result = getAnAncestorInVariableScope(n) }
 
   private Pat getAVariablePatAncestor(Variable v) {
-    exists(AstNode definingNode, string name |
-      v = MkVariable(definingNode, name) and
-      variableDecl(definingNode, result, name)
-    )
+    result = v.getPat()
     or
     exists(Pat mid |
       mid = getAVariablePatAncestor(v) and
@@ -202,23 +219,12 @@ module Impl {
   }
 
   /**
-   * Holds if parameter `p` introduces the variable `v` inside variable scope
-   * `scope`.
+   * Holds if a parameter declares the variable `v` inside variable scope `scope`.
    */
-  private predicate parameterDeclInScope(Param p, Variable v, VariableScope scope) {
-    exists(Pat pat |
-      pat = getAVariablePatAncestor(v) and
-      p.getPat() = pat
-    |
-      exists(Function f |
-        f.getParamList().getAParam() = p and
-        scope = f.getBody()
-      )
-      or
-      exists(ClosureExpr ce |
-        ce.getParamList().getAParam() = p and
-        scope = ce.getBody()
-      )
+  private predicate parameterDeclInScope(Variable v, VariableScope scope) {
+    exists(Callable f |
+      v.getParameter() = f.getParamList().getAParamBase() and
+      scope = [f.(Function).getBody(), f.(ClosureExpr).getBody()]
     )
   }
 
@@ -231,7 +237,7 @@ module Impl {
   ) {
     name = v.getName() and
     (
-      parameterDeclInScope(_, v, scope) and
+      parameterDeclInScope(v, scope) and
       scope.getLocation().hasLocationFileInfo(_, line, column, _, _)
       or
       exists(Pat pat | pat = getAVariablePatAncestor(v) |
@@ -378,7 +384,7 @@ module Impl {
     }
   }
 
-  private module DenseRankInput implements DenseRankInputSig3 {
+  private module DenseRankInput implements DenseRankInputSig2 {
     class C1 = VariableScope;
 
     class C2 = string;
@@ -401,7 +407,7 @@ module Impl {
    * to a variable named `name` in the variable scope `scope`.
    */
   private int rankVariableOrAccess(VariableScope scope, string name, VariableOrAccessCand v) {
-    result = DenseRank3<DenseRankInput>::denseRank(scope, name, v) - 1
+    v = DenseRank2<DenseRankInput>::denseRank(scope, name, result + 1)
   }
 
   /**
diff --git a/rust/ql/lib/codeql/rust/elements/internal/WhileExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/WhileExprImpl.qll
index 647864d4659..e41b6a684a1 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/WhileExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/WhileExprImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `WhileExpr`.
  *
@@ -12,11 +11,16 @@ private import codeql.rust.elements.internal.generated.WhileExpr
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A WhileExpr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class WhileExpr extends Generated::WhileExpr { }
+  class WhileExpr extends Generated::WhileExpr {
+    override string toStringPrefix() {
+      result = "while " + this.getCondition().toAbbreviatedString()
+    }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/WildcardPatImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/WildcardPatImpl.qll
index d12e49e1daa..f1a8fa1a72e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/WildcardPatImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/WildcardPatImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `WildcardPat`.
  *
@@ -12,11 +11,16 @@ private import codeql.rust.elements.internal.generated.WildcardPat
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A wildcard pattern. For example:
    * ```rust
    * let _ = 42;
    * ```
    */
-  class WildcardPat extends Generated::WildcardPat { }
+  class WildcardPat extends Generated::WildcardPat {
+    override string toString() { result = this.toAbbreviatedString() }
+
+    override string toAbbreviatedString() { result = "_" }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Addressable.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Addressable.qll
new file mode 100644
index 00000000000..9d4ba1e976a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Addressable.qll
@@ -0,0 +1,58 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `Addressable`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `Addressable` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * Something that can be addressed by a path.
+   *
+   * TODO: This does not yet include all possible cases.
+   * INTERNAL: Do not reference the `Generated::Addressable` class directly.
+   * Use the subclass `Addressable`, where the following predicates are available.
+   */
+  class Addressable extends Synth::TAddressable, AstNodeImpl::AstNode {
+    /**
+     * Gets the extended canonical path of this addressable, if it exists.
+     *
+     * Either a canonical path (see https://doc.rust-lang.org/reference/paths.html#canonical-paths),
+     * or `{<block id>}::name` for addressable items defined in an anonymous block (and only
+     * addressable there-in).
+     * INTERNAL: Do not use.
+     */
+    string getExtendedCanonicalPath() {
+      result = Synth::convertAddressableToRaw(this).(Raw::Addressable).getExtendedCanonicalPath()
+    }
+
+    /**
+     * Holds if `getExtendedCanonicalPath()` exists.
+     * INTERNAL: Do not use.
+     */
+    final predicate hasExtendedCanonicalPath() { exists(this.getExtendedCanonicalPath()) }
+
+    /**
+     * Gets the crate origin of this addressable, if it exists.
+     *
+     * One of `rustc:<name>`, `repo:<repository>:<name>` or `lang:<name>`.
+     * INTERNAL: Do not use.
+     */
+    string getCrateOrigin() {
+      result = Synth::convertAddressableToRaw(this).(Raw::Addressable).getCrateOrigin()
+    }
+
+    /**
+     * Holds if `getCrateOrigin()` exists.
+     * INTERNAL: Do not use.
+     */
+    final predicate hasCrateOrigin() { exists(this.getCrateOrigin()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayExpr.qll
index 95ffb491129..cb6d92d0dd5 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayExpr.qll
@@ -16,7 +16,7 @@ import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
  */
 module Generated {
   /**
-   * An array expression. For example:
+   * The base class for array expressions. For example:
    * ```rust
    * [1, 2, 3];
    * [1; 10];
@@ -25,33 +25,10 @@ module Generated {
    * Use the subclass `ArrayExpr`, where the following predicates are available.
    */
   class ArrayExpr extends Synth::TArrayExpr, ExprImpl::Expr {
-    override string getAPrimaryQlClass() { result = "ArrayExpr" }
-
-    /**
-     * Gets the `index`th attr of this array expression (0-based).
-     */
-    Attr getAttr(int index) {
-      result =
-        Synth::convertAttrFromRaw(Synth::convertArrayExprToRaw(this).(Raw::ArrayExpr).getAttr(index))
-    }
-
-    /**
-     * Gets any of the attrs of this array expression.
-     */
-    final Attr getAnAttr() { result = this.getAttr(_) }
-
-    /**
-     * Gets the number of attrs of this array expression.
-     */
-    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
-
     /**
      * Gets the `index`th expression of this array expression (0-based).
      */
-    Expr getExpr(int index) {
-      result =
-        Synth::convertExprFromRaw(Synth::convertArrayExprToRaw(this).(Raw::ArrayExpr).getExpr(index))
-    }
+    Expr getExpr(int index) { none() }
 
     /**
      * Gets any of the expressions of this array expression.
@@ -62,5 +39,20 @@ module Generated {
      * Gets the number of expressions of this array expression.
      */
     final int getNumberOfExprs() { result = count(int i | exists(this.getExpr(i))) }
+
+    /**
+     * Gets the `index`th attr of this array expression (0-based).
+     */
+    Attr getAttr(int index) { none() }
+
+    /**
+     * Gets any of the attrs of this array expression.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this array expression.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayExprInternal.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayExprInternal.qll
new file mode 100644
index 00000000000..15c86caa17b
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayExprInternal.qll
@@ -0,0 +1,72 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ArrayExprInternal`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
+import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ArrayExprInternal` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::ArrayExprInternal` class directly.
+   * Use the subclass `ArrayExprInternal`, where the following predicates are available.
+   */
+  class ArrayExprInternal extends Synth::TArrayExprInternal, ExprImpl::Expr {
+    override string getAPrimaryQlClass() { result = "ArrayExprInternal" }
+
+    /**
+     * Gets the `index`th attr of this array expression internal (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertArrayExprInternalToRaw(this)
+              .(Raw::ArrayExprInternal)
+              .getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this array expression internal.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this array expression internal.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the `index`th expression of this array expression internal (0-based).
+     */
+    Expr getExpr(int index) {
+      result =
+        Synth::convertExprFromRaw(Synth::convertArrayExprInternalToRaw(this)
+              .(Raw::ArrayExprInternal)
+              .getExpr(index))
+    }
+
+    /**
+     * Gets any of the expressions of this array expression internal.
+     */
+    final Expr getAnExpr() { result = this.getExpr(_) }
+
+    /**
+     * Gets the number of expressions of this array expression internal.
+     */
+    final int getNumberOfExprs() { result = count(int i | exists(this.getExpr(i))) }
+
+    /**
+     * Holds if this array expression internal is semicolon.
+     */
+    predicate isSemicolon() {
+      Synth::convertArrayExprInternalToRaw(this).(Raw::ArrayExprInternal).isSemicolon()
+    }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayListExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayListExpr.qll
new file mode 100644
index 00000000000..657be83802d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayListExpr.qll
@@ -0,0 +1,27 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ArrayListExpr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.ArrayExprImpl::Impl as ArrayExprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ArrayListExpr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * An array expression with a list of elements. For example:
+   * ```rust
+   * [1, 2, 3];
+   * ```
+   * INTERNAL: Do not reference the `Generated::ArrayListExpr` class directly.
+   * Use the subclass `ArrayListExpr`, where the following predicates are available.
+   */
+  class ArrayListExpr extends Synth::TArrayListExpr, ArrayExprImpl::ArrayExpr {
+    override string getAPrimaryQlClass() { result = "ArrayListExpr" }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayRepeatExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayRepeatExpr.qll
new file mode 100644
index 00000000000..df7b21452a1
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayRepeatExpr.qll
@@ -0,0 +1,38 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ArrayRepeatExpr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.ArrayExprImpl::Impl as ArrayExprImpl
+import codeql.rust.elements.Expr
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ArrayRepeatExpr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * An array expression with a repeat operand and a repeat length. For example:
+   * ```rust
+   * [1; 10];
+   * ```
+   * INTERNAL: Do not reference the `Generated::ArrayRepeatExpr` class directly.
+   * Use the subclass `ArrayRepeatExpr`, where the following predicates are available.
+   */
+  class ArrayRepeatExpr extends Synth::TArrayRepeatExpr, ArrayExprImpl::ArrayExpr {
+    override string getAPrimaryQlClass() { result = "ArrayRepeatExpr" }
+
+    /**
+     * Gets the repeat operand of this array repeat expression.
+     */
+    Expr getRepeatOperand() { none() }
+
+    /**
+     * Gets the repeat length of this array repeat expression.
+     */
+    Expr getRepeatLength() { none() }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayType.qll
deleted file mode 100644
index 6e4ae1314ce..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayType.qll
+++ /dev/null
@@ -1,57 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `ArrayType`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.ConstArg
-import codeql.rust.elements.TypeRef
-import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `ArrayType` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A ArrayType. For example:
-   * ```rust
-   * todo!()
-   * ```
-   * INTERNAL: Do not reference the `Generated::ArrayType` class directly.
-   * Use the subclass `ArrayType`, where the following predicates are available.
-   */
-  class ArrayType extends Synth::TArrayType, TypeRefImpl::TypeRef {
-    override string getAPrimaryQlClass() { result = "ArrayType" }
-
-    /**
-     * Gets the const argument of this array type, if it exists.
-     */
-    ConstArg getConstArg() {
-      result =
-        Synth::convertConstArgFromRaw(Synth::convertArrayTypeToRaw(this)
-              .(Raw::ArrayType)
-              .getConstArg())
-    }
-
-    /**
-     * Holds if `getConstArg()` exists.
-     */
-    final predicate hasConstArg() { exists(this.getConstArg()) }
-
-    /**
-     * Gets the ty of this array type, if it exists.
-     */
-    TypeRef getTy() {
-      result =
-        Synth::convertTypeRefFromRaw(Synth::convertArrayTypeToRaw(this).(Raw::ArrayType).getTy())
-    }
-
-    /**
-     * Holds if `getTy()` exists.
-     */
-    final predicate hasTy() { exists(this.getTy()) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayTypeRepr.qll
new file mode 100644
index 00000000000..f990c62beec
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ArrayTypeRepr.qll
@@ -0,0 +1,59 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ArrayTypeRepr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.ConstArg
+import codeql.rust.elements.TypeRepr
+import codeql.rust.elements.internal.TypeReprImpl::Impl as TypeReprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ArrayTypeRepr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A ArrayTypeRepr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::ArrayTypeRepr` class directly.
+   * Use the subclass `ArrayTypeRepr`, where the following predicates are available.
+   */
+  class ArrayTypeRepr extends Synth::TArrayTypeRepr, TypeReprImpl::TypeRepr {
+    override string getAPrimaryQlClass() { result = "ArrayTypeRepr" }
+
+    /**
+     * Gets the const argument of this array type representation, if it exists.
+     */
+    ConstArg getConstArg() {
+      result =
+        Synth::convertConstArgFromRaw(Synth::convertArrayTypeReprToRaw(this)
+              .(Raw::ArrayTypeRepr)
+              .getConstArg())
+    }
+
+    /**
+     * Holds if `getConstArg()` exists.
+     */
+    final predicate hasConstArg() { exists(this.getConstArg()) }
+
+    /**
+     * Gets the element type representation of this array type representation, if it exists.
+     */
+    TypeRepr getElementTypeRepr() {
+      result =
+        Synth::convertTypeReprFromRaw(Synth::convertArrayTypeReprToRaw(this)
+              .(Raw::ArrayTypeRepr)
+              .getElementTypeRepr())
+    }
+
+    /**
+     * Holds if `getElementTypeRepr()` exists.
+     */
+    final predicate hasElementTypeRepr() { exists(this.getElementTypeRepr()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/AssocTypeArg.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/AssocTypeArg.qll
index 940e76ebbbc..fff85bc88af 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/AssocTypeArg.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/AssocTypeArg.qll
@@ -11,10 +11,10 @@ import codeql.rust.elements.internal.GenericArgImpl::Impl as GenericArgImpl
 import codeql.rust.elements.GenericArgList
 import codeql.rust.elements.NameRef
 import codeql.rust.elements.ParamList
-import codeql.rust.elements.RetType
+import codeql.rust.elements.RetTypeRepr
 import codeql.rust.elements.ReturnTypeSyntax
 import codeql.rust.elements.TypeBoundList
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * INTERNAL: This module contains the fully generated definition of `AssocTypeArg` and should not
@@ -95,9 +95,9 @@ module Generated {
     /**
      * Gets the ret type of this assoc type argument, if it exists.
      */
-    RetType getRetType() {
+    RetTypeRepr getRetType() {
       result =
-        Synth::convertRetTypeFromRaw(Synth::convertAssocTypeArgToRaw(this)
+        Synth::convertRetTypeReprFromRaw(Synth::convertAssocTypeArgToRaw(this)
               .(Raw::AssocTypeArg)
               .getRetType())
     }
@@ -123,19 +123,19 @@ module Generated {
     final predicate hasReturnTypeSyntax() { exists(this.getReturnTypeSyntax()) }
 
     /**
-     * Gets the ty of this assoc type argument, if it exists.
+     * Gets the type representation of this assoc type argument, if it exists.
      */
-    TypeRef getTy() {
+    TypeRepr getTypeRepr() {
       result =
-        Synth::convertTypeRefFromRaw(Synth::convertAssocTypeArgToRaw(this)
+        Synth::convertTypeReprFromRaw(Synth::convertAssocTypeArgToRaw(this)
               .(Raw::AssocTypeArg)
-              .getTy())
+              .getTypeRepr())
     }
 
     /**
-     * Holds if `getTy()` exists.
+     * Holds if `getTypeRepr()` exists.
      */
-    final predicate hasTy() { exists(this.getTy()) }
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
 
     /**
      * Gets the type bound list of this assoc type argument, if it exists.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/BlockExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/BlockExpr.qll
index c4f11fdd90c..6a01a0c4588 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/BlockExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/BlockExpr.qll
@@ -7,8 +7,7 @@
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.Attr
-import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
-import codeql.rust.elements.Label
+import codeql.rust.elements.internal.LabelableExprImpl::Impl as LabelableExprImpl
 import codeql.rust.elements.StmtList
 
 /**
@@ -32,7 +31,7 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::BlockExpr` class directly.
    * Use the subclass `BlockExpr`, where the following predicates are available.
    */
-  class BlockExpr extends Synth::TBlockExpr, ExprImpl::Expr {
+  class BlockExpr extends Synth::TBlockExpr, LabelableExprImpl::LabelableExpr {
     override string getAPrimaryQlClass() { result = "BlockExpr" }
 
     /**
@@ -83,19 +82,6 @@ module Generated {
      */
     predicate isUnsafe() { Synth::convertBlockExprToRaw(this).(Raw::BlockExpr).isUnsafe() }
 
-    /**
-     * Gets the label of this block expression, if it exists.
-     */
-    Label getLabel() {
-      result =
-        Synth::convertLabelFromRaw(Synth::convertBlockExprToRaw(this).(Raw::BlockExpr).getLabel())
-    }
-
-    /**
-     * Holds if `getLabel()` exists.
-     */
-    final predicate hasLabel() { exists(this.getLabel()) }
-
     /**
      * Gets the statement list of this block expression, if it exists.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/BoxPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/BoxPat.qll
index d741991d001..ddd1d312c6b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/BoxPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/BoxPat.qll
@@ -29,7 +29,7 @@ module Generated {
     override string getAPrimaryQlClass() { result = "BoxPat" }
 
     /**
-     * Gets the pat of this box pat, if it exists.
+     * Gets the pattern of this box pattern, if it exists.
      */
     Pat getPat() {
       result = Synth::convertPatFromRaw(Synth::convertBoxPatToRaw(this).(Raw::BoxPat).getPat())
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/CallExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/CallExpr.qll
index 2e41b664a4e..829de70510b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/CallExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/CallExpr.qll
@@ -29,16 +29,16 @@ module Generated {
     override string getAPrimaryQlClass() { result = "CallExpr" }
 
     /**
-     * Gets the expression of this call expression, if it exists.
+     * Gets the function of this call expression, if it exists.
      */
-    Expr getExpr() {
+    Expr getFunction() {
       result =
-        Synth::convertExprFromRaw(Synth::convertCallExprToRaw(this).(Raw::CallExpr).getExpr())
+        Synth::convertExprFromRaw(Synth::convertCallExprToRaw(this).(Raw::CallExpr).getFunction())
     }
 
     /**
-     * Holds if `getExpr()` exists.
+     * Holds if `getFunction()` exists.
      */
-    final predicate hasExpr() { exists(this.getExpr()) }
+    final predicate hasFunction() { exists(this.getFunction()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/CastExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/CastExpr.qll
index 9ede7cd7f33..dda6547fabb 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/CastExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/CastExpr.qll
@@ -9,7 +9,7 @@ private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * INTERNAL: This module contains the fully generated definition of `CastExpr` and should not
@@ -59,16 +59,18 @@ module Generated {
     final predicate hasExpr() { exists(this.getExpr()) }
 
     /**
-     * Gets the ty of this cast expression, if it exists.
+     * Gets the type representation of this cast expression, if it exists.
      */
-    TypeRef getTy() {
+    TypeRepr getTypeRepr() {
       result =
-        Synth::convertTypeRefFromRaw(Synth::convertCastExprToRaw(this).(Raw::CastExpr).getTy())
+        Synth::convertTypeReprFromRaw(Synth::convertCastExprToRaw(this)
+              .(Raw::CastExpr)
+              .getTypeRepr())
     }
 
     /**
-     * Holds if `getTy()` exists.
+     * Holds if `getTypeRepr()` exists.
      */
-    final predicate hasTy() { exists(this.getTy()) }
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureExpr.qll
index 0e107c2301d..70a3c374e0d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureExpr.qll
@@ -10,7 +10,7 @@ import codeql.rust.elements.internal.CallableImpl::Impl as CallableImpl
 import codeql.rust.elements.ClosureBinder
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
-import codeql.rust.elements.RetType
+import codeql.rust.elements.RetTypeRepr
 
 /**
  * INTERNAL: This module contains the fully generated definition of `ClosureExpr` and should not
@@ -90,9 +90,9 @@ module Generated {
     /**
      * Gets the ret type of this closure expression, if it exists.
      */
-    RetType getRetType() {
+    RetTypeRepr getRetType() {
       result =
-        Synth::convertRetTypeFromRaw(Synth::convertClosureExprToRaw(this)
+        Synth::convertRetTypeReprFromRaw(Synth::convertClosureExprToRaw(this)
               .(Raw::ClosureExpr)
               .getRetType())
     }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Const.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Const.qll
index a9b1932a935..d63e58f120b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Const.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Const.qll
@@ -11,7 +11,7 @@ import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
 import codeql.rust.elements.Name
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.Visibility
 
 /**
@@ -82,16 +82,17 @@ module Generated {
     final predicate hasName() { exists(this.getName()) }
 
     /**
-     * Gets the ty of this const, if it exists.
+     * Gets the type representation of this const, if it exists.
      */
-    TypeRef getTy() {
-      result = Synth::convertTypeRefFromRaw(Synth::convertConstToRaw(this).(Raw::Const).getTy())
+    TypeRepr getTypeRepr() {
+      result =
+        Synth::convertTypeReprFromRaw(Synth::convertConstToRaw(this).(Raw::Const).getTypeRepr())
     }
 
     /**
-     * Holds if `getTy()` exists.
+     * Holds if `getTypeRepr()` exists.
      */
-    final predicate hasTy() { exists(this.getTy()) }
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
 
     /**
      * Gets the visibility of this const, if it exists.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll
index 2935c7c8f85..97130895291 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll
@@ -29,7 +29,7 @@ module Generated {
     override string getAPrimaryQlClass() { result = "ConstBlockPat" }
 
     /**
-     * Gets the block expression of this const block pat, if it exists.
+     * Gets the block expression of this const block pattern, if it exists.
      */
     BlockExpr getBlockExpr() {
       result =
@@ -44,7 +44,7 @@ module Generated {
     final predicate hasBlockExpr() { exists(this.getBlockExpr()) }
 
     /**
-     * Holds if this const block pat is const.
+     * Holds if this const block pattern is const.
      */
     predicate isConst() { Synth::convertConstBlockPatToRaw(this).(Raw::ConstBlockPat).isConst() }
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ConstParam.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ConstParam.qll
index 451234d3dc1..3069e5bc63c 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ConstParam.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ConstParam.qll
@@ -10,7 +10,7 @@ import codeql.rust.elements.Attr
 import codeql.rust.elements.ConstArg
 import codeql.rust.elements.internal.GenericParamImpl::Impl as GenericParamImpl
 import codeql.rust.elements.Name
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * INTERNAL: This module contains the fully generated definition of `ConstParam` and should not
@@ -82,16 +82,18 @@ module Generated {
     final predicate hasName() { exists(this.getName()) }
 
     /**
-     * Gets the ty of this const parameter, if it exists.
+     * Gets the type representation of this const parameter, if it exists.
      */
-    TypeRef getTy() {
+    TypeRepr getTypeRepr() {
       result =
-        Synth::convertTypeRefFromRaw(Synth::convertConstParamToRaw(this).(Raw::ConstParam).getTy())
+        Synth::convertTypeReprFromRaw(Synth::convertConstParamToRaw(this)
+              .(Raw::ConstParam)
+              .getTypeRepr())
     }
 
     /**
-     * Holds if `getTy()` exists.
+     * Holds if `getTypeRepr()` exists.
      */
-    final predicate hasTy() { exists(this.getTy()) }
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/DynTraitType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/DynTraitTypeRepr.qll
similarity index 60%
rename from rust/ql/lib/codeql/rust/elements/internal/generated/DynTraitType.qll
rename to rust/ql/lib/codeql/rust/elements/internal/generated/DynTraitTypeRepr.qll
index acd35715487..3ba7a5e4997 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/DynTraitType.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/DynTraitTypeRepr.qll
@@ -1,37 +1,37 @@
 // generated by codegen, do not edit
 /**
- * This module provides the generated definition of `DynTraitType`.
+ * This module provides the generated definition of `DynTraitTypeRepr`.
  * INTERNAL: Do not import directly.
  */
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.TypeBoundList
-import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
+import codeql.rust.elements.internal.TypeReprImpl::Impl as TypeReprImpl
 
 /**
- * INTERNAL: This module contains the fully generated definition of `DynTraitType` and should not
+ * INTERNAL: This module contains the fully generated definition of `DynTraitTypeRepr` and should not
  * be referenced directly.
  */
 module Generated {
   /**
-   * A DynTraitType. For example:
+   * A DynTraitTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
-   * INTERNAL: Do not reference the `Generated::DynTraitType` class directly.
-   * Use the subclass `DynTraitType`, where the following predicates are available.
+   * INTERNAL: Do not reference the `Generated::DynTraitTypeRepr` class directly.
+   * Use the subclass `DynTraitTypeRepr`, where the following predicates are available.
    */
-  class DynTraitType extends Synth::TDynTraitType, TypeRefImpl::TypeRef {
-    override string getAPrimaryQlClass() { result = "DynTraitType" }
+  class DynTraitTypeRepr extends Synth::TDynTraitTypeRepr, TypeReprImpl::TypeRepr {
+    override string getAPrimaryQlClass() { result = "DynTraitTypeRepr" }
 
     /**
-     * Gets the type bound list of this dyn trait type, if it exists.
+     * Gets the type bound list of this dyn trait type representation, if it exists.
      */
     TypeBoundList getTypeBoundList() {
       result =
-        Synth::convertTypeBoundListFromRaw(Synth::convertDynTraitTypeToRaw(this)
-              .(Raw::DynTraitType)
+        Synth::convertTypeBoundListFromRaw(Synth::convertDynTraitTypeReprToRaw(this)
+              .(Raw::DynTraitTypeRepr)
               .getTypeBoundList())
     }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ExtractorStep.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ExtractorStep.qll
new file mode 100644
index 00000000000..c2d7838865b
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ExtractorStep.qll
@@ -0,0 +1,45 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ExtractorStep`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.ElementImpl::Impl as ElementImpl
+import codeql.files.FileSystem
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ExtractorStep` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * INTERNAL: Do not reference the `Generated::ExtractorStep` class directly.
+   * Use the subclass `ExtractorStep`, where the following predicates are available.
+   */
+  class ExtractorStep extends Synth::TExtractorStep, ElementImpl::Element {
+    override string getAPrimaryQlClass() { result = "ExtractorStep" }
+
+    /**
+     * Gets the action of this extractor step.
+     */
+    string getAction() {
+      result = Synth::convertExtractorStepToRaw(this).(Raw::ExtractorStep).getAction()
+    }
+
+    /**
+     * Gets the file of this extractor step.
+     */
+    File getFile() {
+      result = Synth::convertExtractorStepToRaw(this).(Raw::ExtractorStep).getFile()
+    }
+
+    /**
+     * Gets the duration ms of this extractor step.
+     */
+    int getDurationMs() {
+      result = Synth::convertExtractorStepToRaw(this).(Raw::ExtractorStep).getDurationMs()
+    }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/FnPtrType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/FnPtrType.qll
deleted file mode 100644
index 8296c401fa8..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/FnPtrType.qll
+++ /dev/null
@@ -1,88 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `FnPtrType`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Abi
-import codeql.rust.elements.ParamList
-import codeql.rust.elements.RetType
-import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `FnPtrType` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A FnPtrType. For example:
-   * ```rust
-   * todo!()
-   * ```
-   * INTERNAL: Do not reference the `Generated::FnPtrType` class directly.
-   * Use the subclass `FnPtrType`, where the following predicates are available.
-   */
-  class FnPtrType extends Synth::TFnPtrType, TypeRefImpl::TypeRef {
-    override string getAPrimaryQlClass() { result = "FnPtrType" }
-
-    /**
-     * Gets the abi of this fn ptr type, if it exists.
-     */
-    Abi getAbi() {
-      result =
-        Synth::convertAbiFromRaw(Synth::convertFnPtrTypeToRaw(this).(Raw::FnPtrType).getAbi())
-    }
-
-    /**
-     * Holds if `getAbi()` exists.
-     */
-    final predicate hasAbi() { exists(this.getAbi()) }
-
-    /**
-     * Holds if this fn ptr type is async.
-     */
-    predicate isAsync() { Synth::convertFnPtrTypeToRaw(this).(Raw::FnPtrType).isAsync() }
-
-    /**
-     * Holds if this fn ptr type is const.
-     */
-    predicate isConst() { Synth::convertFnPtrTypeToRaw(this).(Raw::FnPtrType).isConst() }
-
-    /**
-     * Holds if this fn ptr type is unsafe.
-     */
-    predicate isUnsafe() { Synth::convertFnPtrTypeToRaw(this).(Raw::FnPtrType).isUnsafe() }
-
-    /**
-     * Gets the parameter list of this fn ptr type, if it exists.
-     */
-    ParamList getParamList() {
-      result =
-        Synth::convertParamListFromRaw(Synth::convertFnPtrTypeToRaw(this)
-              .(Raw::FnPtrType)
-              .getParamList())
-    }
-
-    /**
-     * Holds if `getParamList()` exists.
-     */
-    final predicate hasParamList() { exists(this.getParamList()) }
-
-    /**
-     * Gets the ret type of this fn ptr type, if it exists.
-     */
-    RetType getRetType() {
-      result =
-        Synth::convertRetTypeFromRaw(Synth::convertFnPtrTypeToRaw(this)
-              .(Raw::FnPtrType)
-              .getRetType())
-    }
-
-    /**
-     * Holds if `getRetType()` exists.
-     */
-    final predicate hasRetType() { exists(this.getRetType()) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/FnPtrTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/FnPtrTypeRepr.qll
new file mode 100644
index 00000000000..ebdbe7e772f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/FnPtrTypeRepr.qll
@@ -0,0 +1,90 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `FnPtrTypeRepr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Abi
+import codeql.rust.elements.ParamList
+import codeql.rust.elements.RetTypeRepr
+import codeql.rust.elements.internal.TypeReprImpl::Impl as TypeReprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `FnPtrTypeRepr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A FnPtrTypeRepr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::FnPtrTypeRepr` class directly.
+   * Use the subclass `FnPtrTypeRepr`, where the following predicates are available.
+   */
+  class FnPtrTypeRepr extends Synth::TFnPtrTypeRepr, TypeReprImpl::TypeRepr {
+    override string getAPrimaryQlClass() { result = "FnPtrTypeRepr" }
+
+    /**
+     * Gets the abi of this fn ptr type representation, if it exists.
+     */
+    Abi getAbi() {
+      result =
+        Synth::convertAbiFromRaw(Synth::convertFnPtrTypeReprToRaw(this)
+              .(Raw::FnPtrTypeRepr)
+              .getAbi())
+    }
+
+    /**
+     * Holds if `getAbi()` exists.
+     */
+    final predicate hasAbi() { exists(this.getAbi()) }
+
+    /**
+     * Holds if this fn ptr type representation is async.
+     */
+    predicate isAsync() { Synth::convertFnPtrTypeReprToRaw(this).(Raw::FnPtrTypeRepr).isAsync() }
+
+    /**
+     * Holds if this fn ptr type representation is const.
+     */
+    predicate isConst() { Synth::convertFnPtrTypeReprToRaw(this).(Raw::FnPtrTypeRepr).isConst() }
+
+    /**
+     * Holds if this fn ptr type representation is unsafe.
+     */
+    predicate isUnsafe() { Synth::convertFnPtrTypeReprToRaw(this).(Raw::FnPtrTypeRepr).isUnsafe() }
+
+    /**
+     * Gets the parameter list of this fn ptr type representation, if it exists.
+     */
+    ParamList getParamList() {
+      result =
+        Synth::convertParamListFromRaw(Synth::convertFnPtrTypeReprToRaw(this)
+              .(Raw::FnPtrTypeRepr)
+              .getParamList())
+    }
+
+    /**
+     * Holds if `getParamList()` exists.
+     */
+    final predicate hasParamList() { exists(this.getParamList()) }
+
+    /**
+     * Gets the ret type of this fn ptr type representation, if it exists.
+     */
+    RetTypeRepr getRetType() {
+      result =
+        Synth::convertRetTypeReprFromRaw(Synth::convertFnPtrTypeReprToRaw(this)
+              .(Raw::FnPtrTypeRepr)
+              .getRetType())
+    }
+
+    /**
+     * Holds if `getRetType()` exists.
+     */
+    final predicate hasRetType() { exists(this.getRetType()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ForExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ForExpr.qll
index dc5f2d34d3e..1804f3c7058 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ForExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ForExpr.qll
@@ -7,10 +7,8 @@
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.Attr
-import codeql.rust.elements.BlockExpr
 import codeql.rust.elements.Expr
-import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
-import codeql.rust.elements.Label
+import codeql.rust.elements.internal.LoopingExprImpl::Impl as LoopingExprImpl
 import codeql.rust.elements.Pat
 
 /**
@@ -26,7 +24,7 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::ForExpr` class directly.
    * Use the subclass `ForExpr`, where the following predicates are available.
    */
-  class ForExpr extends Synth::TForExpr, ExprImpl::Expr {
+  class ForExpr extends Synth::TForExpr, LoopingExprImpl::LoopingExpr {
     override string getAPrimaryQlClass() { result = "ForExpr" }
 
     /**
@@ -61,33 +59,7 @@ module Generated {
     final predicate hasIterable() { exists(this.getIterable()) }
 
     /**
-     * Gets the label of this for expression, if it exists.
-     */
-    Label getLabel() {
-      result =
-        Synth::convertLabelFromRaw(Synth::convertForExprToRaw(this).(Raw::ForExpr).getLabel())
-    }
-
-    /**
-     * Holds if `getLabel()` exists.
-     */
-    final predicate hasLabel() { exists(this.getLabel()) }
-
-    /**
-     * Gets the loop body of this for expression, if it exists.
-     */
-    BlockExpr getLoopBody() {
-      result =
-        Synth::convertBlockExprFromRaw(Synth::convertForExprToRaw(this).(Raw::ForExpr).getLoopBody())
-    }
-
-    /**
-     * Holds if `getLoopBody()` exists.
-     */
-    final predicate hasLoopBody() { exists(this.getLoopBody()) }
-
-    /**
-     * Gets the pat of this for expression, if it exists.
+     * Gets the pattern of this for expression, if it exists.
      */
     Pat getPat() {
       result = Synth::convertPatFromRaw(Synth::convertForExprToRaw(this).(Raw::ForExpr).getPat())
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ForType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ForType.qll
deleted file mode 100644
index 0230cd6cd44..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ForType.qll
+++ /dev/null
@@ -1,56 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `ForType`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.GenericParamList
-import codeql.rust.elements.TypeRef
-import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `ForType` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A ForType. For example:
-   * ```rust
-   * todo!()
-   * ```
-   * INTERNAL: Do not reference the `Generated::ForType` class directly.
-   * Use the subclass `ForType`, where the following predicates are available.
-   */
-  class ForType extends Synth::TForType, TypeRefImpl::TypeRef {
-    override string getAPrimaryQlClass() { result = "ForType" }
-
-    /**
-     * Gets the generic parameter list of this for type, if it exists.
-     */
-    GenericParamList getGenericParamList() {
-      result =
-        Synth::convertGenericParamListFromRaw(Synth::convertForTypeToRaw(this)
-              .(Raw::ForType)
-              .getGenericParamList())
-    }
-
-    /**
-     * Holds if `getGenericParamList()` exists.
-     */
-    final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
-
-    /**
-     * Gets the ty of this for type, if it exists.
-     */
-    TypeRef getTy() {
-      result = Synth::convertTypeRefFromRaw(Synth::convertForTypeToRaw(this).(Raw::ForType).getTy())
-    }
-
-    /**
-     * Holds if `getTy()` exists.
-     */
-    final predicate hasTy() { exists(this.getTy()) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ForTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ForTypeRepr.qll
new file mode 100644
index 00000000000..6f539d1e7f2
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ForTypeRepr.qll
@@ -0,0 +1,59 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ForTypeRepr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.TypeRepr
+import codeql.rust.elements.internal.TypeReprImpl::Impl as TypeReprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ForTypeRepr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A ForTypeRepr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::ForTypeRepr` class directly.
+   * Use the subclass `ForTypeRepr`, where the following predicates are available.
+   */
+  class ForTypeRepr extends Synth::TForTypeRepr, TypeReprImpl::TypeRepr {
+    override string getAPrimaryQlClass() { result = "ForTypeRepr" }
+
+    /**
+     * Gets the generic parameter list of this for type representation, if it exists.
+     */
+    GenericParamList getGenericParamList() {
+      result =
+        Synth::convertGenericParamListFromRaw(Synth::convertForTypeReprToRaw(this)
+              .(Raw::ForTypeRepr)
+              .getGenericParamList())
+    }
+
+    /**
+     * Holds if `getGenericParamList()` exists.
+     */
+    final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
+
+    /**
+     * Gets the type representation of this for type representation, if it exists.
+     */
+    TypeRepr getTypeRepr() {
+      result =
+        Synth::convertTypeReprFromRaw(Synth::convertForTypeReprToRaw(this)
+              .(Raw::ForTypeRepr)
+              .getTypeRepr())
+    }
+
+    /**
+     * Holds if `getTypeRepr()` exists.
+     */
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Format.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Format.qll
index f2ade708ffa..41c748d7fde 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Format.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Format.qll
@@ -7,6 +7,7 @@
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.FormatArgsExpr
+import codeql.rust.elements.FormatArgument
 import codeql.rust.elements.internal.LocatableImpl::Impl as LocatableImpl
 
 /**
@@ -34,5 +35,15 @@ module Generated {
      * Gets the index of this format.
      */
     int getIndex() { none() }
+
+    /**
+     * Gets the argument of this format, if it exists.
+     */
+    FormatArgument getArgument() { none() }
+
+    /**
+     * Holds if `getArgument()` exists.
+     */
+    final predicate hasArgument() { exists(this.getArgument()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/FormatArgsExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/FormatArgsExpr.qll
index 7fe088e2541..38034779e05 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/FormatArgsExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/FormatArgsExpr.qll
@@ -9,6 +9,7 @@ private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
+import codeql.rust.elements.Format
 import codeql.rust.elements.FormatArgsArg
 
 /**
@@ -19,7 +20,11 @@ module Generated {
   /**
    * A FormatArgsExpr. For example:
    * ```rust
-   * todo!()
+   * format_args!("no args");
+   * format_args!("{} foo {:?}", 1, 2);
+   * format_args!("{b} foo {a:?}", a=1, b=2);
+   * let (x, y) = (1, 42);
+   * format_args!("{x}, {y}");
    * ```
    * INTERNAL: Do not reference the `Generated::FormatArgsExpr` class directly.
    * Use the subclass `FormatArgsExpr`, where the following predicates are available.
@@ -81,5 +86,20 @@ module Generated {
      * Holds if `getTemplate()` exists.
      */
     final predicate hasTemplate() { exists(this.getTemplate()) }
+
+    /**
+     * Gets the `index`th format of this format arguments expression (0-based).
+     */
+    Format getFormat(int index) { none() }
+
+    /**
+     * Gets any of the formats of this format arguments expression.
+     */
+    final Format getAFormat() { result = this.getFormat(_) }
+
+    /**
+     * Gets the number of formats of this format arguments expression.
+     */
+    final int getNumberOfFormats() { result = count(int i | exists(this.getFormat(i))) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/FormatArgument.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/FormatArgument.qll
index 658d6b92e7a..a1db224494b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/FormatArgument.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/FormatArgument.qll
@@ -7,6 +7,7 @@
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.Format
+import codeql.rust.elements.FormatTemplateVariableAccess
 import codeql.rust.elements.internal.LocatableImpl::Impl as LocatableImpl
 
 /**
@@ -33,5 +34,15 @@ module Generated {
      * Gets the parent of this format argument.
      */
     Format getParent() { none() }
+
+    /**
+     * Gets the variable of this format argument, if it exists.
+     */
+    FormatTemplateVariableAccess getVariable() { none() }
+
+    /**
+     * Holds if `getVariable()` exists.
+     */
+    final predicate hasVariable() { exists(this.getVariable()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Function.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Function.qll
index cc0179cb15b..82914663b94 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Function.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Function.qll
@@ -14,7 +14,7 @@ import codeql.rust.elements.internal.ExternItemImpl::Impl as ExternItemImpl
 import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
 import codeql.rust.elements.Name
-import codeql.rust.elements.RetType
+import codeql.rust.elements.RetTypeRepr
 import codeql.rust.elements.Visibility
 import codeql.rust.elements.WhereClause
 
@@ -123,9 +123,11 @@ module Generated {
     /**
      * Gets the ret type of this function, if it exists.
      */
-    RetType getRetType() {
+    RetTypeRepr getRetType() {
       result =
-        Synth::convertRetTypeFromRaw(Synth::convertFunctionToRaw(this).(Raw::Function).getRetType())
+        Synth::convertRetTypeReprFromRaw(Synth::convertFunctionToRaw(this)
+              .(Raw::Function)
+              .getRetType())
     }
 
     /**
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/IdentPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/IdentPat.qll
index 275272f06a0..d016899bc01 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/IdentPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/IdentPat.qll
@@ -37,7 +37,7 @@ module Generated {
     override string getAPrimaryQlClass() { result = "IdentPat" }
 
     /**
-     * Gets the `index`th attr of this ident pat (0-based).
+     * Gets the `index`th attr of this ident pattern (0-based).
      */
     Attr getAttr(int index) {
       result =
@@ -45,27 +45,27 @@ module Generated {
     }
 
     /**
-     * Gets any of the attrs of this ident pat.
+     * Gets any of the attrs of this ident pattern.
      */
     final Attr getAnAttr() { result = this.getAttr(_) }
 
     /**
-     * Gets the number of attrs of this ident pat.
+     * Gets the number of attrs of this ident pattern.
      */
     final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
 
     /**
-     * Holds if this ident pat is mut.
+     * Holds if this ident pattern is mut.
      */
     predicate isMut() { Synth::convertIdentPatToRaw(this).(Raw::IdentPat).isMut() }
 
     /**
-     * Holds if this ident pat is reference.
+     * Holds if this ident pattern is reference.
      */
     predicate isRef() { Synth::convertIdentPatToRaw(this).(Raw::IdentPat).isRef() }
 
     /**
-     * Gets the name of this ident pat, if it exists.
+     * Gets the name of this ident pattern, if it exists.
      */
     Name getName() {
       result =
@@ -78,7 +78,7 @@ module Generated {
     final predicate hasName() { exists(this.getName()) }
 
     /**
-     * Gets the pat of this ident pat, if it exists.
+     * Gets the pattern of this ident pattern, if it exists.
      */
     Pat getPat() {
       result = Synth::convertPatFromRaw(Synth::convertIdentPatToRaw(this).(Raw::IdentPat).getPat())
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Impl.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Impl.qll
index 14ec8ee3863..65b4a330b94 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Impl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Impl.qll
@@ -10,7 +10,7 @@ import codeql.rust.elements.AssocItemList
 import codeql.rust.elements.Attr
 import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.Visibility
 import codeql.rust.elements.WhereClause
 
@@ -95,8 +95,8 @@ module Generated {
     /**
      * Gets the self ty of this impl, if it exists.
      */
-    TypeRef getSelfTy() {
-      result = Synth::convertTypeRefFromRaw(Synth::convertImplToRaw(this).(Raw::Impl).getSelfTy())
+    TypeRepr getSelfTy() {
+      result = Synth::convertTypeReprFromRaw(Synth::convertImplToRaw(this).(Raw::Impl).getSelfTy())
     }
 
     /**
@@ -107,8 +107,8 @@ module Generated {
     /**
      * Gets the trait of this impl, if it exists.
      */
-    TypeRef getTrait() {
-      result = Synth::convertTypeRefFromRaw(Synth::convertImplToRaw(this).(Raw::Impl).getTrait())
+    TypeRepr getTrait() {
+      result = Synth::convertTypeReprFromRaw(Synth::convertImplToRaw(this).(Raw::Impl).getTrait())
     }
 
     /**
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ImplTraitType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ImplTraitTypeRepr.qll
similarity index 59%
rename from rust/ql/lib/codeql/rust/elements/internal/generated/ImplTraitType.qll
rename to rust/ql/lib/codeql/rust/elements/internal/generated/ImplTraitTypeRepr.qll
index 1346e89d125..ab4d36247e0 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ImplTraitType.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ImplTraitTypeRepr.qll
@@ -1,37 +1,37 @@
 // generated by codegen, do not edit
 /**
- * This module provides the generated definition of `ImplTraitType`.
+ * This module provides the generated definition of `ImplTraitTypeRepr`.
  * INTERNAL: Do not import directly.
  */
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.TypeBoundList
-import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
+import codeql.rust.elements.internal.TypeReprImpl::Impl as TypeReprImpl
 
 /**
- * INTERNAL: This module contains the fully generated definition of `ImplTraitType` and should not
+ * INTERNAL: This module contains the fully generated definition of `ImplTraitTypeRepr` and should not
  * be referenced directly.
  */
 module Generated {
   /**
-   * A ImplTraitType. For example:
+   * A ImplTraitTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
-   * INTERNAL: Do not reference the `Generated::ImplTraitType` class directly.
-   * Use the subclass `ImplTraitType`, where the following predicates are available.
+   * INTERNAL: Do not reference the `Generated::ImplTraitTypeRepr` class directly.
+   * Use the subclass `ImplTraitTypeRepr`, where the following predicates are available.
    */
-  class ImplTraitType extends Synth::TImplTraitType, TypeRefImpl::TypeRef {
-    override string getAPrimaryQlClass() { result = "ImplTraitType" }
+  class ImplTraitTypeRepr extends Synth::TImplTraitTypeRepr, TypeReprImpl::TypeRepr {
+    override string getAPrimaryQlClass() { result = "ImplTraitTypeRepr" }
 
     /**
-     * Gets the type bound list of this impl trait type, if it exists.
+     * Gets the type bound list of this impl trait type representation, if it exists.
      */
     TypeBoundList getTypeBoundList() {
       result =
-        Synth::convertTypeBoundListFromRaw(Synth::convertImplTraitTypeToRaw(this)
-              .(Raw::ImplTraitType)
+        Synth::convertTypeBoundListFromRaw(Synth::convertImplTraitTypeReprToRaw(this)
+              .(Raw::ImplTraitTypeRepr)
               .getTypeBoundList())
     }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/InferType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/InferType.qll
deleted file mode 100644
index 09c8169a0b3..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/InferType.qll
+++ /dev/null
@@ -1,27 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `InferType`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `InferType` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A InferType. For example:
-   * ```rust
-   * todo!()
-   * ```
-   * INTERNAL: Do not reference the `Generated::InferType` class directly.
-   * Use the subclass `InferType`, where the following predicates are available.
-   */
-  class InferType extends Synth::TInferType, TypeRefImpl::TypeRef {
-    override string getAPrimaryQlClass() { result = "InferType" }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/InferTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/InferTypeRepr.qll
new file mode 100644
index 00000000000..a4e874d3a9a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/InferTypeRepr.qll
@@ -0,0 +1,27 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `InferTypeRepr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.TypeReprImpl::Impl as TypeReprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `InferTypeRepr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A InferTypeRepr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::InferTypeRepr` class directly.
+   * Use the subclass `InferTypeRepr`, where the following predicates are available.
+   */
+  class InferTypeRepr extends Synth::TInferTypeRepr, TypeReprImpl::TypeRepr {
+    override string getAPrimaryQlClass() { result = "InferTypeRepr" }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Item.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Item.qll
index 429221c7f18..39149c25258 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Item.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Item.qll
@@ -6,6 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AddressableImpl::Impl as AddressableImpl
 import codeql.rust.elements.internal.StmtImpl::Impl as StmtImpl
 
 /**
@@ -21,37 +22,5 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::Item` class directly.
    * Use the subclass `Item`, where the following predicates are available.
    */
-  class Item extends Synth::TItem, StmtImpl::Stmt {
-    /**
-     * Gets the extended canonical path of this item, if it exists.
-     *
-     * Either a canonical path (see https://doc.rust-lang.org/reference/paths.html#canonical-paths),
-     * or `{<block id>}::name` for addressable items defined in an anonymous block (and only
-     * addressable there-in).
-     * INTERNAL: Do not use.
-     */
-    string getExtendedCanonicalPath() {
-      result = Synth::convertItemToRaw(this).(Raw::Item).getExtendedCanonicalPath()
-    }
-
-    /**
-     * Holds if `getExtendedCanonicalPath()` exists.
-     * INTERNAL: Do not use.
-     */
-    final predicate hasExtendedCanonicalPath() { exists(this.getExtendedCanonicalPath()) }
-
-    /**
-     * Gets the crate origin of this item, if it exists.
-     *
-     * One of `rustc:<name>`, `repo:<repository>:<name>` or `lang:<name>`.
-     * INTERNAL: Do not use.
-     */
-    string getCrateOrigin() { result = Synth::convertItemToRaw(this).(Raw::Item).getCrateOrigin() }
-
-    /**
-     * Holds if `getCrateOrigin()` exists.
-     * INTERNAL: Do not use.
-     */
-    final predicate hasCrateOrigin() { exists(this.getCrateOrigin()) }
-  }
+  class Item extends Synth::TItem, StmtImpl::Stmt, AddressableImpl::Addressable { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/LabelableExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/LabelableExpr.qll
new file mode 100644
index 00000000000..a0dfd03fb40
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/LabelableExpr.qll
@@ -0,0 +1,38 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `LabelableExpr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
+import codeql.rust.elements.Label
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `LabelableExpr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * The base class for expressions that can be labeled (`LoopExpr`, `ForExpr`, `WhileExpr` or `BlockExpr`).
+   * INTERNAL: Do not reference the `Generated::LabelableExpr` class directly.
+   * Use the subclass `LabelableExpr`, where the following predicates are available.
+   */
+  class LabelableExpr extends Synth::TLabelableExpr, ExprImpl::Expr {
+    /**
+     * Gets the label of this labelable expression, if it exists.
+     */
+    Label getLabel() {
+      result =
+        Synth::convertLabelFromRaw(Synth::convertLabelableExprToRaw(this)
+              .(Raw::LabelableExpr)
+              .getLabel())
+    }
+
+    /**
+     * Holds if `getLabel()` exists.
+     */
+    final predicate hasLabel() { exists(this.getLabel()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/LetExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/LetExpr.qll
index b53dc1c8c67..45e0fa589da 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/LetExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/LetExpr.qll
@@ -48,19 +48,20 @@ module Generated {
     final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
 
     /**
-     * Gets the expression of this let expression, if it exists.
+     * Gets the scrutinee of this let expression, if it exists.
      */
-    Expr getExpr() {
-      result = Synth::convertExprFromRaw(Synth::convertLetExprToRaw(this).(Raw::LetExpr).getExpr())
+    Expr getScrutinee() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertLetExprToRaw(this).(Raw::LetExpr).getScrutinee())
     }
 
     /**
-     * Holds if `getExpr()` exists.
+     * Holds if `getScrutinee()` exists.
      */
-    final predicate hasExpr() { exists(this.getExpr()) }
+    final predicate hasScrutinee() { exists(this.getScrutinee()) }
 
     /**
-     * Gets the pat of this let expression, if it exists.
+     * Gets the pattern of this let expression, if it exists.
      */
     Pat getPat() {
       result = Synth::convertPatFromRaw(Synth::convertLetExprToRaw(this).(Raw::LetExpr).getPat())
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/LetStmt.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/LetStmt.qll
index 3555636dc32..c971a1548a5 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/LetStmt.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/LetStmt.qll
@@ -11,7 +11,7 @@ import codeql.rust.elements.Expr
 import codeql.rust.elements.LetElse
 import codeql.rust.elements.Pat
 import codeql.rust.elements.internal.StmtImpl::Impl as StmtImpl
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * INTERNAL: This module contains the fully generated definition of `LetStmt` and should not
@@ -81,7 +81,7 @@ module Generated {
     final predicate hasLetElse() { exists(this.getLetElse()) }
 
     /**
-     * Gets the pat of this let statement, if it exists.
+     * Gets the pattern of this let statement, if it exists.
      */
     Pat getPat() {
       result = Synth::convertPatFromRaw(Synth::convertLetStmtToRaw(this).(Raw::LetStmt).getPat())
@@ -93,15 +93,16 @@ module Generated {
     final predicate hasPat() { exists(this.getPat()) }
 
     /**
-     * Gets the ty of this let statement, if it exists.
+     * Gets the type representation of this let statement, if it exists.
      */
-    TypeRef getTy() {
-      result = Synth::convertTypeRefFromRaw(Synth::convertLetStmtToRaw(this).(Raw::LetStmt).getTy())
+    TypeRepr getTypeRepr() {
+      result =
+        Synth::convertTypeReprFromRaw(Synth::convertLetStmtToRaw(this).(Raw::LetStmt).getTypeRepr())
     }
 
     /**
-     * Holds if `getTy()` exists.
+     * Holds if `getTypeRepr()` exists.
      */
-    final predicate hasTy() { exists(this.getTy()) }
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/LiteralPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/LiteralPat.qll
index 84afc44e9e6..e3e6c7bd264 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/LiteralPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/LiteralPat.qll
@@ -29,7 +29,7 @@ module Generated {
     override string getAPrimaryQlClass() { result = "LiteralPat" }
 
     /**
-     * Gets the literal of this literal pat, if it exists.
+     * Gets the literal of this literal pattern, if it exists.
      */
     LiteralExpr getLiteral() {
       result =
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/LoopExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/LoopExpr.qll
index eb943bf746a..510c3dedb68 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/LoopExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/LoopExpr.qll
@@ -7,9 +7,7 @@
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.Attr
-import codeql.rust.elements.BlockExpr
-import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
-import codeql.rust.elements.Label
+import codeql.rust.elements.internal.LoopingExprImpl::Impl as LoopingExprImpl
 
 /**
  * INTERNAL: This module contains the fully generated definition of `LoopExpr` and should not
@@ -42,7 +40,7 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::LoopExpr` class directly.
    * Use the subclass `LoopExpr`, where the following predicates are available.
    */
-  class LoopExpr extends Synth::TLoopExpr, ExprImpl::Expr {
+  class LoopExpr extends Synth::TLoopExpr, LoopingExprImpl::LoopingExpr {
     override string getAPrimaryQlClass() { result = "LoopExpr" }
 
     /**
@@ -62,33 +60,5 @@ module Generated {
      * Gets the number of attrs of this loop expression.
      */
     final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
-
-    /**
-     * Gets the label of this loop expression, if it exists.
-     */
-    Label getLabel() {
-      result =
-        Synth::convertLabelFromRaw(Synth::convertLoopExprToRaw(this).(Raw::LoopExpr).getLabel())
-    }
-
-    /**
-     * Holds if `getLabel()` exists.
-     */
-    final predicate hasLabel() { exists(this.getLabel()) }
-
-    /**
-     * Gets the loop body of this loop expression, if it exists.
-     */
-    BlockExpr getLoopBody() {
-      result =
-        Synth::convertBlockExprFromRaw(Synth::convertLoopExprToRaw(this)
-              .(Raw::LoopExpr)
-              .getLoopBody())
-    }
-
-    /**
-     * Holds if `getLoopBody()` exists.
-     */
-    final predicate hasLoopBody() { exists(this.getLoopBody()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/LoopingExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/LoopingExpr.qll
new file mode 100644
index 00000000000..427ef05c2ab
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/LoopingExpr.qll
@@ -0,0 +1,38 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `LoopingExpr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.BlockExpr
+import codeql.rust.elements.internal.LabelableExprImpl::Impl as LabelableExprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `LoopingExpr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * The base class for expressions that loop (`LoopExpr`, `ForExpr` or `WhileExpr`).
+   * INTERNAL: Do not reference the `Generated::LoopingExpr` class directly.
+   * Use the subclass `LoopingExpr`, where the following predicates are available.
+   */
+  class LoopingExpr extends Synth::TLoopingExpr, LabelableExprImpl::LabelableExpr {
+    /**
+     * Gets the loop body of this looping expression, if it exists.
+     */
+    BlockExpr getLoopBody() {
+      result =
+        Synth::convertBlockExprFromRaw(Synth::convertLoopingExprToRaw(this)
+              .(Raw::LoopingExpr)
+              .getLoopBody())
+    }
+
+    /**
+     * Holds if `getLoopBody()` exists.
+     */
+    final predicate hasLoopBody() { exists(this.getLoopBody()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroPat.qll
index 79a261adb09..cddbc98a799 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroPat.qll
@@ -26,7 +26,7 @@ module Generated {
     override string getAPrimaryQlClass() { result = "MacroPat" }
 
     /**
-     * Gets the macro call of this macro pat, if it exists.
+     * Gets the macro call of this macro pattern, if it exists.
      */
     MacroCall getMacroCall() {
       result =
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroType.qll
deleted file mode 100644
index f2fd6ceb9eb..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroType.qll
+++ /dev/null
@@ -1,43 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `MacroType`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.MacroCall
-import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `MacroType` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A MacroType. For example:
-   * ```rust
-   * todo!()
-   * ```
-   * INTERNAL: Do not reference the `Generated::MacroType` class directly.
-   * Use the subclass `MacroType`, where the following predicates are available.
-   */
-  class MacroType extends Synth::TMacroType, TypeRefImpl::TypeRef {
-    override string getAPrimaryQlClass() { result = "MacroType" }
-
-    /**
-     * Gets the macro call of this macro type, if it exists.
-     */
-    MacroCall getMacroCall() {
-      result =
-        Synth::convertMacroCallFromRaw(Synth::convertMacroTypeToRaw(this)
-              .(Raw::MacroType)
-              .getMacroCall())
-    }
-
-    /**
-     * Holds if `getMacroCall()` exists.
-     */
-    final predicate hasMacroCall() { exists(this.getMacroCall()) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroTypeRepr.qll
new file mode 100644
index 00000000000..8664ef91110
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroTypeRepr.qll
@@ -0,0 +1,43 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `MacroTypeRepr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.MacroCall
+import codeql.rust.elements.internal.TypeReprImpl::Impl as TypeReprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `MacroTypeRepr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A MacroTypeRepr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::MacroTypeRepr` class directly.
+   * Use the subclass `MacroTypeRepr`, where the following predicates are available.
+   */
+  class MacroTypeRepr extends Synth::TMacroTypeRepr, TypeReprImpl::TypeRepr {
+    override string getAPrimaryQlClass() { result = "MacroTypeRepr" }
+
+    /**
+     * Gets the macro call of this macro type representation, if it exists.
+     */
+    MacroCall getMacroCall() {
+      result =
+        Synth::convertMacroCallFromRaw(Synth::convertMacroTypeReprToRaw(this)
+              .(Raw::MacroTypeRepr)
+              .getMacroCall())
+    }
+
+    /**
+     * Holds if `getMacroCall()` exists.
+     */
+    final predicate hasMacroCall() { exists(this.getMacroCall()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MatchArm.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MatchArm.qll
index ae078cdfad4..47782a2accb 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MatchArm.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MatchArm.qll
@@ -82,7 +82,7 @@ module Generated {
     final predicate hasGuard() { exists(this.getGuard()) }
 
     /**
-     * Gets the pat of this match arm, if it exists.
+     * Gets the pattern of this match arm, if it exists.
      */
     Pat getPat() {
       result = Synth::convertPatFromRaw(Synth::convertMatchArmToRaw(this).(Raw::MatchArm).getPat())
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MatchExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MatchExpr.qll
index 5b48d8e1854..8f49407e5f9 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MatchExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MatchExpr.qll
@@ -55,17 +55,17 @@ module Generated {
     final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
 
     /**
-     * Gets the expression of this match expression, if it exists.
+     * Gets the scrutinee (the expression being matched) of this match expression, if it exists.
      */
-    Expr getExpr() {
+    Expr getScrutinee() {
       result =
-        Synth::convertExprFromRaw(Synth::convertMatchExprToRaw(this).(Raw::MatchExpr).getExpr())
+        Synth::convertExprFromRaw(Synth::convertMatchExprToRaw(this).(Raw::MatchExpr).getScrutinee())
     }
 
     /**
-     * Holds if `getExpr()` exists.
+     * Holds if `getScrutinee()` exists.
      */
-    final predicate hasExpr() { exists(this.getExpr()) }
+    final predicate hasScrutinee() { exists(this.getScrutinee()) }
 
     /**
      * Gets the match arm list of this match expression, if it exists.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/NeverType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/NeverType.qll
deleted file mode 100644
index 8bc481b5f2a..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/NeverType.qll
+++ /dev/null
@@ -1,27 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `NeverType`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `NeverType` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A NeverType. For example:
-   * ```rust
-   * todo!()
-   * ```
-   * INTERNAL: Do not reference the `Generated::NeverType` class directly.
-   * Use the subclass `NeverType`, where the following predicates are available.
-   */
-  class NeverType extends Synth::TNeverType, TypeRefImpl::TypeRef {
-    override string getAPrimaryQlClass() { result = "NeverType" }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/NeverTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/NeverTypeRepr.qll
new file mode 100644
index 00000000000..54d2ecf8a04
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/NeverTypeRepr.qll
@@ -0,0 +1,27 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `NeverTypeRepr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.TypeReprImpl::Impl as TypeReprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `NeverTypeRepr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A NeverTypeRepr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::NeverTypeRepr` class directly.
+   * Use the subclass `NeverTypeRepr`, where the following predicates are available.
+   */
+  class NeverTypeRepr extends Synth::TNeverTypeRepr, TypeReprImpl::TypeRepr {
+    override string getAPrimaryQlClass() { result = "NeverTypeRepr" }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll
index 3c41c47dbdc..c66a1af823a 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/OffsetOfExpr.qll
@@ -9,7 +9,7 @@ private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.Attr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 import codeql.rust.elements.NameRef
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * INTERNAL: This module contains the fully generated definition of `OffsetOfExpr` and should not
@@ -68,18 +68,18 @@ module Generated {
     final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
 
     /**
-     * Gets the ty of this offset of expression, if it exists.
+     * Gets the type representation of this offset of expression, if it exists.
      */
-    TypeRef getTy() {
+    TypeRepr getTypeRepr() {
       result =
-        Synth::convertTypeRefFromRaw(Synth::convertOffsetOfExprToRaw(this)
+        Synth::convertTypeReprFromRaw(Synth::convertOffsetOfExprToRaw(this)
               .(Raw::OffsetOfExpr)
-              .getTy())
+              .getTypeRepr())
     }
 
     /**
-     * Holds if `getTy()` exists.
+     * Holds if `getTypeRepr()` exists.
      */
-    final predicate hasTy() { exists(this.getTy()) }
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/OrPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/OrPat.qll
index cfa9d9f7615..548ca32eb5f 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/OrPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/OrPat.qll
@@ -28,19 +28,19 @@ module Generated {
     override string getAPrimaryQlClass() { result = "OrPat" }
 
     /**
-     * Gets the `index`th pat of this or pat (0-based).
+     * Gets the `index`th pattern of this or pattern (0-based).
      */
     Pat getPat(int index) {
       result = Synth::convertPatFromRaw(Synth::convertOrPatToRaw(this).(Raw::OrPat).getPat(index))
     }
 
     /**
-     * Gets any of the pats of this or pat.
+     * Gets any of the patterns of this or pattern.
      */
     final Pat getAPat() { result = this.getPat(_) }
 
     /**
-     * Gets the number of pats of this or pat.
+     * Gets the number of patterns of this or pattern.
      */
     final int getNumberOfPats() { result = count(int i | exists(this.getPat(i))) }
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Param.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Param.qll
index 1ac10da37d3..8e6176de53c 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Param.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Param.qll
@@ -6,10 +6,8 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
-import codeql.rust.elements.Attr
+import codeql.rust.elements.internal.ParamBaseImpl::Impl as ParamBaseImpl
 import codeql.rust.elements.Pat
-import codeql.rust.elements.TypeRef
 
 /**
  * INTERNAL: This module contains the fully generated definition of `Param` and should not
@@ -17,35 +15,20 @@ import codeql.rust.elements.TypeRef
  */
 module Generated {
   /**
-   * A Param. For example:
+   * A parameter in a function or method. For example `x` in:
    * ```rust
-   * todo!()
+   * fn new(x: T) -> Foo<T> {
+   *   // ...
+   * }
    * ```
    * INTERNAL: Do not reference the `Generated::Param` class directly.
    * Use the subclass `Param`, where the following predicates are available.
    */
-  class Param extends Synth::TParam, AstNodeImpl::AstNode {
+  class Param extends Synth::TParam, ParamBaseImpl::ParamBase {
     override string getAPrimaryQlClass() { result = "Param" }
 
     /**
-     * Gets the `index`th attr of this parameter (0-based).
-     */
-    Attr getAttr(int index) {
-      result = Synth::convertAttrFromRaw(Synth::convertParamToRaw(this).(Raw::Param).getAttr(index))
-    }
-
-    /**
-     * Gets any of the attrs of this parameter.
-     */
-    final Attr getAnAttr() { result = this.getAttr(_) }
-
-    /**
-     * Gets the number of attrs of this parameter.
-     */
-    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
-
-    /**
-     * Gets the pat of this parameter, if it exists.
+     * Gets the pattern of this parameter, if it exists.
      */
     Pat getPat() {
       result = Synth::convertPatFromRaw(Synth::convertParamToRaw(this).(Raw::Param).getPat())
@@ -55,17 +38,5 @@ module Generated {
      * Holds if `getPat()` exists.
      */
     final predicate hasPat() { exists(this.getPat()) }
-
-    /**
-     * Gets the ty of this parameter, if it exists.
-     */
-    TypeRef getTy() {
-      result = Synth::convertTypeRefFromRaw(Synth::convertParamToRaw(this).(Raw::Param).getTy())
-    }
-
-    /**
-     * Holds if `getTy()` exists.
-     */
-    final predicate hasTy() { exists(this.getTy()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ParamBase.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ParamBase.qll
new file mode 100644
index 00000000000..3202b2149e4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ParamBase.qll
@@ -0,0 +1,57 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ParamBase`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.Attr
+import codeql.rust.elements.TypeRepr
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ParamBase` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A normal parameter, `Param`, or a self parameter `SelfParam`.
+   * INTERNAL: Do not reference the `Generated::ParamBase` class directly.
+   * Use the subclass `ParamBase`, where the following predicates are available.
+   */
+  class ParamBase extends Synth::TParamBase, AstNodeImpl::AstNode {
+    /**
+     * Gets the `index`th attr of this parameter base (0-based).
+     */
+    Attr getAttr(int index) {
+      result =
+        Synth::convertAttrFromRaw(Synth::convertParamBaseToRaw(this).(Raw::ParamBase).getAttr(index))
+    }
+
+    /**
+     * Gets any of the attrs of this parameter base.
+     */
+    final Attr getAnAttr() { result = this.getAttr(_) }
+
+    /**
+     * Gets the number of attrs of this parameter base.
+     */
+    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the type representation of this parameter base, if it exists.
+     */
+    TypeRepr getTypeRepr() {
+      result =
+        Synth::convertTypeReprFromRaw(Synth::convertParamBaseToRaw(this)
+              .(Raw::ParamBase)
+              .getTypeRepr())
+    }
+
+    /**
+     * Holds if `getTypeRepr()` exists.
+     */
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ParenPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ParenPat.qll
index 411362dde2b..7ba7741583c 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ParenPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ParenPat.qll
@@ -26,7 +26,7 @@ module Generated {
     override string getAPrimaryQlClass() { result = "ParenPat" }
 
     /**
-     * Gets the pat of this paren pat, if it exists.
+     * Gets the pattern of this paren pattern, if it exists.
      */
     Pat getPat() {
       result = Synth::convertPatFromRaw(Synth::convertParenPatToRaw(this).(Raw::ParenPat).getPat())
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ParenType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ParenType.qll
deleted file mode 100644
index abc547266e9..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ParenType.qll
+++ /dev/null
@@ -1,41 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `ParenType`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.TypeRef
-import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `ParenType` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A ParenType. For example:
-   * ```rust
-   * todo!()
-   * ```
-   * INTERNAL: Do not reference the `Generated::ParenType` class directly.
-   * Use the subclass `ParenType`, where the following predicates are available.
-   */
-  class ParenType extends Synth::TParenType, TypeRefImpl::TypeRef {
-    override string getAPrimaryQlClass() { result = "ParenType" }
-
-    /**
-     * Gets the ty of this paren type, if it exists.
-     */
-    TypeRef getTy() {
-      result =
-        Synth::convertTypeRefFromRaw(Synth::convertParenTypeToRaw(this).(Raw::ParenType).getTy())
-    }
-
-    /**
-     * Holds if `getTy()` exists.
-     */
-    final predicate hasTy() { exists(this.getTy()) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ParenTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ParenTypeRepr.qll
new file mode 100644
index 00000000000..1ebed2ef11a
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ParenTypeRepr.qll
@@ -0,0 +1,43 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `ParenTypeRepr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.TypeRepr
+import codeql.rust.elements.internal.TypeReprImpl::Impl as TypeReprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `ParenTypeRepr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A ParenTypeRepr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::ParenTypeRepr` class directly.
+   * Use the subclass `ParenTypeRepr`, where the following predicates are available.
+   */
+  class ParenTypeRepr extends Synth::TParenTypeRepr, TypeReprImpl::TypeRepr {
+    override string getAPrimaryQlClass() { result = "ParenTypeRepr" }
+
+    /**
+     * Gets the type representation of this paren type representation, if it exists.
+     */
+    TypeRepr getTypeRepr() {
+      result =
+        Synth::convertTypeReprFromRaw(Synth::convertParenTypeReprToRaw(this)
+              .(Raw::ParenTypeRepr)
+              .getTypeRepr())
+    }
+
+    /**
+     * Holds if `getTypeRepr()` exists.
+     */
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
index 470207683ae..c036d05cd03 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
@@ -4,12 +4,29 @@
  */
 
 import codeql.rust.elements
+import codeql.rust.elements.internal.ArrayExprInternal
+import codeql.rust.elements.internal.ExtractorStep
 
 private module Impl {
   private Element getImmediateChildOfElement(Element e, int index, string partialPredicateCall) {
     none()
   }
 
+  private Element getImmediateChildOfExtractorStep(
+    ExtractorStep e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bElement, int n |
+      b = 0 and
+      bElement = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfElement(e, i, _)) | i) and
+      n = bElement and
+      (
+        none()
+        or
+        result = getImmediateChildOfElement(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
   private Element getImmediateChildOfLocatable(Locatable e, int index, string partialPredicateCall) {
     exists(int b, int bElement, int n |
       b = 0 and
@@ -52,14 +69,17 @@ private module Impl {
   }
 
   private Element getImmediateChildOfFormat(Format e, int index, string partialPredicateCall) {
-    exists(int b, int bLocatable, int n |
+    exists(int b, int bLocatable, int n, int nArgument |
       b = 0 and
       bLocatable = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfLocatable(e, i, _)) | i) and
       n = bLocatable and
+      nArgument = n + 1 and
       (
         none()
         or
         result = getImmediateChildOfLocatable(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getArgument() and partialPredicateCall = "Argument()"
       )
     )
   }
@@ -67,14 +87,17 @@ private module Impl {
   private Element getImmediateChildOfFormatArgument(
     FormatArgument e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bLocatable, int n |
+    exists(int b, int bLocatable, int n, int nVariable |
       b = 0 and
       bLocatable = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfLocatable(e, i, _)) | i) and
       n = bLocatable and
+      nVariable = n + 1 and
       (
         none()
         or
         result = getImmediateChildOfLocatable(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getVariable() and partialPredicateCall = "Variable()"
       )
     )
   }
@@ -122,6 +145,21 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfAddressable(
+    Addressable e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n |
+      b = 0 and
+      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
+      n = bAstNode and
+      (
+        none()
+        or
+        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
   private Element getImmediateChildOfArgList(ArgList e, int index, string partialPredicateCall) {
     exists(int b, int bAstNode, int n, int nArg |
       b = 0 and
@@ -596,14 +634,13 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfParam(Param e, int index, string partialPredicateCall) {
-    exists(int b, int bAstNode, int n, int nAttr, int nPat, int nTy |
+  private Element getImmediateChildOfParamBase(ParamBase e, int index, string partialPredicateCall) {
+    exists(int b, int bAstNode, int n, int nAttr, int nTypeRepr |
       b = 0 and
       bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
       n = bAstNode and
       nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
-      nPat = nAttr + 1 and
-      nTy = nPat + 1 and
+      nTypeRepr = nAttr + 1 and
       (
         none()
         or
@@ -612,9 +649,7 @@ private module Impl {
         result = e.getAttr(index - n) and
         partialPredicateCall = "Attr(" + (index - n).toString() + ")"
         or
-        index = nAttr and result = e.getPat() and partialPredicateCall = "Pat()"
-        or
-        index = nPat and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = nAttr and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
       )
     )
   }
@@ -657,7 +692,7 @@ private module Impl {
   ) {
     exists(
       int b, int bAstNode, int n, int nGenericArgList, int nNameRef, int nParamList, int nPathType,
-      int nRetType, int nReturnTypeSyntax, int nTy
+      int nRetType, int nReturnTypeSyntax, int nTypeRepr
     |
       b = 0 and
       bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
@@ -668,7 +703,7 @@ private module Impl {
       nPathType = nParamList + 1 and
       nRetType = nPathType + 1 and
       nReturnTypeSyntax = nRetType + 1 and
-      nTy = nReturnTypeSyntax + 1 and
+      nTypeRepr = nReturnTypeSyntax + 1 and
       (
         none()
         or
@@ -688,7 +723,9 @@ private module Impl {
         result = e.getReturnTypeSyntax() and
         partialPredicateCall = "ReturnTypeSyntax()"
         or
-        index = nReturnTypeSyntax and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = nReturnTypeSyntax and
+        result = e.getTypeRepr() and
+        partialPredicateCall = "TypeRepr()"
       )
     )
   }
@@ -747,14 +784,14 @@ private module Impl {
   private Element getImmediateChildOfRecordField(
     RecordField e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bAstNode, int n, int nAttr, int nName, int nTy, int nVisibility |
+    exists(int b, int bAstNode, int n, int nAttr, int nName, int nTypeRepr, int nVisibility |
       b = 0 and
       bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
       n = bAstNode and
       nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
       nName = nAttr + 1 and
-      nTy = nName + 1 and
-      nVisibility = nTy + 1 and
+      nTypeRepr = nName + 1 and
+      nVisibility = nTypeRepr + 1 and
       (
         none()
         or
@@ -765,9 +802,9 @@ private module Impl {
         or
         index = nAttr and result = e.getName() and partialPredicateCall = "Name()"
         or
-        index = nName and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = nName and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
         or
-        index = nTy and result = e.getVisibility() and partialPredicateCall = "Visibility()"
+        index = nTypeRepr and result = e.getVisibility() and partialPredicateCall = "Visibility()"
       )
     )
   }
@@ -848,18 +885,20 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfRetType(RetType e, int index, string partialPredicateCall) {
-    exists(int b, int bAstNode, int n, int nTy |
+  private Element getImmediateChildOfRetTypeRepr(
+    RetTypeRepr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bAstNode, int n, int nTypeRepr |
       b = 0 and
       bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
       n = bAstNode and
-      nTy = n + 1 and
+      nTypeRepr = n + 1 and
       (
         none()
         or
         result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = n and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
       )
     )
   }
@@ -879,32 +918,6 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfSelfParam(SelfParam e, int index, string partialPredicateCall) {
-    exists(int b, int bAstNode, int n, int nAttr, int nLifetime, int nName, int nTy |
-      b = 0 and
-      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
-      n = bAstNode and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
-      nLifetime = nAttr + 1 and
-      nName = nLifetime + 1 and
-      nTy = nName + 1 and
-      (
-        none()
-        or
-        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
-        or
-        result = e.getAttr(index - n) and
-        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
-        or
-        index = nAttr and result = e.getLifetime() and partialPredicateCall = "Lifetime()"
-        or
-        index = nLifetime and result = e.getName() and partialPredicateCall = "Name()"
-        or
-        index = nName and result = e.getTy() and partialPredicateCall = "Ty()"
-      )
-    )
-  }
-
   private Element getImmediateChildOfSourceFile(SourceFile e, int index, string partialPredicateCall) {
     exists(int b, int bAstNode, int n, int nAttr, int nItem |
       b = 0 and
@@ -990,13 +1003,13 @@ private module Impl {
   }
 
   private Element getImmediateChildOfTupleField(TupleField e, int index, string partialPredicateCall) {
-    exists(int b, int bAstNode, int n, int nAttr, int nTy, int nVisibility |
+    exists(int b, int bAstNode, int n, int nAttr, int nTypeRepr, int nVisibility |
       b = 0 and
       bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
       n = bAstNode and
       nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
-      nTy = nAttr + 1 and
-      nVisibility = nTy + 1 and
+      nTypeRepr = nAttr + 1 and
+      nVisibility = nTypeRepr + 1 and
       (
         none()
         or
@@ -1005,21 +1018,21 @@ private module Impl {
         result = e.getAttr(index - n) and
         partialPredicateCall = "Attr(" + (index - n).toString() + ")"
         or
-        index = nAttr and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = nAttr and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
         or
-        index = nTy and result = e.getVisibility() and partialPredicateCall = "Visibility()"
+        index = nTypeRepr and result = e.getVisibility() and partialPredicateCall = "Visibility()"
       )
     )
   }
 
   private Element getImmediateChildOfTypeBound(TypeBound e, int index, string partialPredicateCall) {
-    exists(int b, int bAstNode, int n, int nGenericParamList, int nLifetime, int nTy |
+    exists(int b, int bAstNode, int n, int nGenericParamList, int nLifetime, int nTypeRepr |
       b = 0 and
       bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
       n = bAstNode and
       nGenericParamList = n + 1 and
       nLifetime = nGenericParamList + 1 and
-      nTy = nLifetime + 1 and
+      nTypeRepr = nLifetime + 1 and
       (
         none()
         or
@@ -1033,7 +1046,7 @@ private module Impl {
         result = e.getLifetime() and
         partialPredicateCall = "Lifetime()"
         or
-        index = nLifetime and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = nLifetime and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
       )
     )
   }
@@ -1057,7 +1070,7 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfTypeRef(TypeRef e, int index, string partialPredicateCall) {
+  private Element getImmediateChildOfTypeRepr(TypeRepr e, int index, string partialPredicateCall) {
     exists(int b, int bAstNode, int n |
       b = 0 and
       bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
@@ -1111,37 +1124,6 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfVariant(Variant e, int index, string partialPredicateCall) {
-    exists(
-      int b, int bAstNode, int n, int nAttr, int nExpr, int nFieldList, int nName, int nVisibility
-    |
-      b = 0 and
-      bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
-      n = bAstNode and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
-      nExpr = nAttr + 1 and
-      nFieldList = nExpr + 1 and
-      nName = nFieldList + 1 and
-      nVisibility = nName + 1 and
-      (
-        none()
-        or
-        result = getImmediateChildOfAstNode(e, index - b, partialPredicateCall)
-        or
-        result = e.getAttr(index - n) and
-        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
-        or
-        index = nAttr and result = e.getExpr() and partialPredicateCall = "Expr()"
-        or
-        index = nExpr and result = e.getFieldList() and partialPredicateCall = "FieldList()"
-        or
-        index = nFieldList and result = e.getName() and partialPredicateCall = "Name()"
-        or
-        index = nName and result = e.getVisibility() and partialPredicateCall = "Visibility()"
-      )
-    )
-  }
-
   private Element getImmediateChildOfVariantList(
     VariantList e, int index, string partialPredicateCall
   ) {
@@ -1198,15 +1180,16 @@ private module Impl {
 
   private Element getImmediateChildOfWherePred(WherePred e, int index, string partialPredicateCall) {
     exists(
-      int b, int bAstNode, int n, int nGenericParamList, int nLifetime, int nTy, int nTypeBoundList
+      int b, int bAstNode, int n, int nGenericParamList, int nLifetime, int nTypeRepr,
+      int nTypeBoundList
     |
       b = 0 and
       bAstNode = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAstNode(e, i, _)) | i) and
       n = bAstNode and
       nGenericParamList = n + 1 and
       nLifetime = nGenericParamList + 1 and
-      nTy = nLifetime + 1 and
-      nTypeBoundList = nTy + 1 and
+      nTypeRepr = nLifetime + 1 and
+      nTypeBoundList = nTypeRepr + 1 and
       (
         none()
         or
@@ -1220,14 +1203,39 @@ private module Impl {
         result = e.getLifetime() and
         partialPredicateCall = "Lifetime()"
         or
-        index = nLifetime and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = nLifetime and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
         or
-        index = nTy and result = e.getTypeBoundList() and partialPredicateCall = "TypeBoundList()"
+        index = nTypeRepr and
+        result = e.getTypeBoundList() and
+        partialPredicateCall = "TypeBoundList()"
       )
     )
   }
 
   private Element getImmediateChildOfArrayExpr(ArrayExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bExpr, int n, int nExpr, int nAttr |
+      b = 0 and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      n = bExpr and
+      nExpr = n + 1 + max(int i | i = -1 or exists(e.getExpr(i)) | i) and
+      nAttr = nExpr + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      (
+        none()
+        or
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+        or
+        result = e.getExpr(index - n) and
+        partialPredicateCall = "Expr(" + (index - n).toString() + ")"
+        or
+        result = e.getAttr(index - nExpr) and
+        partialPredicateCall = "Attr(" + (index - nExpr).toString() + ")"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfArrayExprInternal(
+    ArrayExprInternal e, int index, string partialPredicateCall
+  ) {
     exists(int b, int bExpr, int n, int nAttr, int nExpr |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
@@ -1248,21 +1256,25 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfArrayType(ArrayType e, int index, string partialPredicateCall) {
-    exists(int b, int bTypeRef, int n, int nConstArg, int nTy |
+  private Element getImmediateChildOfArrayTypeRepr(
+    ArrayTypeRepr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bTypeRepr, int n, int nConstArg, int nElementTypeRepr |
       b = 0 and
-      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
-      n = bTypeRef and
+      bTypeRepr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRepr(e, i, _)) | i) and
+      n = bTypeRepr and
       nConstArg = n + 1 and
-      nTy = nConstArg + 1 and
+      nElementTypeRepr = nConstArg + 1 and
       (
         none()
         or
-        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfTypeRepr(e, index - b, partialPredicateCall)
         or
         index = n and result = e.getConstArg() and partialPredicateCall = "ConstArg()"
         or
-        index = nConstArg and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = nConstArg and
+        result = e.getElementTypeRepr() and
+        partialPredicateCall = "ElementTypeRepr()"
       )
     )
   }
@@ -1292,7 +1304,7 @@ private module Impl {
   ) {
     exists(
       int b, int bGenericArg, int n, int nConstArg, int nGenericArgList, int nNameRef,
-      int nParamList, int nRetType, int nReturnTypeSyntax, int nTy, int nTypeBoundList
+      int nParamList, int nRetType, int nReturnTypeSyntax, int nTypeRepr, int nTypeBoundList
     |
       b = 0 and
       bGenericArg =
@@ -1304,8 +1316,8 @@ private module Impl {
       nParamList = nNameRef + 1 and
       nRetType = nParamList + 1 and
       nReturnTypeSyntax = nRetType + 1 and
-      nTy = nReturnTypeSyntax + 1 and
-      nTypeBoundList = nTy + 1 and
+      nTypeRepr = nReturnTypeSyntax + 1 and
+      nTypeBoundList = nTypeRepr + 1 and
       (
         none()
         or
@@ -1327,9 +1339,13 @@ private module Impl {
         result = e.getReturnTypeSyntax() and
         partialPredicateCall = "ReturnTypeSyntax()"
         or
-        index = nReturnTypeSyntax and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = nReturnTypeSyntax and
+        result = e.getTypeRepr() and
+        partialPredicateCall = "TypeRepr()"
         or
-        index = nTy and result = e.getTypeBoundList() and partialPredicateCall = "TypeBoundList()"
+        index = nTypeRepr and
+        result = e.getTypeBoundList() and
+        partialPredicateCall = "TypeBoundList()"
       )
     )
   }
@@ -1397,29 +1413,6 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfBlockExpr(BlockExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nAttr, int nLabel, int nStmtList |
-      b = 0 and
-      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
-      nLabel = nAttr + 1 and
-      nStmtList = nLabel + 1 and
-      (
-        none()
-        or
-        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        result = e.getAttr(index - n) and
-        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
-        or
-        index = nAttr and result = e.getLabel() and partialPredicateCall = "Label()"
-        or
-        index = nLabel and result = e.getStmtList() and partialPredicateCall = "StmtList()"
-      )
-    )
-  }
-
   private Element getImmediateChildOfBoxPat(BoxPat e, int index, string partialPredicateCall) {
     exists(int b, int bPat, int n, int nPat |
       b = 0 and
@@ -1482,13 +1475,13 @@ private module Impl {
   }
 
   private Element getImmediateChildOfCastExpr(CastExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nAttr, int nExpr, int nTy |
+    exists(int b, int bExpr, int n, int nAttr, int nExpr, int nTypeRepr |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
       nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
       nExpr = nAttr + 1 and
-      nTy = nExpr + 1 and
+      nTypeRepr = nExpr + 1 and
       (
         none()
         or
@@ -1499,7 +1492,7 @@ private module Impl {
         or
         index = nAttr and result = e.getExpr() and partialPredicateCall = "Expr()"
         or
-        index = nExpr and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = nExpr and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
       )
     )
   }
@@ -1581,7 +1574,7 @@ private module Impl {
   }
 
   private Element getImmediateChildOfConstParam(ConstParam e, int index, string partialPredicateCall) {
-    exists(int b, int bGenericParam, int n, int nAttr, int nDefaultVal, int nName, int nTy |
+    exists(int b, int bGenericParam, int n, int nAttr, int nDefaultVal, int nName, int nTypeRepr |
       b = 0 and
       bGenericParam =
         b + 1 + max(int i | i = -1 or exists(getImmediateChildOfGenericParam(e, i, _)) | i) and
@@ -1589,7 +1582,7 @@ private module Impl {
       nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
       nDefaultVal = nAttr + 1 and
       nName = nDefaultVal + 1 and
-      nTy = nName + 1 and
+      nTypeRepr = nName + 1 and
       (
         none()
         or
@@ -1602,7 +1595,7 @@ private module Impl {
         or
         index = nDefaultVal and result = e.getName() and partialPredicateCall = "Name()"
         or
-        index = nName and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = nName and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
       )
     )
   }
@@ -1629,18 +1622,18 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfDynTraitType(
-    DynTraitType e, int index, string partialPredicateCall
+  private Element getImmediateChildOfDynTraitTypeRepr(
+    DynTraitTypeRepr e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bTypeRef, int n, int nTypeBoundList |
+    exists(int b, int bTypeRepr, int n, int nTypeBoundList |
       b = 0 and
-      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
-      n = bTypeRef and
+      bTypeRepr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRepr(e, i, _)) | i) and
+      n = bTypeRepr and
       nTypeBoundList = n + 1 and
       (
         none()
         or
-        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfTypeRepr(e, index - b, partialPredicateCall)
         or
         index = n and result = e.getTypeBoundList() and partialPredicateCall = "TypeBoundList()"
       )
@@ -1686,18 +1679,20 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfFnPtrType(FnPtrType e, int index, string partialPredicateCall) {
-    exists(int b, int bTypeRef, int n, int nAbi, int nParamList, int nRetType |
+  private Element getImmediateChildOfFnPtrTypeRepr(
+    FnPtrTypeRepr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bTypeRepr, int n, int nAbi, int nParamList, int nRetType |
       b = 0 and
-      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
-      n = bTypeRef and
+      bTypeRepr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRepr(e, i, _)) | i) and
+      n = bTypeRepr and
       nAbi = n + 1 and
       nParamList = nAbi + 1 and
       nRetType = nParamList + 1 and
       (
         none()
         or
-        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfTypeRepr(e, index - b, partialPredicateCall)
         or
         index = n and result = e.getAbi() and partialPredicateCall = "Abi()"
         or
@@ -1708,52 +1703,27 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfForExpr(ForExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nAttr, int nIterable, int nLabel, int nLoopBody, int nPat |
+  private Element getImmediateChildOfForTypeRepr(
+    ForTypeRepr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bTypeRepr, int n, int nGenericParamList, int nTypeRepr |
       b = 0 and
-      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
-      nIterable = nAttr + 1 and
-      nLabel = nIterable + 1 and
-      nLoopBody = nLabel + 1 and
-      nPat = nLoopBody + 1 and
-      (
-        none()
-        or
-        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        result = e.getAttr(index - n) and
-        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
-        or
-        index = nAttr and result = e.getIterable() and partialPredicateCall = "Iterable()"
-        or
-        index = nIterable and result = e.getLabel() and partialPredicateCall = "Label()"
-        or
-        index = nLabel and result = e.getLoopBody() and partialPredicateCall = "LoopBody()"
-        or
-        index = nLoopBody and result = e.getPat() and partialPredicateCall = "Pat()"
-      )
-    )
-  }
-
-  private Element getImmediateChildOfForType(ForType e, int index, string partialPredicateCall) {
-    exists(int b, int bTypeRef, int n, int nGenericParamList, int nTy |
-      b = 0 and
-      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
-      n = bTypeRef and
+      bTypeRepr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRepr(e, i, _)) | i) and
+      n = bTypeRepr and
       nGenericParamList = n + 1 and
-      nTy = nGenericParamList + 1 and
+      nTypeRepr = nGenericParamList + 1 and
       (
         none()
         or
-        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfTypeRepr(e, index - b, partialPredicateCall)
         or
         index = n and
         result = e.getGenericParamList() and
         partialPredicateCall = "GenericParamList()"
         or
-        index = nGenericParamList and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = nGenericParamList and
+        result = e.getTypeRepr() and
+        partialPredicateCall = "TypeRepr()"
       )
     )
   }
@@ -1761,13 +1731,14 @@ private module Impl {
   private Element getImmediateChildOfFormatArgsExpr(
     FormatArgsExpr e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bExpr, int n, int nArg, int nAttr, int nTemplate |
+    exists(int b, int bExpr, int n, int nArg, int nAttr, int nTemplate, int nFormat |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
       nArg = n + 1 + max(int i | i = -1 or exists(e.getArg(i)) | i) and
       nAttr = nArg + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
       nTemplate = nAttr + 1 and
+      nFormat = nTemplate + 1 + max(int i | i = -1 or exists(e.getFormat(i)) | i) and
       (
         none()
         or
@@ -1780,6 +1751,9 @@ private module Impl {
         partialPredicateCall = "Attr(" + (index - nArg).toString() + ")"
         or
         index = nAttr and result = e.getTemplate() and partialPredicateCall = "Template()"
+        or
+        result = e.getFormat(index - nTemplate) and
+        partialPredicateCall = "Format(" + (index - nTemplate).toString() + ")"
       )
     )
   }
@@ -1833,18 +1807,18 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfImplTraitType(
-    ImplTraitType e, int index, string partialPredicateCall
+  private Element getImmediateChildOfImplTraitTypeRepr(
+    ImplTraitTypeRepr e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bTypeRef, int n, int nTypeBoundList |
+    exists(int b, int bTypeRepr, int n, int nTypeBoundList |
       b = 0 and
-      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
-      n = bTypeRef and
+      bTypeRepr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRepr(e, i, _)) | i) and
+      n = bTypeRepr and
       nTypeBoundList = n + 1 and
       (
         none()
         or
-        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfTypeRepr(e, index - b, partialPredicateCall)
         or
         index = n and result = e.getTypeBoundList() and partialPredicateCall = "TypeBoundList()"
       )
@@ -1874,40 +1848,64 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfInferType(InferType e, int index, string partialPredicateCall) {
-    exists(int b, int bTypeRef, int n |
+  private Element getImmediateChildOfInferTypeRepr(
+    InferTypeRepr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bTypeRepr, int n |
       b = 0 and
-      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
-      n = bTypeRef and
+      bTypeRepr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRepr(e, i, _)) | i) and
+      n = bTypeRepr and
       (
         none()
         or
-        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfTypeRepr(e, index - b, partialPredicateCall)
       )
     )
   }
 
   private Element getImmediateChildOfItem(Item e, int index, string partialPredicateCall) {
-    exists(int b, int bStmt, int n |
+    exists(int b, int bStmt, int bAddressable, int n |
       b = 0 and
       bStmt = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfStmt(e, i, _)) | i) and
-      n = bStmt and
+      bAddressable =
+        bStmt + 1 + max(int i | i = -1 or exists(getImmediateChildOfAddressable(e, i, _)) | i) and
+      n = bAddressable and
       (
         none()
         or
         result = getImmediateChildOfStmt(e, index - b, partialPredicateCall)
+        or
+        result = getImmediateChildOfAddressable(e, index - bStmt, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfLabelableExpr(
+    LabelableExpr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bExpr, int n, int nLabel |
+      b = 0 and
+      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
+      n = bExpr and
+      nLabel = n + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getLabel() and partialPredicateCall = "Label()"
       )
     )
   }
 
   private Element getImmediateChildOfLetExpr(LetExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nAttr, int nExpr, int nPat |
+    exists(int b, int bExpr, int n, int nAttr, int nScrutinee, int nPat |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
       nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
-      nExpr = nAttr + 1 and
-      nPat = nExpr + 1 and
+      nScrutinee = nAttr + 1 and
+      nPat = nScrutinee + 1 and
       (
         none()
         or
@@ -1916,15 +1914,17 @@ private module Impl {
         result = e.getAttr(index - n) and
         partialPredicateCall = "Attr(" + (index - n).toString() + ")"
         or
-        index = nAttr and result = e.getExpr() and partialPredicateCall = "Expr()"
+        index = nAttr and result = e.getScrutinee() and partialPredicateCall = "Scrutinee()"
         or
-        index = nExpr and result = e.getPat() and partialPredicateCall = "Pat()"
+        index = nScrutinee and result = e.getPat() and partialPredicateCall = "Pat()"
       )
     )
   }
 
   private Element getImmediateChildOfLetStmt(LetStmt e, int index, string partialPredicateCall) {
-    exists(int b, int bStmt, int n, int nAttr, int nInitializer, int nLetElse, int nPat, int nTy |
+    exists(
+      int b, int bStmt, int n, int nAttr, int nInitializer, int nLetElse, int nPat, int nTypeRepr
+    |
       b = 0 and
       bStmt = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfStmt(e, i, _)) | i) and
       n = bStmt and
@@ -1932,7 +1932,7 @@ private module Impl {
       nInitializer = nAttr + 1 and
       nLetElse = nInitializer + 1 and
       nPat = nLetElse + 1 and
-      nTy = nPat + 1 and
+      nTypeRepr = nPat + 1 and
       (
         none()
         or
@@ -1947,7 +1947,7 @@ private module Impl {
         or
         index = nLetElse and result = e.getPat() and partialPredicateCall = "Pat()"
         or
-        index = nPat and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = nPat and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
       )
     )
   }
@@ -2034,29 +2034,6 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfLoopExpr(LoopExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nAttr, int nLabel, int nLoopBody |
-      b = 0 and
-      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
-      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
-      nLabel = nAttr + 1 and
-      nLoopBody = nLabel + 1 and
-      (
-        none()
-        or
-        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
-        or
-        result = e.getAttr(index - n) and
-        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
-        or
-        index = nAttr and result = e.getLabel() and partialPredicateCall = "Label()"
-        or
-        index = nLabel and result = e.getLoopBody() and partialPredicateCall = "LoopBody()"
-      )
-    )
-  }
-
   private Element getImmediateChildOfMacroExpr(MacroExpr e, int index, string partialPredicateCall) {
     exists(int b, int bExpr, int n, int nMacroCall |
       b = 0 and
@@ -2089,16 +2066,18 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfMacroType(MacroType e, int index, string partialPredicateCall) {
-    exists(int b, int bTypeRef, int n, int nMacroCall |
+  private Element getImmediateChildOfMacroTypeRepr(
+    MacroTypeRepr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bTypeRepr, int n, int nMacroCall |
       b = 0 and
-      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
-      n = bTypeRef and
+      bTypeRepr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRepr(e, i, _)) | i) and
+      n = bTypeRepr and
       nMacroCall = n + 1 and
       (
         none()
         or
-        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfTypeRepr(e, index - b, partialPredicateCall)
         or
         index = n and result = e.getMacroCall() and partialPredicateCall = "MacroCall()"
       )
@@ -2106,13 +2085,13 @@ private module Impl {
   }
 
   private Element getImmediateChildOfMatchExpr(MatchExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nAttr, int nExpr, int nMatchArmList |
+    exists(int b, int bExpr, int n, int nAttr, int nScrutinee, int nMatchArmList |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
       nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
-      nExpr = nAttr + 1 and
-      nMatchArmList = nExpr + 1 and
+      nScrutinee = nAttr + 1 and
+      nMatchArmList = nScrutinee + 1 and
       (
         none()
         or
@@ -2121,22 +2100,26 @@ private module Impl {
         result = e.getAttr(index - n) and
         partialPredicateCall = "Attr(" + (index - n).toString() + ")"
         or
-        index = nAttr and result = e.getExpr() and partialPredicateCall = "Expr()"
+        index = nAttr and result = e.getScrutinee() and partialPredicateCall = "Scrutinee()"
         or
-        index = nExpr and result = e.getMatchArmList() and partialPredicateCall = "MatchArmList()"
+        index = nScrutinee and
+        result = e.getMatchArmList() and
+        partialPredicateCall = "MatchArmList()"
       )
     )
   }
 
-  private Element getImmediateChildOfNeverType(NeverType e, int index, string partialPredicateCall) {
-    exists(int b, int bTypeRef, int n |
+  private Element getImmediateChildOfNeverTypeRepr(
+    NeverTypeRepr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bTypeRepr, int n |
       b = 0 and
-      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
-      n = bTypeRef and
+      bTypeRepr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRepr(e, i, _)) | i) and
+      n = bTypeRepr and
       (
         none()
         or
-        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfTypeRepr(e, index - b, partialPredicateCall)
       )
     )
   }
@@ -2144,13 +2127,13 @@ private module Impl {
   private Element getImmediateChildOfOffsetOfExpr(
     OffsetOfExpr e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bExpr, int n, int nAttr, int nField, int nTy |
+    exists(int b, int bExpr, int n, int nAttr, int nField, int nTypeRepr |
       b = 0 and
       bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
       n = bExpr and
       nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
       nField = nAttr + 1 + max(int i | i = -1 or exists(e.getField(i)) | i) and
-      nTy = nField + 1 and
+      nTypeRepr = nField + 1 and
       (
         none()
         or
@@ -2162,7 +2145,7 @@ private module Impl {
         result = e.getField(index - nAttr) and
         partialPredicateCall = "Field(" + (index - nAttr).toString() + ")"
         or
-        index = nField and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = nField and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
       )
     )
   }
@@ -2184,6 +2167,22 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfParam(Param e, int index, string partialPredicateCall) {
+    exists(int b, int bParamBase, int n, int nPat |
+      b = 0 and
+      bParamBase = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfParamBase(e, i, _)) | i) and
+      n = bParamBase and
+      nPat = n + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfParamBase(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getPat() and partialPredicateCall = "Pat()"
+      )
+    )
+  }
+
   private Element getImmediateChildOfParenExpr(ParenExpr e, int index, string partialPredicateCall) {
     exists(int b, int bExpr, int n, int nAttr, int nExpr |
       b = 0 and
@@ -2220,18 +2219,20 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfParenType(ParenType e, int index, string partialPredicateCall) {
-    exists(int b, int bTypeRef, int n, int nTy |
+  private Element getImmediateChildOfParenTypeRepr(
+    ParenTypeRepr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bTypeRepr, int n, int nTypeRepr |
       b = 0 and
-      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
-      n = bTypeRef and
-      nTy = n + 1 and
+      bTypeRepr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRepr(e, i, _)) | i) and
+      n = bTypeRepr and
+      nTypeRepr = n + 1 and
       (
         none()
         or
-        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfTypeRepr(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = n and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
       )
     )
   }
@@ -2287,16 +2288,18 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfPathType(PathType e, int index, string partialPredicateCall) {
-    exists(int b, int bTypeRef, int n, int nPath |
+  private Element getImmediateChildOfPathTypeRepr(
+    PathTypeRepr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bTypeRepr, int n, int nPath |
       b = 0 and
-      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
-      n = bTypeRef and
+      bTypeRepr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRepr(e, i, _)) | i) and
+      n = bTypeRepr and
       nPath = n + 1 and
       (
         none()
         or
-        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfTypeRepr(e, index - b, partialPredicateCall)
         or
         index = n and result = e.getPath() and partialPredicateCall = "Path()"
       )
@@ -2323,18 +2326,20 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfPtrType(PtrType e, int index, string partialPredicateCall) {
-    exists(int b, int bTypeRef, int n, int nTy |
+  private Element getImmediateChildOfPtrTypeRepr(
+    PtrTypeRepr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bTypeRepr, int n, int nTypeRepr |
       b = 0 and
-      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
-      n = bTypeRef and
-      nTy = n + 1 and
+      bTypeRepr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRepr(e, i, _)) | i) and
+      n = bTypeRepr and
+      nTypeRepr = n + 1 and
       (
         none()
         or
-        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfTypeRepr(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = n and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
       )
     )
   }
@@ -2478,21 +2483,23 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfRefType(RefType e, int index, string partialPredicateCall) {
-    exists(int b, int bTypeRef, int n, int nLifetime, int nTy |
+  private Element getImmediateChildOfRefTypeRepr(
+    RefTypeRepr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bTypeRepr, int n, int nLifetime, int nTypeRepr |
       b = 0 and
-      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
-      n = bTypeRef and
+      bTypeRepr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRepr(e, i, _)) | i) and
+      n = bTypeRepr and
       nLifetime = n + 1 and
-      nTy = nLifetime + 1 and
+      nTypeRepr = nLifetime + 1 and
       (
         none()
         or
-        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfTypeRepr(e, index - b, partialPredicateCall)
         or
         index = n and result = e.getLifetime() and partialPredicateCall = "Lifetime()"
         or
-        index = nLifetime and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = nLifetime and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
       )
     )
   }
@@ -2534,6 +2541,25 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfSelfParam(SelfParam e, int index, string partialPredicateCall) {
+    exists(int b, int bParamBase, int n, int nLifetime, int nName |
+      b = 0 and
+      bParamBase = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfParamBase(e, i, _)) | i) and
+      n = bParamBase and
+      nLifetime = n + 1 and
+      nName = nLifetime + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfParamBase(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getLifetime() and partialPredicateCall = "Lifetime()"
+        or
+        index = nLifetime and result = e.getName() and partialPredicateCall = "Name()"
+      )
+    )
+  }
+
   private Element getImmediateChildOfSlicePat(SlicePat e, int index, string partialPredicateCall) {
     exists(int b, int bPat, int n, int nPat |
       b = 0 and
@@ -2551,18 +2577,20 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfSliceType(SliceType e, int index, string partialPredicateCall) {
-    exists(int b, int bTypeRef, int n, int nTy |
+  private Element getImmediateChildOfSliceTypeRepr(
+    SliceTypeRepr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bTypeRepr, int n, int nTypeRepr |
       b = 0 and
-      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
-      n = bTypeRef and
-      nTy = n + 1 and
+      bTypeRepr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRepr(e, i, _)) | i) and
+      n = bTypeRepr and
+      nTypeRepr = n + 1 and
       (
         none()
         or
-        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfTypeRepr(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = n and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
       )
     )
   }
@@ -2666,16 +2694,18 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfTupleType(TupleType e, int index, string partialPredicateCall) {
-    exists(int b, int bTypeRef, int n, int nField |
+  private Element getImmediateChildOfTupleTypeRepr(
+    TupleTypeRepr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bTypeRepr, int n, int nField |
       b = 0 and
-      bTypeRef = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRef(e, i, _)) | i) and
-      n = bTypeRef and
+      bTypeRepr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfTypeRepr(e, i, _)) | i) and
+      n = bTypeRepr and
       nField = n + 1 + max(int i | i = -1 or exists(e.getField(i)) | i) and
       (
         none()
         or
-        result = getImmediateChildOfTypeRef(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfTypeRepr(e, index - b, partialPredicateCall)
         or
         result = e.getField(index - n) and
         partialPredicateCall = "Field(" + (index - n).toString() + ")"
@@ -2684,18 +2714,18 @@ private module Impl {
   }
 
   private Element getImmediateChildOfTypeArg(TypeArg e, int index, string partialPredicateCall) {
-    exists(int b, int bGenericArg, int n, int nTy |
+    exists(int b, int bGenericArg, int n, int nTypeRepr |
       b = 0 and
       bGenericArg =
         b + 1 + max(int i | i = -1 or exists(getImmediateChildOfGenericArg(e, i, _)) | i) and
       n = bGenericArg and
-      nTy = n + 1 and
+      nTypeRepr = n + 1 and
       (
         none()
         or
         result = getImmediateChildOfGenericArg(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = n and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
       )
     )
   }
@@ -2748,28 +2778,35 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfWhileExpr(WhileExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bExpr, int n, int nAttr, int nCondition, int nLabel, int nLoopBody |
+  private Element getImmediateChildOfVariant(Variant e, int index, string partialPredicateCall) {
+    exists(
+      int b, int bAddressable, int n, int nAttr, int nExpr, int nFieldList, int nName,
+      int nVisibility
+    |
       b = 0 and
-      bExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfExpr(e, i, _)) | i) and
-      n = bExpr and
+      bAddressable =
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAddressable(e, i, _)) | i) and
+      n = bAddressable and
       nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
-      nCondition = nAttr + 1 and
-      nLabel = nCondition + 1 and
-      nLoopBody = nLabel + 1 and
+      nExpr = nAttr + 1 and
+      nFieldList = nExpr + 1 and
+      nName = nFieldList + 1 and
+      nVisibility = nName + 1 and
       (
         none()
         or
-        result = getImmediateChildOfExpr(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfAddressable(e, index - b, partialPredicateCall)
         or
         result = e.getAttr(index - n) and
         partialPredicateCall = "Attr(" + (index - n).toString() + ")"
         or
-        index = nAttr and result = e.getCondition() and partialPredicateCall = "Condition()"
+        index = nAttr and result = e.getExpr() and partialPredicateCall = "Expr()"
         or
-        index = nCondition and result = e.getLabel() and partialPredicateCall = "Label()"
+        index = nExpr and result = e.getFieldList() and partialPredicateCall = "FieldList()"
         or
-        index = nLabel and result = e.getLoopBody() and partialPredicateCall = "LoopBody()"
+        index = nFieldList and result = e.getName() and partialPredicateCall = "Name()"
+        or
+        index = nName and result = e.getVisibility() and partialPredicateCall = "Visibility()"
       )
     )
   }
@@ -2829,26 +2866,85 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfArrayListExpr(
+    ArrayListExpr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bArrayExpr, int n |
+      b = 0 and
+      bArrayExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfArrayExpr(e, i, _)) | i) and
+      n = bArrayExpr and
+      (
+        none()
+        or
+        result = getImmediateChildOfArrayExpr(e, index - b, partialPredicateCall)
+      )
+    )
+  }
+
+  private Element getImmediateChildOfArrayRepeatExpr(
+    ArrayRepeatExpr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bArrayExpr, int n, int nRepeatOperand, int nRepeatLength |
+      b = 0 and
+      bArrayExpr = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfArrayExpr(e, i, _)) | i) and
+      n = bArrayExpr and
+      nRepeatOperand = n + 1 and
+      nRepeatLength = nRepeatOperand + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfArrayExpr(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getRepeatOperand() and partialPredicateCall = "RepeatOperand()"
+        or
+        index = nRepeatOperand and
+        result = e.getRepeatLength() and
+        partialPredicateCall = "RepeatLength()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfBlockExpr(BlockExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bLabelableExpr, int n, int nAttr, int nStmtList |
+      b = 0 and
+      bLabelableExpr =
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfLabelableExpr(e, i, _)) | i) and
+      n = bLabelableExpr and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nStmtList = nAttr + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfLabelableExpr(e, index - b, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getStmtList() and partialPredicateCall = "StmtList()"
+      )
+    )
+  }
+
   private Element getImmediateChildOfCallExpr(CallExpr e, int index, string partialPredicateCall) {
-    exists(int b, int bCallExprBase, int n, int nExpr |
+    exists(int b, int bCallExprBase, int n, int nFunction |
       b = 0 and
       bCallExprBase =
         b + 1 + max(int i | i = -1 or exists(getImmediateChildOfCallExprBase(e, i, _)) | i) and
       n = bCallExprBase and
-      nExpr = n + 1 and
+      nFunction = n + 1 and
       (
         none()
         or
         result = getImmediateChildOfCallExprBase(e, index - b, partialPredicateCall)
         or
-        index = n and result = e.getExpr() and partialPredicateCall = "Expr()"
+        index = n and result = e.getFunction() and partialPredicateCall = "Function()"
       )
     )
   }
 
   private Element getImmediateChildOfConst(Const e, int index, string partialPredicateCall) {
     exists(
-      int b, int bAssocItem, int bItem, int n, int nAttr, int nBody, int nName, int nTy,
+      int b, int bAssocItem, int bItem, int n, int nAttr, int nBody, int nName, int nTypeRepr,
       int nVisibility
     |
       b = 0 and
@@ -2858,8 +2954,8 @@ private module Impl {
       nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
       nBody = nAttr + 1 and
       nName = nBody + 1 and
-      nTy = nName + 1 and
-      nVisibility = nTy + 1 and
+      nTypeRepr = nName + 1 and
+      nVisibility = nTypeRepr + 1 and
       (
         none()
         or
@@ -2874,9 +2970,9 @@ private module Impl {
         or
         index = nBody and result = e.getName() and partialPredicateCall = "Name()"
         or
-        index = nName and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = nName and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
         or
-        index = nTy and result = e.getVisibility() and partialPredicateCall = "Visibility()"
+        index = nTypeRepr and result = e.getVisibility() and partialPredicateCall = "Visibility()"
       )
     )
   }
@@ -3087,6 +3183,25 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfLoopingExpr(
+    LoopingExpr e, int index, string partialPredicateCall
+  ) {
+    exists(int b, int bLabelableExpr, int n, int nLoopBody |
+      b = 0 and
+      bLabelableExpr =
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfLabelableExpr(e, i, _)) | i) and
+      n = bLabelableExpr and
+      nLoopBody = n + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfLabelableExpr(e, index - b, partialPredicateCall)
+        or
+        index = n and result = e.getLoopBody() and partialPredicateCall = "LoopBody()"
+      )
+    )
+  }
+
   private Element getImmediateChildOfMacroCall(MacroCall e, int index, string partialPredicateCall) {
     exists(
       int b, int bAssocItem, int bExternItem, int bItem, int n, int nAttr, int nPath,
@@ -3260,7 +3375,7 @@ private module Impl {
 
   private Element getImmediateChildOfStatic(Static e, int index, string partialPredicateCall) {
     exists(
-      int b, int bExternItem, int bItem, int n, int nAttr, int nBody, int nName, int nTy,
+      int b, int bExternItem, int bItem, int n, int nAttr, int nBody, int nName, int nTypeRepr,
       int nVisibility
     |
       b = 0 and
@@ -3271,8 +3386,8 @@ private module Impl {
       nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
       nBody = nAttr + 1 and
       nName = nBody + 1 and
-      nTy = nName + 1 and
-      nVisibility = nTy + 1 and
+      nTypeRepr = nName + 1 and
+      nVisibility = nTypeRepr + 1 and
       (
         none()
         or
@@ -3287,9 +3402,9 @@ private module Impl {
         or
         index = nBody and result = e.getName() and partialPredicateCall = "Name()"
         or
-        index = nName and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = nName and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
         or
-        index = nTy and result = e.getVisibility() and partialPredicateCall = "Visibility()"
+        index = nTypeRepr and result = e.getVisibility() and partialPredicateCall = "Visibility()"
       )
     )
   }
@@ -3421,7 +3536,7 @@ private module Impl {
   private Element getImmediateChildOfTypeAlias(TypeAlias e, int index, string partialPredicateCall) {
     exists(
       int b, int bAssocItem, int bExternItem, int bItem, int n, int nAttr, int nGenericParamList,
-      int nName, int nTy, int nTypeBoundList, int nVisibility, int nWhereClause
+      int nName, int nTypeRepr, int nTypeBoundList, int nVisibility, int nWhereClause
     |
       b = 0 and
       bAssocItem = b + 1 + max(int i | i = -1 or exists(getImmediateChildOfAssocItem(e, i, _)) | i) and
@@ -3432,8 +3547,8 @@ private module Impl {
       nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
       nGenericParamList = nAttr + 1 and
       nName = nGenericParamList + 1 and
-      nTy = nName + 1 and
-      nTypeBoundList = nTy + 1 and
+      nTypeRepr = nName + 1 and
+      nTypeBoundList = nTypeRepr + 1 and
       nVisibility = nTypeBoundList + 1 and
       nWhereClause = nVisibility + 1 and
       (
@@ -3454,9 +3569,11 @@ private module Impl {
         or
         index = nGenericParamList and result = e.getName() and partialPredicateCall = "Name()"
         or
-        index = nName and result = e.getTy() and partialPredicateCall = "Ty()"
+        index = nName and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
         or
-        index = nTy and result = e.getTypeBoundList() and partialPredicateCall = "TypeBoundList()"
+        index = nTypeRepr and
+        result = e.getTypeBoundList() and
+        partialPredicateCall = "TypeBoundList()"
         or
         index = nTypeBoundList and
         result = e.getVisibility() and
@@ -3535,12 +3652,77 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfForExpr(ForExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bLoopingExpr, int n, int nAttr, int nIterable, int nPat |
+      b = 0 and
+      bLoopingExpr =
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfLoopingExpr(e, i, _)) | i) and
+      n = bLoopingExpr and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nIterable = nAttr + 1 and
+      nPat = nIterable + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfLoopingExpr(e, index - b, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getIterable() and partialPredicateCall = "Iterable()"
+        or
+        index = nIterable and result = e.getPat() and partialPredicateCall = "Pat()"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfLoopExpr(LoopExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bLoopingExpr, int n, int nAttr |
+      b = 0 and
+      bLoopingExpr =
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfLoopingExpr(e, i, _)) | i) and
+      n = bLoopingExpr and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      (
+        none()
+        or
+        result = getImmediateChildOfLoopingExpr(e, index - b, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+      )
+    )
+  }
+
+  private Element getImmediateChildOfWhileExpr(WhileExpr e, int index, string partialPredicateCall) {
+    exists(int b, int bLoopingExpr, int n, int nAttr, int nCondition |
+      b = 0 and
+      bLoopingExpr =
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfLoopingExpr(e, i, _)) | i) and
+      n = bLoopingExpr and
+      nAttr = n + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nCondition = nAttr + 1 and
+      (
+        none()
+        or
+        result = getImmediateChildOfLoopingExpr(e, index - b, partialPredicateCall)
+        or
+        result = e.getAttr(index - n) and
+        partialPredicateCall = "Attr(" + (index - n).toString() + ")"
+        or
+        index = nAttr and result = e.getCondition() and partialPredicateCall = "Condition()"
+      )
+    )
+  }
+
   cached
   Element getImmediateChild(Element e, int index, string partialAccessor) {
     // why does this look more complicated than it should?
     // * none() simplifies generation, as we can append `or ...` without a special case for the first item
     none()
     or
+    result = getImmediateChildOfExtractorStep(e, index, partialAccessor)
+    or
     result = getImmediateChildOfFormat(e, index, partialAccessor)
     or
     result = getImmediateChildOfFormatArgument(e, index, partialAccessor)
@@ -3591,8 +3773,6 @@ private module Impl {
     or
     result = getImmediateChildOfNameRef(e, index, partialAccessor)
     or
-    result = getImmediateChildOfParam(e, index, partialAccessor)
-    or
     result = getImmediateChildOfParamList(e, index, partialAccessor)
     or
     result = getImmediateChildOfPathSegment(e, index, partialAccessor)
@@ -3609,12 +3789,10 @@ private module Impl {
     or
     result = getImmediateChildOfRename(e, index, partialAccessor)
     or
-    result = getImmediateChildOfRetType(e, index, partialAccessor)
+    result = getImmediateChildOfRetTypeRepr(e, index, partialAccessor)
     or
     result = getImmediateChildOfReturnTypeSyntax(e, index, partialAccessor)
     or
-    result = getImmediateChildOfSelfParam(e, index, partialAccessor)
-    or
     result = getImmediateChildOfSourceFile(e, index, partialAccessor)
     or
     result = getImmediateChildOfStmtList(e, index, partialAccessor)
@@ -3631,8 +3809,6 @@ private module Impl {
     or
     result = getImmediateChildOfUseTreeList(e, index, partialAccessor)
     or
-    result = getImmediateChildOfVariant(e, index, partialAccessor)
-    or
     result = getImmediateChildOfVariantList(e, index, partialAccessor)
     or
     result = getImmediateChildOfVisibility(e, index, partialAccessor)
@@ -3641,9 +3817,9 @@ private module Impl {
     or
     result = getImmediateChildOfWherePred(e, index, partialAccessor)
     or
-    result = getImmediateChildOfArrayExpr(e, index, partialAccessor)
+    result = getImmediateChildOfArrayExprInternal(e, index, partialAccessor)
     or
-    result = getImmediateChildOfArrayType(e, index, partialAccessor)
+    result = getImmediateChildOfArrayTypeRepr(e, index, partialAccessor)
     or
     result = getImmediateChildOfAsmExpr(e, index, partialAccessor)
     or
@@ -3655,8 +3831,6 @@ private module Impl {
     or
     result = getImmediateChildOfBinaryExpr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfBlockExpr(e, index, partialAccessor)
-    or
     result = getImmediateChildOfBoxPat(e, index, partialAccessor)
     or
     result = getImmediateChildOfBreakExpr(e, index, partialAccessor)
@@ -3675,17 +3849,15 @@ private module Impl {
     or
     result = getImmediateChildOfContinueExpr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfDynTraitType(e, index, partialAccessor)
+    result = getImmediateChildOfDynTraitTypeRepr(e, index, partialAccessor)
     or
     result = getImmediateChildOfExprStmt(e, index, partialAccessor)
     or
     result = getImmediateChildOfFieldExpr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfFnPtrType(e, index, partialAccessor)
+    result = getImmediateChildOfFnPtrTypeRepr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfForExpr(e, index, partialAccessor)
-    or
-    result = getImmediateChildOfForType(e, index, partialAccessor)
+    result = getImmediateChildOfForTypeRepr(e, index, partialAccessor)
     or
     result = getImmediateChildOfFormatArgsExpr(e, index, partialAccessor)
     or
@@ -3693,11 +3865,11 @@ private module Impl {
     or
     result = getImmediateChildOfIfExpr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfImplTraitType(e, index, partialAccessor)
+    result = getImmediateChildOfImplTraitTypeRepr(e, index, partialAccessor)
     or
     result = getImmediateChildOfIndexExpr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfInferType(e, index, partialAccessor)
+    result = getImmediateChildOfInferTypeRepr(e, index, partialAccessor)
     or
     result = getImmediateChildOfLetExpr(e, index, partialAccessor)
     or
@@ -3711,37 +3883,37 @@ private module Impl {
     or
     result = getImmediateChildOfLiteralPat(e, index, partialAccessor)
     or
-    result = getImmediateChildOfLoopExpr(e, index, partialAccessor)
-    or
     result = getImmediateChildOfMacroExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfMacroPat(e, index, partialAccessor)
     or
-    result = getImmediateChildOfMacroType(e, index, partialAccessor)
+    result = getImmediateChildOfMacroTypeRepr(e, index, partialAccessor)
     or
     result = getImmediateChildOfMatchExpr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfNeverType(e, index, partialAccessor)
+    result = getImmediateChildOfNeverTypeRepr(e, index, partialAccessor)
     or
     result = getImmediateChildOfOffsetOfExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfOrPat(e, index, partialAccessor)
     or
+    result = getImmediateChildOfParam(e, index, partialAccessor)
+    or
     result = getImmediateChildOfParenExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfParenPat(e, index, partialAccessor)
     or
-    result = getImmediateChildOfParenType(e, index, partialAccessor)
+    result = getImmediateChildOfParenTypeRepr(e, index, partialAccessor)
     or
     result = getImmediateChildOfPath(e, index, partialAccessor)
     or
     result = getImmediateChildOfPathPat(e, index, partialAccessor)
     or
-    result = getImmediateChildOfPathType(e, index, partialAccessor)
+    result = getImmediateChildOfPathTypeRepr(e, index, partialAccessor)
     or
     result = getImmediateChildOfPrefixExpr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfPtrType(e, index, partialAccessor)
+    result = getImmediateChildOfPtrTypeRepr(e, index, partialAccessor)
     or
     result = getImmediateChildOfRangeExpr(e, index, partialAccessor)
     or
@@ -3757,15 +3929,17 @@ private module Impl {
     or
     result = getImmediateChildOfRefPat(e, index, partialAccessor)
     or
-    result = getImmediateChildOfRefType(e, index, partialAccessor)
+    result = getImmediateChildOfRefTypeRepr(e, index, partialAccessor)
     or
     result = getImmediateChildOfRestPat(e, index, partialAccessor)
     or
     result = getImmediateChildOfReturnExpr(e, index, partialAccessor)
     or
+    result = getImmediateChildOfSelfParam(e, index, partialAccessor)
+    or
     result = getImmediateChildOfSlicePat(e, index, partialAccessor)
     or
-    result = getImmediateChildOfSliceType(e, index, partialAccessor)
+    result = getImmediateChildOfSliceTypeRepr(e, index, partialAccessor)
     or
     result = getImmediateChildOfTryExpr(e, index, partialAccessor)
     or
@@ -3777,7 +3951,7 @@ private module Impl {
     or
     result = getImmediateChildOfTupleStructPat(e, index, partialAccessor)
     or
-    result = getImmediateChildOfTupleType(e, index, partialAccessor)
+    result = getImmediateChildOfTupleTypeRepr(e, index, partialAccessor)
     or
     result = getImmediateChildOfTypeArg(e, index, partialAccessor)
     or
@@ -3785,7 +3959,7 @@ private module Impl {
     or
     result = getImmediateChildOfUnderscoreExpr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfWhileExpr(e, index, partialAccessor)
+    result = getImmediateChildOfVariant(e, index, partialAccessor)
     or
     result = getImmediateChildOfWildcardPat(e, index, partialAccessor)
     or
@@ -3793,6 +3967,12 @@ private module Impl {
     or
     result = getImmediateChildOfYieldExpr(e, index, partialAccessor)
     or
+    result = getImmediateChildOfArrayListExpr(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfArrayRepeatExpr(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfBlockExpr(e, index, partialAccessor)
+    or
     result = getImmediateChildOfCallExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfConst(e, index, partialAccessor)
@@ -3834,6 +4014,12 @@ private module Impl {
     result = getImmediateChildOfUnion(e, index, partialAccessor)
     or
     result = getImmediateChildOfUse(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfForExpr(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfLoopExpr(e, index, partialAccessor)
+    or
+    result = getImmediateChildOfWhileExpr(e, index, partialAccessor)
   }
 }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Path.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Path.qll
index 58f7d891d26..36313ca9fe9 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Path.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Path.qll
@@ -18,6 +18,7 @@ module Generated {
   /**
    * A path. For example:
    * ```rust
+   * use some_crate::some_module::some_item;
    * foo::bar;
    * ```
    * INTERNAL: Do not reference the `Generated::Path` class directly.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PathExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PathExpr.qll
index 562747d0f11..d0c3f7e82aa 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/PathExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/PathExpr.qll
@@ -21,7 +21,7 @@ module Generated {
    * let x = variable;
    * let x = foo::bar;
    * let y = <T>::foo;
-   * let z = <TypeRef as Trait>::foo;
+   * let z = <TypeRepr as Trait>::foo;
    * ```
    * INTERNAL: Do not reference the `Generated::PathExpr` class directly.
    * Use the subclass `PathExpr`, where the following predicates are available.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PathPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PathPat.qll
index f91949de40e..f1d3beafeb9 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/PathPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/PathPat.qll
@@ -29,7 +29,7 @@ module Generated {
     override string getAPrimaryQlClass() { result = "PathPat" }
 
     /**
-     * Gets the path of this path pat, if it exists.
+     * Gets the path of this path pattern, if it exists.
      */
     Path getPath() {
       result = Synth::convertPathFromRaw(Synth::convertPathPatToRaw(this).(Raw::PathPat).getPath())
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PathSegment.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PathSegment.qll
index 0878635e7d1..ada03f52345 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/PathSegment.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/PathSegment.qll
@@ -10,10 +10,10 @@ import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
 import codeql.rust.elements.GenericArgList
 import codeql.rust.elements.NameRef
 import codeql.rust.elements.ParamList
-import codeql.rust.elements.PathType
-import codeql.rust.elements.RetType
+import codeql.rust.elements.PathTypeRepr
+import codeql.rust.elements.RetTypeRepr
 import codeql.rust.elements.ReturnTypeSyntax
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * INTERNAL: This module contains the fully generated definition of `PathSegment` and should not
@@ -21,10 +21,7 @@ import codeql.rust.elements.TypeRef
  */
 module Generated {
   /**
-   * A PathSegment. For example:
-   * ```rust
-   * todo!()
-   * ```
+   * A path segment, which is one part of a whole path.
    * INTERNAL: Do not reference the `Generated::PathSegment` class directly.
    * Use the subclass `PathSegment`, where the following predicates are available.
    */
@@ -79,9 +76,9 @@ module Generated {
     /**
      * Gets the path type of this path segment, if it exists.
      */
-    PathType getPathType() {
+    PathTypeRepr getPathType() {
       result =
-        Synth::convertPathTypeFromRaw(Synth::convertPathSegmentToRaw(this)
+        Synth::convertPathTypeReprFromRaw(Synth::convertPathSegmentToRaw(this)
               .(Raw::PathSegment)
               .getPathType())
     }
@@ -94,9 +91,9 @@ module Generated {
     /**
      * Gets the ret type of this path segment, if it exists.
      */
-    RetType getRetType() {
+    RetTypeRepr getRetType() {
       result =
-        Synth::convertRetTypeFromRaw(Synth::convertPathSegmentToRaw(this)
+        Synth::convertRetTypeReprFromRaw(Synth::convertPathSegmentToRaw(this)
               .(Raw::PathSegment)
               .getRetType())
     }
@@ -122,16 +119,18 @@ module Generated {
     final predicate hasReturnTypeSyntax() { exists(this.getReturnTypeSyntax()) }
 
     /**
-     * Gets the ty of this path segment, if it exists.
+     * Gets the type representation of this path segment, if it exists.
      */
-    TypeRef getTy() {
+    TypeRepr getTypeRepr() {
       result =
-        Synth::convertTypeRefFromRaw(Synth::convertPathSegmentToRaw(this).(Raw::PathSegment).getTy())
+        Synth::convertTypeReprFromRaw(Synth::convertPathSegmentToRaw(this)
+              .(Raw::PathSegment)
+              .getTypeRepr())
     }
 
     /**
-     * Holds if `getTy()` exists.
+     * Holds if `getTypeRepr()` exists.
      */
-    final predicate hasTy() { exists(this.getTy()) }
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PathType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PathType.qll
deleted file mode 100644
index 3ac799108cc..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/PathType.qll
+++ /dev/null
@@ -1,41 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `PathType`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Path
-import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `PathType` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A PathType. For example:
-   * ```rust
-   * todo!()
-   * ```
-   * INTERNAL: Do not reference the `Generated::PathType` class directly.
-   * Use the subclass `PathType`, where the following predicates are available.
-   */
-  class PathType extends Synth::TPathType, TypeRefImpl::TypeRef {
-    override string getAPrimaryQlClass() { result = "PathType" }
-
-    /**
-     * Gets the path of this path type, if it exists.
-     */
-    Path getPath() {
-      result =
-        Synth::convertPathFromRaw(Synth::convertPathTypeToRaw(this).(Raw::PathType).getPath())
-    }
-
-    /**
-     * Holds if `getPath()` exists.
-     */
-    final predicate hasPath() { exists(this.getPath()) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PathTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PathTypeRepr.qll
new file mode 100644
index 00000000000..8195ded45ee
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/PathTypeRepr.qll
@@ -0,0 +1,44 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `PathTypeRepr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Path
+import codeql.rust.elements.internal.TypeReprImpl::Impl as TypeReprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `PathTypeRepr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A type referring to a path. For example:
+   * ```rust
+   * type X = std::collections::HashMap<i32, i32>;
+   * type Y = X::Item;
+   * ```
+   * INTERNAL: Do not reference the `Generated::PathTypeRepr` class directly.
+   * Use the subclass `PathTypeRepr`, where the following predicates are available.
+   */
+  class PathTypeRepr extends Synth::TPathTypeRepr, TypeReprImpl::TypeRepr {
+    override string getAPrimaryQlClass() { result = "PathTypeRepr" }
+
+    /**
+     * Gets the path of this path type representation, if it exists.
+     */
+    Path getPath() {
+      result =
+        Synth::convertPathFromRaw(Synth::convertPathTypeReprToRaw(this)
+              .(Raw::PathTypeRepr)
+              .getPath())
+    }
+
+    /**
+     * Holds if `getPath()` exists.
+     */
+    final predicate hasPath() { exists(this.getPath()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PtrType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PtrType.qll
deleted file mode 100644
index 598052d09d5..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/PtrType.qll
+++ /dev/null
@@ -1,50 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `PtrType`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.TypeRef
-import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `PtrType` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A PtrType. For example:
-   * ```rust
-   * todo!()
-   * ```
-   * INTERNAL: Do not reference the `Generated::PtrType` class directly.
-   * Use the subclass `PtrType`, where the following predicates are available.
-   */
-  class PtrType extends Synth::TPtrType, TypeRefImpl::TypeRef {
-    override string getAPrimaryQlClass() { result = "PtrType" }
-
-    /**
-     * Holds if this ptr type is const.
-     */
-    predicate isConst() { Synth::convertPtrTypeToRaw(this).(Raw::PtrType).isConst() }
-
-    /**
-     * Holds if this ptr type is mut.
-     */
-    predicate isMut() { Synth::convertPtrTypeToRaw(this).(Raw::PtrType).isMut() }
-
-    /**
-     * Gets the ty of this ptr type, if it exists.
-     */
-    TypeRef getTy() {
-      result = Synth::convertTypeRefFromRaw(Synth::convertPtrTypeToRaw(this).(Raw::PtrType).getTy())
-    }
-
-    /**
-     * Holds if `getTy()` exists.
-     */
-    final predicate hasTy() { exists(this.getTy()) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PtrTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PtrTypeRepr.qll
new file mode 100644
index 00000000000..609c8d258c4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/PtrTypeRepr.qll
@@ -0,0 +1,53 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `PtrTypeRepr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.TypeRepr
+import codeql.rust.elements.internal.TypeReprImpl::Impl as TypeReprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `PtrTypeRepr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A PtrTypeRepr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::PtrTypeRepr` class directly.
+   * Use the subclass `PtrTypeRepr`, where the following predicates are available.
+   */
+  class PtrTypeRepr extends Synth::TPtrTypeRepr, TypeReprImpl::TypeRepr {
+    override string getAPrimaryQlClass() { result = "PtrTypeRepr" }
+
+    /**
+     * Holds if this ptr type representation is const.
+     */
+    predicate isConst() { Synth::convertPtrTypeReprToRaw(this).(Raw::PtrTypeRepr).isConst() }
+
+    /**
+     * Holds if this ptr type representation is mut.
+     */
+    predicate isMut() { Synth::convertPtrTypeReprToRaw(this).(Raw::PtrTypeRepr).isMut() }
+
+    /**
+     * Gets the type representation of this ptr type representation, if it exists.
+     */
+    TypeRepr getTypeRepr() {
+      result =
+        Synth::convertTypeReprFromRaw(Synth::convertPtrTypeReprToRaw(this)
+              .(Raw::PtrTypeRepr)
+              .getTypeRepr())
+    }
+
+    /**
+     * Holds if `getTypeRepr()` exists.
+     */
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PureSynthConstructors.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PureSynthConstructors.qll
index 382ab59ed8c..699d14d9bf5 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/PureSynthConstructors.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/PureSynthConstructors.qll
@@ -3,6 +3,8 @@
  * This module exports all modules providing `Element` subclasses.
  */
 
+import codeql.rust.elements.internal.ArrayListExprConstructor
+import codeql.rust.elements.internal.ArrayRepeatExprConstructor
 import codeql.rust.elements.internal.FormatConstructor
 import codeql.rust.elements.internal.FormatArgumentConstructor
 import codeql.rust.elements.internal.FormatTemplateVariableAccessConstructor
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RangePat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RangePat.qll
index 2d78268e424..60ea7b90fd7 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RangePat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RangePat.qll
@@ -30,7 +30,7 @@ module Generated {
     override string getAPrimaryQlClass() { result = "RangePat" }
 
     /**
-     * Gets the end of this range pat, if it exists.
+     * Gets the end of this range pattern, if it exists.
      */
     Pat getEnd() {
       result = Synth::convertPatFromRaw(Synth::convertRangePatToRaw(this).(Raw::RangePat).getEnd())
@@ -42,7 +42,7 @@ module Generated {
     final predicate hasEnd() { exists(this.getEnd()) }
 
     /**
-     * Gets the operator name of this range pat, if it exists.
+     * Gets the operator name of this range pattern, if it exists.
      */
     string getOperatorName() {
       result = Synth::convertRangePatToRaw(this).(Raw::RangePat).getOperatorName()
@@ -54,7 +54,7 @@ module Generated {
     final predicate hasOperatorName() { exists(this.getOperatorName()) }
 
     /**
-     * Gets the start of this range pat, if it exists.
+     * Gets the start of this range pattern, if it exists.
      */
     Pat getStart() {
       result =
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
index 25af8ddac64..5d4309988a6 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
@@ -3,6 +3,8 @@
  * This module holds thin fully generated class definitions around DB entities.
  */
 module Raw {
+  private import codeql.files.FileSystem
+
   /**
    * INTERNAL: Do not use.
    */
@@ -10,6 +12,28 @@ module Raw {
     string toString() { none() }
   }
 
+  /**
+   * INTERNAL: Do not use.
+   */
+  class ExtractorStep extends @extractor_step, Element {
+    override string toString() { result = "ExtractorStep" }
+
+    /**
+     * Gets the action of this extractor step.
+     */
+    string getAction() { extractor_steps(this, result, _, _) }
+
+    /**
+     * Gets the file of this extractor step.
+     */
+    File getFile() { extractor_steps(this, _, result, _) }
+
+    /**
+     * Gets the duration ms of this extractor step.
+     */
+    int getDurationMs() { extractor_steps(this, _, _, result) }
+  }
+
   /**
    * INTERNAL: Do not use.
    */
@@ -61,6 +85,30 @@ module Raw {
     string getAbiString() { abi_abi_strings(this, result) }
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * Something that can be addressed by a path.
+   *
+   * TODO: This does not yet include all possible cases.
+   */
+  class Addressable extends @addressable, AstNode {
+    /**
+     * Gets the extended canonical path of this addressable, if it exists.
+     *
+     * Either a canonical path (see https://doc.rust-lang.org/reference/paths.html#canonical-paths),
+     * or `{<block id>}::name` for addressable items defined in an anonymous block (and only
+     * addressable there-in).
+     */
+    string getExtendedCanonicalPath() { addressable_extended_canonical_paths(this, result) }
+
+    /**
+     * Gets the crate origin of this addressable, if it exists.
+     *
+     * One of `rustc:<name>`, `repo:<repository>:<name>` or `lang:<name>`.
+     */
+    string getCrateOrigin() { addressable_crate_origins(this, result) }
+  }
+
   /**
    * INTERNAL: Do not use.
    * A ArgList. For example:
@@ -418,7 +466,7 @@ module Raw {
     MatchGuard getGuard() { match_arm_guards(this, result) }
 
     /**
-     * Gets the pat of this match arm, if it exists.
+     * Gets the pattern of this match arm, if it exists.
      */
     Pat getPat() { match_arm_pats(this, result) }
   }
@@ -525,28 +573,18 @@ module Raw {
 
   /**
    * INTERNAL: Do not use.
-   * A Param. For example:
-   * ```rust
-   * todo!()
-   * ```
+   * A normal parameter, `Param`, or a self parameter `SelfParam`.
    */
-  class Param extends @param, AstNode {
-    override string toString() { result = "Param" }
+  class ParamBase extends @param_base, AstNode {
+    /**
+     * Gets the `index`th attr of this parameter base (0-based).
+     */
+    Attr getAttr(int index) { param_base_attrs(this, index, result) }
 
     /**
-     * Gets the `index`th attr of this parameter (0-based).
+     * Gets the type representation of this parameter base, if it exists.
      */
-    Attr getAttr(int index) { param_attrs(this, index, result) }
-
-    /**
-     * Gets the pat of this parameter, if it exists.
-     */
-    Pat getPat() { param_pats(this, result) }
-
-    /**
-     * Gets the ty of this parameter, if it exists.
-     */
-    TypeRef getTy() { param_ties(this, result) }
+    TypeRepr getTypeRepr() { param_base_type_reprs(this, result) }
   }
 
   /**
@@ -578,10 +616,7 @@ module Raw {
 
   /**
    * INTERNAL: Do not use.
-   * A PathSegment. For example:
-   * ```rust
-   * todo!()
-   * ```
+   * A path segment, which is one part of a whole path.
    */
   class PathSegment extends @path_segment, AstNode {
     override string toString() { result = "PathSegment" }
@@ -604,12 +639,12 @@ module Raw {
     /**
      * Gets the path type of this path segment, if it exists.
      */
-    PathType getPathType() { path_segment_path_types(this, result) }
+    PathTypeRepr getPathType() { path_segment_path_types(this, result) }
 
     /**
      * Gets the ret type of this path segment, if it exists.
      */
-    RetType getRetType() { path_segment_ret_types(this, result) }
+    RetTypeRepr getRetType() { path_segment_ret_types(this, result) }
 
     /**
      * Gets the return type syntax of this path segment, if it exists.
@@ -617,9 +652,9 @@ module Raw {
     ReturnTypeSyntax getReturnTypeSyntax() { path_segment_return_type_syntaxes(this, result) }
 
     /**
-     * Gets the ty of this path segment, if it exists.
+     * Gets the type representation of this path segment, if it exists.
      */
-    TypeRef getTy() { path_segment_ties(this, result) }
+    TypeRepr getTypeRepr() { path_segment_type_reprs(this, result) }
   }
 
   /**
@@ -695,9 +730,9 @@ module Raw {
     Name getName() { record_field_names(this, result) }
 
     /**
-     * Gets the ty of this record field, if it exists.
+     * Gets the type representation of this record field, if it exists.
      */
-    TypeRef getTy() { record_field_ties(this, result) }
+    TypeRepr getTypeRepr() { record_field_type_reprs(this, result) }
 
     /**
      * Gets the visibility of this record field, if it exists.
@@ -716,17 +751,17 @@ module Raw {
     override string toString() { result = "RecordPatField" }
 
     /**
-     * Gets the `index`th attr of this record pat field (0-based).
+     * Gets the `index`th attr of this record pattern field (0-based).
      */
     Attr getAttr(int index) { record_pat_field_attrs(this, index, result) }
 
     /**
-     * Gets the name reference of this record pat field, if it exists.
+     * Gets the name reference of this record pattern field, if it exists.
      */
     NameRef getNameRef() { record_pat_field_name_refs(this, result) }
 
     /**
-     * Gets the pat of this record pat field, if it exists.
+     * Gets the pattern of this record pattern field, if it exists.
      */
     Pat getPat() { record_pat_field_pats(this, result) }
   }
@@ -742,12 +777,12 @@ module Raw {
     override string toString() { result = "RecordPatFieldList" }
 
     /**
-     * Gets the `index`th field of this record pat field list (0-based).
+     * Gets the `index`th field of this record pattern field list (0-based).
      */
     RecordPatField getField(int index) { record_pat_field_list_fields(this, index, result) }
 
     /**
-     * Gets the rest pat of this record pat field list, if it exists.
+     * Gets the rest pattern of this record pattern field list, if it exists.
      */
     RestPat getRestPat() { record_pat_field_list_rest_pats(this, result) }
   }
@@ -786,18 +821,18 @@ module Raw {
 
   /**
    * INTERNAL: Do not use.
-   * A RetType. For example:
+   * A RetTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class RetType extends @ret_type, AstNode {
-    override string toString() { result = "RetType" }
+  class RetTypeRepr extends @ret_type_repr, AstNode {
+    override string toString() { result = "RetTypeRepr" }
 
     /**
-     * Gets the ty of this ret type, if it exists.
+     * Gets the type representation of this ret type representation, if it exists.
      */
-    TypeRef getTy() { ret_type_ties(this, result) }
+    TypeRepr getTypeRepr() { ret_type_repr_type_reprs(this, result) }
   }
 
   /**
@@ -811,42 +846,6 @@ module Raw {
     override string toString() { result = "ReturnTypeSyntax" }
   }
 
-  /**
-   * INTERNAL: Do not use.
-   * A SelfParam. For example:
-   * ```rust
-   * todo!()
-   * ```
-   */
-  class SelfParam extends @self_param, AstNode {
-    override string toString() { result = "SelfParam" }
-
-    /**
-     * Gets the `index`th attr of this self parameter (0-based).
-     */
-    Attr getAttr(int index) { self_param_attrs(this, index, result) }
-
-    /**
-     * Holds if this self parameter is mut.
-     */
-    predicate isMut() { self_param_is_mut(this) }
-
-    /**
-     * Gets the lifetime of this self parameter, if it exists.
-     */
-    Lifetime getLifetime() { self_param_lifetimes(this, result) }
-
-    /**
-     * Gets the name of this self parameter, if it exists.
-     */
-    Name getName() { self_param_names(this, result) }
-
-    /**
-     * Gets the ty of this self parameter, if it exists.
-     */
-    TypeRef getTy() { self_param_ties(this, result) }
-  }
-
   /**
    * INTERNAL: Do not use.
    * A SourceFile. For example:
@@ -933,9 +932,9 @@ module Raw {
     Attr getAttr(int index) { tuple_field_attrs(this, index, result) }
 
     /**
-     * Gets the ty of this tuple field, if it exists.
+     * Gets the type representation of this tuple field, if it exists.
      */
-    TypeRef getTy() { tuple_field_ties(this, result) }
+    TypeRepr getTypeRepr() { tuple_field_type_reprs(this, result) }
 
     /**
      * Gets the visibility of this tuple field, if it exists.
@@ -974,9 +973,9 @@ module Raw {
     Lifetime getLifetime() { type_bound_lifetimes(this, result) }
 
     /**
-     * Gets the ty of this type bound, if it exists.
+     * Gets the type representation of this type bound, if it exists.
      */
-    TypeRef getTy() { type_bound_ties(this, result) }
+    TypeRepr getTypeRepr() { type_bound_type_reprs(this, result) }
   }
 
   /**
@@ -1004,7 +1003,7 @@ module Raw {
    * let z: Option<i32>;
    * ```
    */
-  class TypeRef extends @type_ref, AstNode { }
+  class TypeRepr extends @type_repr, AstNode { }
 
   /**
    * INTERNAL: Do not use.
@@ -1048,42 +1047,6 @@ module Raw {
     UseTree getUseTree(int index) { use_tree_list_use_trees(this, index, result) }
   }
 
-  /**
-   * INTERNAL: Do not use.
-   * A Variant. For example:
-   * ```rust
-   * todo!()
-   * ```
-   */
-  class Variant extends @variant, AstNode {
-    override string toString() { result = "Variant" }
-
-    /**
-     * Gets the `index`th attr of this variant (0-based).
-     */
-    Attr getAttr(int index) { variant_attrs(this, index, result) }
-
-    /**
-     * Gets the expression of this variant, if it exists.
-     */
-    Expr getExpr() { variant_exprs(this, result) }
-
-    /**
-     * Gets the field list of this variant, if it exists.
-     */
-    FieldList getFieldList() { variant_field_lists(this, result) }
-
-    /**
-     * Gets the name of this variant, if it exists.
-     */
-    Name getName() { variant_names(this, result) }
-
-    /**
-     * Gets the visibility of this variant, if it exists.
-     */
-    Visibility getVisibility() { variant_visibilities(this, result) }
-  }
-
   /**
    * INTERNAL: Do not use.
    * A VariantList. For example:
@@ -1153,9 +1116,9 @@ module Raw {
     Lifetime getLifetime() { where_pred_lifetimes(this, result) }
 
     /**
-     * Gets the ty of this where pred, if it exists.
+     * Gets the type representation of this where pred, if it exists.
      */
-    TypeRef getTy() { where_pred_ties(this, result) }
+    TypeRepr getTypeRepr() { where_pred_type_reprs(this, result) }
 
     /**
      * Gets the type bound list of this where pred, if it exists.
@@ -1165,45 +1128,45 @@ module Raw {
 
   /**
    * INTERNAL: Do not use.
-   * An array expression. For example:
-   * ```rust
-   * [1, 2, 3];
-   * [1; 10];
-   * ```
    */
-  class ArrayExpr extends @array_expr, Expr {
-    override string toString() { result = "ArrayExpr" }
+  class ArrayExprInternal extends @array_expr_internal, Expr {
+    override string toString() { result = "ArrayExprInternal" }
 
     /**
-     * Gets the `index`th attr of this array expression (0-based).
+     * Gets the `index`th attr of this array expression internal (0-based).
      */
-    Attr getAttr(int index) { array_expr_attrs(this, index, result) }
+    Attr getAttr(int index) { array_expr_internal_attrs(this, index, result) }
 
     /**
-     * Gets the `index`th expression of this array expression (0-based).
+     * Gets the `index`th expression of this array expression internal (0-based).
      */
-    Expr getExpr(int index) { array_expr_exprs(this, index, result) }
+    Expr getExpr(int index) { array_expr_internal_exprs(this, index, result) }
+
+    /**
+     * Holds if this array expression internal is semicolon.
+     */
+    predicate isSemicolon() { array_expr_internal_is_semicolon(this) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A ArrayType. For example:
+   * A ArrayTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class ArrayType extends @array_type, TypeRef {
-    override string toString() { result = "ArrayType" }
+  class ArrayTypeRepr extends @array_type_repr, TypeRepr {
+    override string toString() { result = "ArrayTypeRepr" }
 
     /**
-     * Gets the const argument of this array type, if it exists.
+     * Gets the const argument of this array type representation, if it exists.
      */
-    ConstArg getConstArg() { array_type_const_args(this, result) }
+    ConstArg getConstArg() { array_type_repr_const_args(this, result) }
 
     /**
-     * Gets the ty of this array type, if it exists.
+     * Gets the element type representation of this array type representation, if it exists.
      */
-    TypeRef getTy() { array_type_ties(this, result) }
+    TypeRepr getElementTypeRepr() { array_type_repr_element_type_reprs(this, result) }
   }
 
   /**
@@ -1262,7 +1225,7 @@ module Raw {
     /**
      * Gets the ret type of this assoc type argument, if it exists.
      */
-    RetType getRetType() { assoc_type_arg_ret_types(this, result) }
+    RetTypeRepr getRetType() { assoc_type_arg_ret_types(this, result) }
 
     /**
      * Gets the return type syntax of this assoc type argument, if it exists.
@@ -1270,9 +1233,9 @@ module Raw {
     ReturnTypeSyntax getReturnTypeSyntax() { assoc_type_arg_return_type_syntaxes(this, result) }
 
     /**
-     * Gets the ty of this assoc type argument, if it exists.
+     * Gets the type representation of this assoc type argument, if it exists.
      */
-    TypeRef getTy() { assoc_type_arg_ties(this, result) }
+    TypeRepr getTypeRepr() { assoc_type_arg_type_reprs(this, result) }
 
     /**
      * Gets the type bound list of this assoc type argument, if it exists.
@@ -1366,70 +1329,6 @@ module Raw {
     Expr getRhs() { binary_expr_rhs(this, result) }
   }
 
-  /**
-   * INTERNAL: Do not use.
-   * A block expression. For example:
-   * ```rust
-   * {
-   *     let x = 42;
-   * }
-   * ```
-   * ```rust
-   * 'label: {
-   *     let x = 42;
-   *     x
-   * }
-   * ```
-   */
-  class BlockExpr extends @block_expr, Expr {
-    override string toString() { result = "BlockExpr" }
-
-    /**
-     * Gets the `index`th attr of this block expression (0-based).
-     */
-    Attr getAttr(int index) { block_expr_attrs(this, index, result) }
-
-    /**
-     * Holds if this block expression is async.
-     */
-    predicate isAsync() { block_expr_is_async(this) }
-
-    /**
-     * Holds if this block expression is const.
-     */
-    predicate isConst() { block_expr_is_const(this) }
-
-    /**
-     * Holds if this block expression is gen.
-     */
-    predicate isGen() { block_expr_is_gen(this) }
-
-    /**
-     * Holds if this block expression is move.
-     */
-    predicate isMove() { block_expr_is_move(this) }
-
-    /**
-     * Holds if this block expression is try.
-     */
-    predicate isTry() { block_expr_is_try(this) }
-
-    /**
-     * Holds if this block expression is unsafe.
-     */
-    predicate isUnsafe() { block_expr_is_unsafe(this) }
-
-    /**
-     * Gets the label of this block expression, if it exists.
-     */
-    Label getLabel() { block_expr_labels(this, result) }
-
-    /**
-     * Gets the statement list of this block expression, if it exists.
-     */
-    StmtList getStmtList() { block_expr_stmt_lists(this, result) }
-  }
-
   /**
    * INTERNAL: Do not use.
    * A box pattern. For example:
@@ -1444,7 +1343,7 @@ module Raw {
     override string toString() { result = "BoxPat" }
 
     /**
-     * Gets the pat of this box pat, if it exists.
+     * Gets the pattern of this box pattern, if it exists.
      */
     Pat getPat() { box_pat_pats(this, result) }
   }
@@ -1531,9 +1430,9 @@ module Raw {
     Expr getExpr() { cast_expr_exprs(this, result) }
 
     /**
-     * Gets the ty of this cast expression, if it exists.
+     * Gets the type representation of this cast expression, if it exists.
      */
-    TypeRef getTy() { cast_expr_ties(this, result) }
+    TypeRepr getTypeRepr() { cast_expr_type_reprs(this, result) }
   }
 
   /**
@@ -1590,7 +1489,7 @@ module Raw {
     /**
      * Gets the ret type of this closure expression, if it exists.
      */
-    RetType getRetType() { closure_expr_ret_types(this, result) }
+    RetTypeRepr getRetType() { closure_expr_ret_types(this, result) }
   }
 
   /**
@@ -1645,12 +1544,12 @@ module Raw {
     override string toString() { result = "ConstBlockPat" }
 
     /**
-     * Gets the block expression of this const block pat, if it exists.
+     * Gets the block expression of this const block pattern, if it exists.
      */
     BlockExpr getBlockExpr() { const_block_pat_block_exprs(this, result) }
 
     /**
-     * Holds if this const block pat is const.
+     * Holds if this const block pattern is const.
      */
     predicate isConst() { const_block_pat_is_const(this) }
   }
@@ -1686,9 +1585,9 @@ module Raw {
     Name getName() { const_param_names(this, result) }
 
     /**
-     * Gets the ty of this const parameter, if it exists.
+     * Gets the type representation of this const parameter, if it exists.
      */
-    TypeRef getTy() { const_param_ties(this, result) }
+    TypeRepr getTypeRepr() { const_param_type_reprs(this, result) }
   }
 
   /**
@@ -1725,18 +1624,18 @@ module Raw {
 
   /**
    * INTERNAL: Do not use.
-   * A DynTraitType. For example:
+   * A DynTraitTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class DynTraitType extends @dyn_trait_type, TypeRef {
-    override string toString() { result = "DynTraitType" }
+  class DynTraitTypeRepr extends @dyn_trait_type_repr, TypeRepr {
+    override string toString() { result = "DynTraitTypeRepr" }
 
     /**
-     * Gets the type bound list of this dyn trait type, if it exists.
+     * Gets the type bound list of this dyn trait type representation, if it exists.
      */
-    TypeBoundList getTypeBoundList() { dyn_trait_type_type_bound_lists(this, result) }
+    TypeBoundList getTypeBoundList() { dyn_trait_type_repr_type_bound_lists(this, result) }
   }
 
   /**
@@ -1785,107 +1684,75 @@ module Raw {
 
   /**
    * INTERNAL: Do not use.
-   * A FnPtrType. For example:
+   * A FnPtrTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class FnPtrType extends @fn_ptr_type, TypeRef {
-    override string toString() { result = "FnPtrType" }
+  class FnPtrTypeRepr extends @fn_ptr_type_repr, TypeRepr {
+    override string toString() { result = "FnPtrTypeRepr" }
 
     /**
-     * Gets the abi of this fn ptr type, if it exists.
+     * Gets the abi of this fn ptr type representation, if it exists.
      */
-    Abi getAbi() { fn_ptr_type_abis(this, result) }
+    Abi getAbi() { fn_ptr_type_repr_abis(this, result) }
 
     /**
-     * Holds if this fn ptr type is async.
+     * Holds if this fn ptr type representation is async.
      */
-    predicate isAsync() { fn_ptr_type_is_async(this) }
+    predicate isAsync() { fn_ptr_type_repr_is_async(this) }
 
     /**
-     * Holds if this fn ptr type is const.
+     * Holds if this fn ptr type representation is const.
      */
-    predicate isConst() { fn_ptr_type_is_const(this) }
+    predicate isConst() { fn_ptr_type_repr_is_const(this) }
 
     /**
-     * Holds if this fn ptr type is unsafe.
+     * Holds if this fn ptr type representation is unsafe.
      */
-    predicate isUnsafe() { fn_ptr_type_is_unsafe(this) }
+    predicate isUnsafe() { fn_ptr_type_repr_is_unsafe(this) }
 
     /**
-     * Gets the parameter list of this fn ptr type, if it exists.
+     * Gets the parameter list of this fn ptr type representation, if it exists.
      */
-    ParamList getParamList() { fn_ptr_type_param_lists(this, result) }
+    ParamList getParamList() { fn_ptr_type_repr_param_lists(this, result) }
 
     /**
-     * Gets the ret type of this fn ptr type, if it exists.
+     * Gets the ret type of this fn ptr type representation, if it exists.
      */
-    RetType getRetType() { fn_ptr_type_ret_types(this, result) }
+    RetTypeRepr getRetType() { fn_ptr_type_repr_ret_types(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A ForExpr. For example:
+   * A ForTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class ForExpr extends @for_expr, Expr {
-    override string toString() { result = "ForExpr" }
+  class ForTypeRepr extends @for_type_repr, TypeRepr {
+    override string toString() { result = "ForTypeRepr" }
 
     /**
-     * Gets the `index`th attr of this for expression (0-based).
+     * Gets the generic parameter list of this for type representation, if it exists.
      */
-    Attr getAttr(int index) { for_expr_attrs(this, index, result) }
+    GenericParamList getGenericParamList() { for_type_repr_generic_param_lists(this, result) }
 
     /**
-     * Gets the iterable of this for expression, if it exists.
+     * Gets the type representation of this for type representation, if it exists.
      */
-    Expr getIterable() { for_expr_iterables(this, result) }
-
-    /**
-     * Gets the label of this for expression, if it exists.
-     */
-    Label getLabel() { for_expr_labels(this, result) }
-
-    /**
-     * Gets the loop body of this for expression, if it exists.
-     */
-    BlockExpr getLoopBody() { for_expr_loop_bodies(this, result) }
-
-    /**
-     * Gets the pat of this for expression, if it exists.
-     */
-    Pat getPat() { for_expr_pats(this, result) }
-  }
-
-  /**
-   * INTERNAL: Do not use.
-   * A ForType. For example:
-   * ```rust
-   * todo!()
-   * ```
-   */
-  class ForType extends @for_type, TypeRef {
-    override string toString() { result = "ForType" }
-
-    /**
-     * Gets the generic parameter list of this for type, if it exists.
-     */
-    GenericParamList getGenericParamList() { for_type_generic_param_lists(this, result) }
-
-    /**
-     * Gets the ty of this for type, if it exists.
-     */
-    TypeRef getTy() { for_type_ties(this, result) }
+    TypeRepr getTypeRepr() { for_type_repr_type_reprs(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
    * A FormatArgsExpr. For example:
    * ```rust
-   * todo!()
+   * format_args!("no args");
+   * format_args!("{} foo {:?}", 1, 2);
+   * format_args!("{b} foo {a:?}", a=1, b=2);
+   * let (x, y) = (1, 42);
+   * format_args!("{x}, {y}");
    * ```
    */
   class FormatArgsExpr extends @format_args_expr, Expr {
@@ -1927,27 +1794,27 @@ module Raw {
     override string toString() { result = "IdentPat" }
 
     /**
-     * Gets the `index`th attr of this ident pat (0-based).
+     * Gets the `index`th attr of this ident pattern (0-based).
      */
     Attr getAttr(int index) { ident_pat_attrs(this, index, result) }
 
     /**
-     * Holds if this ident pat is mut.
+     * Holds if this ident pattern is mut.
      */
     predicate isMut() { ident_pat_is_mut(this) }
 
     /**
-     * Holds if this ident pat is reference.
+     * Holds if this ident pattern is reference.
      */
     predicate isRef() { ident_pat_is_ref(this) }
 
     /**
-     * Gets the name of this ident pat, if it exists.
+     * Gets the name of this ident pattern, if it exists.
      */
     Name getName() { ident_pat_names(this, result) }
 
     /**
-     * Gets the pat of this ident pat, if it exists.
+     * Gets the pattern of this ident pattern, if it exists.
      */
     Pat getPat() { ident_pat_pats(this, result) }
   }
@@ -1994,18 +1861,18 @@ module Raw {
 
   /**
    * INTERNAL: Do not use.
-   * A ImplTraitType. For example:
+   * A ImplTraitTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class ImplTraitType extends @impl_trait_type, TypeRef {
-    override string toString() { result = "ImplTraitType" }
+  class ImplTraitTypeRepr extends @impl_trait_type_repr, TypeRepr {
+    override string toString() { result = "ImplTraitTypeRepr" }
 
     /**
-     * Gets the type bound list of this impl trait type, if it exists.
+     * Gets the type bound list of this impl trait type representation, if it exists.
      */
-    TypeBoundList getTypeBoundList() { impl_trait_type_type_bound_lists(this, result) }
+    TypeBoundList getTypeBoundList() { impl_trait_type_repr_type_bound_lists(this, result) }
   }
 
   /**
@@ -2037,13 +1904,13 @@ module Raw {
 
   /**
    * INTERNAL: Do not use.
-   * A InferType. For example:
+   * A InferTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class InferType extends @infer_type, TypeRef {
-    override string toString() { result = "InferType" }
+  class InferTypeRepr extends @infer_type_repr, TypeRepr {
+    override string toString() { result = "InferTypeRepr" }
   }
 
   /**
@@ -2053,22 +1920,17 @@ module Raw {
    * todo!()
    * ```
    */
-  class Item extends @item, Stmt {
-    /**
-     * Gets the extended canonical path of this item, if it exists.
-     *
-     * Either a canonical path (see https://doc.rust-lang.org/reference/paths.html#canonical-paths),
-     * or `{<block id>}::name` for addressable items defined in an anonymous block (and only
-     * addressable there-in).
-     */
-    string getExtendedCanonicalPath() { item_extended_canonical_paths(this, result) }
+  class Item extends @item, Stmt, Addressable { }
 
+  /**
+   * INTERNAL: Do not use.
+   * The base class for expressions that can be labeled (`LoopExpr`, `ForExpr`, `WhileExpr` or `BlockExpr`).
+   */
+  class LabelableExpr extends @labelable_expr, Expr {
     /**
-     * Gets the crate origin of this item, if it exists.
-     *
-     * One of `rustc:<name>`, `repo:<repository>:<name>` or `lang:<name>`.
+     * Gets the label of this labelable expression, if it exists.
      */
-    string getCrateOrigin() { item_crate_origins(this, result) }
+    Label getLabel() { labelable_expr_labels(this, result) }
   }
 
   /**
@@ -2089,12 +1951,12 @@ module Raw {
     Attr getAttr(int index) { let_expr_attrs(this, index, result) }
 
     /**
-     * Gets the expression of this let expression, if it exists.
+     * Gets the scrutinee of this let expression, if it exists.
      */
-    Expr getExpr() { let_expr_exprs(this, result) }
+    Expr getScrutinee() { let_expr_scrutinees(this, result) }
 
     /**
-     * Gets the pat of this let expression, if it exists.
+     * Gets the pattern of this let expression, if it exists.
      */
     Pat getPat() { let_expr_pats(this, result) }
   }
@@ -2132,14 +1994,14 @@ module Raw {
     LetElse getLetElse() { let_stmt_let_elses(this, result) }
 
     /**
-     * Gets the pat of this let statement, if it exists.
+     * Gets the pattern of this let statement, if it exists.
      */
     Pat getPat() { let_stmt_pats(this, result) }
 
     /**
-     * Gets the ty of this let statement, if it exists.
+     * Gets the type representation of this let statement, if it exists.
      */
-    TypeRef getTy() { let_stmt_ties(this, result) }
+    TypeRepr getTypeRepr() { let_stmt_type_reprs(this, result) }
   }
 
   /**
@@ -2226,55 +2088,11 @@ module Raw {
     override string toString() { result = "LiteralPat" }
 
     /**
-     * Gets the literal of this literal pat, if it exists.
+     * Gets the literal of this literal pattern, if it exists.
      */
     LiteralExpr getLiteral() { literal_pat_literals(this, result) }
   }
 
-  /**
-   * INTERNAL: Do not use.
-   * A loop expression. For example:
-   * ```rust
-   * loop {
-   *     println!("Hello, world (again)!");
-   * };
-   * ```
-   * ```rust
-   * 'label: loop {
-   *     println!("Hello, world (once)!");
-   *     break 'label;
-   * };
-   * ```
-   * ```rust
-   * let mut x = 0;
-   * loop {
-   *     if x < 10 {
-   *         x += 1;
-   *     } else {
-   *         break;
-   *     }
-   * };
-   * ```
-   */
-  class LoopExpr extends @loop_expr, Expr {
-    override string toString() { result = "LoopExpr" }
-
-    /**
-     * Gets the `index`th attr of this loop expression (0-based).
-     */
-    Attr getAttr(int index) { loop_expr_attrs(this, index, result) }
-
-    /**
-     * Gets the label of this loop expression, if it exists.
-     */
-    Label getLabel() { loop_expr_labels(this, result) }
-
-    /**
-     * Gets the loop body of this loop expression, if it exists.
-     */
-    BlockExpr getLoopBody() { loop_expr_loop_bodies(this, result) }
-  }
-
   /**
    * INTERNAL: Do not use.
    * A MacroExpr. For example:
@@ -2302,25 +2120,25 @@ module Raw {
     override string toString() { result = "MacroPat" }
 
     /**
-     * Gets the macro call of this macro pat, if it exists.
+     * Gets the macro call of this macro pattern, if it exists.
      */
     MacroCall getMacroCall() { macro_pat_macro_calls(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A MacroType. For example:
+   * A MacroTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class MacroType extends @macro_type, TypeRef {
-    override string toString() { result = "MacroType" }
+  class MacroTypeRepr extends @macro_type_repr, TypeRepr {
+    override string toString() { result = "MacroTypeRepr" }
 
     /**
-     * Gets the macro call of this macro type, if it exists.
+     * Gets the macro call of this macro type representation, if it exists.
      */
-    MacroCall getMacroCall() { macro_type_macro_calls(this, result) }
+    MacroCall getMacroCall() { macro_type_repr_macro_calls(this, result) }
   }
 
   /**
@@ -2348,9 +2166,9 @@ module Raw {
     Attr getAttr(int index) { match_expr_attrs(this, index, result) }
 
     /**
-     * Gets the expression of this match expression, if it exists.
+     * Gets the scrutinee (the expression being matched) of this match expression, if it exists.
      */
-    Expr getExpr() { match_expr_exprs(this, result) }
+    Expr getScrutinee() { match_expr_scrutinees(this, result) }
 
     /**
      * Gets the match arm list of this match expression, if it exists.
@@ -2360,13 +2178,13 @@ module Raw {
 
   /**
    * INTERNAL: Do not use.
-   * A NeverType. For example:
+   * A NeverTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class NeverType extends @never_type, TypeRef {
-    override string toString() { result = "NeverType" }
+  class NeverTypeRepr extends @never_type_repr, TypeRepr {
+    override string toString() { result = "NeverTypeRepr" }
   }
 
   /**
@@ -2390,9 +2208,9 @@ module Raw {
     NameRef getField(int index) { offset_of_expr_fields(this, index, result) }
 
     /**
-     * Gets the ty of this offset of expression, if it exists.
+     * Gets the type representation of this offset of expression, if it exists.
      */
-    TypeRef getTy() { offset_of_expr_ties(this, result) }
+    TypeRepr getTypeRepr() { offset_of_expr_type_reprs(this, result) }
   }
 
   /**
@@ -2408,11 +2226,29 @@ module Raw {
     override string toString() { result = "OrPat" }
 
     /**
-     * Gets the `index`th pat of this or pat (0-based).
+     * Gets the `index`th pattern of this or pattern (0-based).
      */
     Pat getPat(int index) { or_pat_pats(this, index, result) }
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * A parameter in a function or method. For example `x` in:
+   * ```rust
+   * fn new(x: T) -> Foo<T> {
+   *   // ...
+   * }
+   * ```
+   */
+  class Param extends @param, ParamBase {
+    override string toString() { result = "Param" }
+
+    /**
+     * Gets the pattern of this parameter, if it exists.
+     */
+    Pat getPat() { param_pats(this, result) }
+  }
+
   /**
    * INTERNAL: Do not use.
    * A ParenExpr. For example:
@@ -2445,31 +2281,32 @@ module Raw {
     override string toString() { result = "ParenPat" }
 
     /**
-     * Gets the pat of this paren pat, if it exists.
+     * Gets the pattern of this paren pattern, if it exists.
      */
     Pat getPat() { paren_pat_pats(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A ParenType. For example:
+   * A ParenTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class ParenType extends @paren_type, TypeRef {
-    override string toString() { result = "ParenType" }
+  class ParenTypeRepr extends @paren_type_repr, TypeRepr {
+    override string toString() { result = "ParenTypeRepr" }
 
     /**
-     * Gets the ty of this paren type, if it exists.
+     * Gets the type representation of this paren type representation, if it exists.
      */
-    TypeRef getTy() { paren_type_ties(this, result) }
+    TypeRepr getTypeRepr() { paren_type_repr_type_reprs(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
    * A path. For example:
    * ```rust
+   * use some_crate::some_module::some_item;
    * foo::bar;
    * ```
    */
@@ -2507,25 +2344,26 @@ module Raw {
     override string toString() { result = "PathPat" }
 
     /**
-     * Gets the path of this path pat, if it exists.
+     * Gets the path of this path pattern, if it exists.
      */
     Path getPath() { path_pat_paths(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A PathType. For example:
+   * A type referring to a path. For example:
    * ```rust
-   * todo!()
+   * type X = std::collections::HashMap<i32, i32>;
+   * type Y = X::Item;
    * ```
    */
-  class PathType extends @path_type, TypeRef {
-    override string toString() { result = "PathType" }
+  class PathTypeRepr extends @path_type_repr, TypeRepr {
+    override string toString() { result = "PathTypeRepr" }
 
     /**
-     * Gets the path of this path type, if it exists.
+     * Gets the path of this path type representation, if it exists.
      */
-    Path getPath() { path_type_paths(this, result) }
+    Path getPath() { path_type_repr_paths(this, result) }
   }
 
   /**
@@ -2558,28 +2396,28 @@ module Raw {
 
   /**
    * INTERNAL: Do not use.
-   * A PtrType. For example:
+   * A PtrTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class PtrType extends @ptr_type, TypeRef {
-    override string toString() { result = "PtrType" }
+  class PtrTypeRepr extends @ptr_type_repr, TypeRepr {
+    override string toString() { result = "PtrTypeRepr" }
 
     /**
-     * Holds if this ptr type is const.
+     * Holds if this ptr type representation is const.
      */
-    predicate isConst() { ptr_type_is_const(this) }
+    predicate isConst() { ptr_type_repr_is_const(this) }
 
     /**
-     * Holds if this ptr type is mut.
+     * Holds if this ptr type representation is mut.
      */
-    predicate isMut() { ptr_type_is_mut(this) }
+    predicate isMut() { ptr_type_repr_is_mut(this) }
 
     /**
-     * Gets the ty of this ptr type, if it exists.
+     * Gets the type representation of this ptr type representation, if it exists.
      */
-    TypeRef getTy() { ptr_type_ties(this, result) }
+    TypeRepr getTypeRepr() { ptr_type_repr_type_reprs(this, result) }
   }
 
   /**
@@ -2633,17 +2471,17 @@ module Raw {
     override string toString() { result = "RangePat" }
 
     /**
-     * Gets the end of this range pat, if it exists.
+     * Gets the end of this range pattern, if it exists.
      */
     Pat getEnd() { range_pat_ends(this, result) }
 
     /**
-     * Gets the operator name of this range pat, if it exists.
+     * Gets the operator name of this range pattern, if it exists.
      */
     string getOperatorName() { range_pat_operator_names(this, result) }
 
     /**
-     * Gets the start of this range pat, if it exists.
+     * Gets the start of this range pattern, if it exists.
      */
     Pat getStart() { range_pat_starts(this, result) }
   }
@@ -2704,12 +2542,12 @@ module Raw {
     override string toString() { result = "RecordPat" }
 
     /**
-     * Gets the path of this record pat, if it exists.
+     * Gets the path of this record pattern, if it exists.
      */
     Path getPath() { record_pat_paths(this, result) }
 
     /**
-     * Gets the record pat field list of this record pat, if it exists.
+     * Gets the record pattern field list of this record pattern, if it exists.
      */
     RecordPatFieldList getRecordPatFieldList() { record_pat_record_pat_field_lists(this, result) }
   }
@@ -2767,40 +2605,40 @@ module Raw {
     override string toString() { result = "RefPat" }
 
     /**
-     * Holds if this reference pat is mut.
+     * Holds if this reference pattern is mut.
      */
     predicate isMut() { ref_pat_is_mut(this) }
 
     /**
-     * Gets the pat of this reference pat, if it exists.
+     * Gets the pattern of this reference pattern, if it exists.
      */
     Pat getPat() { ref_pat_pats(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A RefType. For example:
+   * A RefTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class RefType extends @ref_type, TypeRef {
-    override string toString() { result = "RefType" }
+  class RefTypeRepr extends @ref_type_repr, TypeRepr {
+    override string toString() { result = "RefTypeRepr" }
 
     /**
-     * Holds if this reference type is mut.
+     * Holds if this reference type representation is mut.
      */
-    predicate isMut() { ref_type_is_mut(this) }
+    predicate isMut() { ref_type_repr_is_mut(this) }
 
     /**
-     * Gets the lifetime of this reference type, if it exists.
+     * Gets the lifetime of this reference type representation, if it exists.
      */
-    Lifetime getLifetime() { ref_type_lifetimes(this, result) }
+    Lifetime getLifetime() { ref_type_repr_lifetimes(this, result) }
 
     /**
-     * Gets the ty of this reference type, if it exists.
+     * Gets the type representation of this reference type representation, if it exists.
      */
-    TypeRef getTy() { ref_type_ties(this, result) }
+    TypeRepr getTypeRepr() { ref_type_repr_type_reprs(this, result) }
   }
 
   /**
@@ -2814,7 +2652,7 @@ module Raw {
     override string toString() { result = "RestPat" }
 
     /**
-     * Gets the `index`th attr of this rest pat (0-based).
+     * Gets the `index`th attr of this rest pattern (0-based).
      */
     Attr getAttr(int index) { rest_pat_attrs(this, index, result) }
   }
@@ -2847,6 +2685,34 @@ module Raw {
     Expr getExpr() { return_expr_exprs(this, result) }
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * A `self` parameter. For example `self` in:
+   * ```rust
+   * fn push(&mut self, value: T) {
+   *   // ...
+   * }
+   * ```
+   */
+  class SelfParam extends @self_param, ParamBase {
+    override string toString() { result = "SelfParam" }
+
+    /**
+     * Holds if this self parameter is mut.
+     */
+    predicate isMut() { self_param_is_mut(this) }
+
+    /**
+     * Gets the lifetime of this self parameter, if it exists.
+     */
+    Lifetime getLifetime() { self_param_lifetimes(this, result) }
+
+    /**
+     * Gets the name of this self parameter, if it exists.
+     */
+    Name getName() { self_param_names(this, result) }
+  }
+
   /**
    * INTERNAL: Do not use.
    * A slice pattern. For example:
@@ -2862,25 +2728,25 @@ module Raw {
     override string toString() { result = "SlicePat" }
 
     /**
-     * Gets the `index`th pat of this slice pat (0-based).
+     * Gets the `index`th pattern of this slice pattern (0-based).
      */
     Pat getPat(int index) { slice_pat_pats(this, index, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A SliceType. For example:
+   * A SliceTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class SliceType extends @slice_type, TypeRef {
-    override string toString() { result = "SliceType" }
+  class SliceTypeRepr extends @slice_type_repr, TypeRepr {
+    override string toString() { result = "SliceTypeRepr" }
 
     /**
-     * Gets the ty of this slice type, if it exists.
+     * Gets the type representation of this slice type representation, if it exists.
      */
-    TypeRef getTy() { slice_type_ties(this, result) }
+    TypeRepr getTypeRepr() { slice_type_repr_type_reprs(this, result) }
   }
 
   /**
@@ -2954,7 +2820,7 @@ module Raw {
     override string toString() { result = "TuplePat" }
 
     /**
-     * Gets the `index`th field of this tuple pat (0-based).
+     * Gets the `index`th field of this tuple pattern (0-based).
      */
     Pat getField(int index) { tuple_pat_fields(this, index, result) }
   }
@@ -2974,30 +2840,30 @@ module Raw {
     override string toString() { result = "TupleStructPat" }
 
     /**
-     * Gets the `index`th field of this tuple struct pat (0-based).
+     * Gets the `index`th field of this tuple struct pattern (0-based).
      */
     Pat getField(int index) { tuple_struct_pat_fields(this, index, result) }
 
     /**
-     * Gets the path of this tuple struct pat, if it exists.
+     * Gets the path of this tuple struct pattern, if it exists.
      */
     Path getPath() { tuple_struct_pat_paths(this, result) }
   }
 
   /**
    * INTERNAL: Do not use.
-   * A TupleType. For example:
+   * A TupleTypeRepr. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class TupleType extends @tuple_type, TypeRef {
-    override string toString() { result = "TupleType" }
+  class TupleTypeRepr extends @tuple_type_repr, TypeRepr {
+    override string toString() { result = "TupleTypeRepr" }
 
     /**
-     * Gets the `index`th field of this tuple type (0-based).
+     * Gets the `index`th field of this tuple type representation (0-based).
      */
-    TypeRef getField(int index) { tuple_type_fields(this, index, result) }
+    TypeRepr getField(int index) { tuple_type_repr_fields(this, index, result) }
   }
 
   /**
@@ -3011,9 +2877,9 @@ module Raw {
     override string toString() { result = "TypeArg" }
 
     /**
-     * Gets the ty of this type argument, if it exists.
+     * Gets the type representation of this type argument, if it exists.
      */
-    TypeRef getTy() { type_arg_ties(this, result) }
+    TypeRepr getTypeRepr() { type_arg_type_reprs(this, result) }
   }
 
   /**
@@ -3034,7 +2900,7 @@ module Raw {
     /**
      * Gets the default type of this type parameter, if it exists.
      */
-    TypeRef getDefaultType() { type_param_default_types(this, result) }
+    TypeRepr getDefaultType() { type_param_default_types(this, result) }
 
     /**
      * Gets the name of this type parameter, if it exists.
@@ -3065,33 +2931,38 @@ module Raw {
 
   /**
    * INTERNAL: Do not use.
-   * A WhileExpr. For example:
+   * A Variant. For example:
    * ```rust
    * todo!()
    * ```
    */
-  class WhileExpr extends @while_expr, Expr {
-    override string toString() { result = "WhileExpr" }
+  class Variant extends @variant, Addressable {
+    override string toString() { result = "Variant" }
 
     /**
-     * Gets the `index`th attr of this while expression (0-based).
+     * Gets the `index`th attr of this variant (0-based).
      */
-    Attr getAttr(int index) { while_expr_attrs(this, index, result) }
+    Attr getAttr(int index) { variant_attrs(this, index, result) }
 
     /**
-     * Gets the condition of this while expression, if it exists.
+     * Gets the expression of this variant, if it exists.
      */
-    Expr getCondition() { while_expr_conditions(this, result) }
+    Expr getExpr() { variant_exprs(this, result) }
 
     /**
-     * Gets the label of this while expression, if it exists.
+     * Gets the field list of this variant, if it exists.
      */
-    Label getLabel() { while_expr_labels(this, result) }
+    FieldList getFieldList() { variant_field_lists(this, result) }
 
     /**
-     * Gets the loop body of this while expression, if it exists.
+     * Gets the name of this variant, if it exists.
      */
-    BlockExpr getLoopBody() { while_expr_loop_bodies(this, result) }
+    Name getName() { variant_names(this, result) }
+
+    /**
+     * Gets the visibility of this variant, if it exists.
+     */
+    Visibility getVisibility() { variant_visibilities(this, result) }
   }
 
   /**
@@ -3152,6 +3023,65 @@ module Raw {
     Expr getExpr() { yield_expr_exprs(this, result) }
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * A block expression. For example:
+   * ```rust
+   * {
+   *     let x = 42;
+   * }
+   * ```
+   * ```rust
+   * 'label: {
+   *     let x = 42;
+   *     x
+   * }
+   * ```
+   */
+  class BlockExpr extends @block_expr, LabelableExpr {
+    override string toString() { result = "BlockExpr" }
+
+    /**
+     * Gets the `index`th attr of this block expression (0-based).
+     */
+    Attr getAttr(int index) { block_expr_attrs(this, index, result) }
+
+    /**
+     * Holds if this block expression is async.
+     */
+    predicate isAsync() { block_expr_is_async(this) }
+
+    /**
+     * Holds if this block expression is const.
+     */
+    predicate isConst() { block_expr_is_const(this) }
+
+    /**
+     * Holds if this block expression is gen.
+     */
+    predicate isGen() { block_expr_is_gen(this) }
+
+    /**
+     * Holds if this block expression is move.
+     */
+    predicate isMove() { block_expr_is_move(this) }
+
+    /**
+     * Holds if this block expression is try.
+     */
+    predicate isTry() { block_expr_is_try(this) }
+
+    /**
+     * Holds if this block expression is unsafe.
+     */
+    predicate isUnsafe() { block_expr_is_unsafe(this) }
+
+    /**
+     * Gets the statement list of this block expression, if it exists.
+     */
+    StmtList getStmtList() { block_expr_stmt_lists(this, result) }
+  }
+
   /**
    * INTERNAL: Do not use.
    * A function call expression. For example:
@@ -3166,9 +3096,9 @@ module Raw {
     override string toString() { result = "CallExpr" }
 
     /**
-     * Gets the expression of this call expression, if it exists.
+     * Gets the function of this call expression, if it exists.
      */
-    Expr getExpr() { call_expr_exprs(this, result) }
+    Expr getFunction() { call_expr_functions(this, result) }
   }
 
   /**
@@ -3207,9 +3137,9 @@ module Raw {
     Name getName() { const_names(this, result) }
 
     /**
-     * Gets the ty of this const, if it exists.
+     * Gets the type representation of this const, if it exists.
      */
-    TypeRef getTy() { const_ties(this, result) }
+    TypeRepr getTypeRepr() { const_type_reprs(this, result) }
 
     /**
      * Gets the visibility of this const, if it exists.
@@ -3384,7 +3314,7 @@ module Raw {
     /**
      * Gets the ret type of this function, if it exists.
      */
-    RetType getRetType() { function_ret_types(this, result) }
+    RetTypeRepr getRetType() { function_ret_types(this, result) }
 
     /**
      * Gets the visibility of this function, if it exists.
@@ -3440,12 +3370,12 @@ module Raw {
     /**
      * Gets the self ty of this impl, if it exists.
      */
-    TypeRef getSelfTy() { impl_self_ties(this, result) }
+    TypeRepr getSelfTy() { impl_self_ties(this, result) }
 
     /**
      * Gets the trait of this impl, if it exists.
      */
-    TypeRef getTrait() { impl_traits(this, result) }
+    TypeRepr getTrait() { impl_traits(this, result) }
 
     /**
      * Gets the visibility of this impl, if it exists.
@@ -3458,6 +3388,17 @@ module Raw {
     WhereClause getWhereClause() { impl_where_clauses(this, result) }
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * The base class for expressions that loop (`LoopExpr`, `ForExpr` or `WhileExpr`).
+   */
+  class LoopingExpr extends @looping_expr, LabelableExpr {
+    /**
+     * Gets the loop body of this looping expression, if it exists.
+     */
+    BlockExpr getLoopBody() { looping_expr_loop_bodies(this, result) }
+  }
+
   /**
    * INTERNAL: Do not use.
    * A MacroCall. For example:
@@ -3626,7 +3567,7 @@ module Raw {
    * let x = variable;
    * let x = foo::bar;
    * let y = <T>::foo;
-   * let z = <TypeRef as Trait>::foo;
+   * let z = <TypeRepr as Trait>::foo;
    * ```
    */
   class PathExpr extends @path_expr, PathExprBase {
@@ -3679,9 +3620,9 @@ module Raw {
     Name getName() { static_names(this, result) }
 
     /**
-     * Gets the ty of this static, if it exists.
+     * Gets the type representation of this static, if it exists.
      */
-    TypeRef getTy() { static_ties(this, result) }
+    TypeRepr getTypeRepr() { static_type_reprs(this, result) }
 
     /**
      * Gets the visibility of this static, if it exists.
@@ -3864,9 +3805,9 @@ module Raw {
     Name getName() { type_alias_names(this, result) }
 
     /**
-     * Gets the ty of this type alias, if it exists.
+     * Gets the type representation of this type alias, if it exists.
      */
-    TypeRef getTy() { type_alias_ties(this, result) }
+    TypeRepr getTypeRepr() { type_alias_type_reprs(this, result) }
 
     /**
      * Gets the type bound list of this type alias, if it exists.
@@ -3950,4 +3891,85 @@ module Raw {
      */
     Visibility getVisibility() { use_visibilities(this, result) }
   }
+
+  /**
+   * INTERNAL: Do not use.
+   * A ForExpr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class ForExpr extends @for_expr, LoopingExpr {
+    override string toString() { result = "ForExpr" }
+
+    /**
+     * Gets the `index`th attr of this for expression (0-based).
+     */
+    Attr getAttr(int index) { for_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the iterable of this for expression, if it exists.
+     */
+    Expr getIterable() { for_expr_iterables(this, result) }
+
+    /**
+     * Gets the pattern of this for expression, if it exists.
+     */
+    Pat getPat() { for_expr_pats(this, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A loop expression. For example:
+   * ```rust
+   * loop {
+   *     println!("Hello, world (again)!");
+   * };
+   * ```
+   * ```rust
+   * 'label: loop {
+   *     println!("Hello, world (once)!");
+   *     break 'label;
+   * };
+   * ```
+   * ```rust
+   * let mut x = 0;
+   * loop {
+   *     if x < 10 {
+   *         x += 1;
+   *     } else {
+   *         break;
+   *     }
+   * };
+   * ```
+   */
+  class LoopExpr extends @loop_expr, LoopingExpr {
+    override string toString() { result = "LoopExpr" }
+
+    /**
+     * Gets the `index`th attr of this loop expression (0-based).
+     */
+    Attr getAttr(int index) { loop_expr_attrs(this, index, result) }
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * A WhileExpr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   */
+  class WhileExpr extends @while_expr, LoopingExpr {
+    override string toString() { result = "WhileExpr" }
+
+    /**
+     * Gets the `index`th attr of this while expression (0-based).
+     */
+    Attr getAttr(int index) { while_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the condition of this while expression, if it exists.
+     */
+    Expr getCondition() { while_expr_conditions(this, result) }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordField.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordField.qll
index c5fcb867b89..aa840aafdcd 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordField.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordField.qll
@@ -9,7 +9,7 @@ private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
 import codeql.rust.elements.Attr
 import codeql.rust.elements.Name
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.Visibility
 
 /**
@@ -62,17 +62,19 @@ module Generated {
     final predicate hasName() { exists(this.getName()) }
 
     /**
-     * Gets the ty of this record field, if it exists.
+     * Gets the type representation of this record field, if it exists.
      */
-    TypeRef getTy() {
+    TypeRepr getTypeRepr() {
       result =
-        Synth::convertTypeRefFromRaw(Synth::convertRecordFieldToRaw(this).(Raw::RecordField).getTy())
+        Synth::convertTypeReprFromRaw(Synth::convertRecordFieldToRaw(this)
+              .(Raw::RecordField)
+              .getTypeRepr())
     }
 
     /**
-     * Holds if `getTy()` exists.
+     * Holds if `getTypeRepr()` exists.
      */
-    final predicate hasTy() { exists(this.getTy()) }
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
 
     /**
      * Gets the visibility of this record field, if it exists.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPat.qll
index b4aa66a71a0..2aa2abad28a 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPat.qll
@@ -30,7 +30,7 @@ module Generated {
     override string getAPrimaryQlClass() { result = "RecordPat" }
 
     /**
-     * Gets the path of this record pat, if it exists.
+     * Gets the path of this record pattern, if it exists.
      */
     Path getPath() {
       result =
@@ -43,7 +43,7 @@ module Generated {
     final predicate hasPath() { exists(this.getPath()) }
 
     /**
-     * Gets the record pat field list of this record pat, if it exists.
+     * Gets the record pattern field list of this record pattern, if it exists.
      */
     RecordPatFieldList getRecordPatFieldList() {
       result =
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatField.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatField.qll
index 942df1972e4..557862754f2 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatField.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatField.qll
@@ -28,7 +28,7 @@ module Generated {
     override string getAPrimaryQlClass() { result = "RecordPatField" }
 
     /**
-     * Gets the `index`th attr of this record pat field (0-based).
+     * Gets the `index`th attr of this record pattern field (0-based).
      */
     Attr getAttr(int index) {
       result =
@@ -38,17 +38,17 @@ module Generated {
     }
 
     /**
-     * Gets any of the attrs of this record pat field.
+     * Gets any of the attrs of this record pattern field.
      */
     final Attr getAnAttr() { result = this.getAttr(_) }
 
     /**
-     * Gets the number of attrs of this record pat field.
+     * Gets the number of attrs of this record pattern field.
      */
     final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
 
     /**
-     * Gets the name reference of this record pat field, if it exists.
+     * Gets the name reference of this record pattern field, if it exists.
      */
     NameRef getNameRef() {
       result =
@@ -63,7 +63,7 @@ module Generated {
     final predicate hasNameRef() { exists(this.getNameRef()) }
 
     /**
-     * Gets the pat of this record pat field, if it exists.
+     * Gets the pattern of this record pattern field, if it exists.
      */
     Pat getPat() {
       result =
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatFieldList.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatFieldList.qll
index 45220797706..e7733f22f34 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatFieldList.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RecordPatFieldList.qll
@@ -27,7 +27,7 @@ module Generated {
     override string getAPrimaryQlClass() { result = "RecordPatFieldList" }
 
     /**
-     * Gets the `index`th field of this record pat field list (0-based).
+     * Gets the `index`th field of this record pattern field list (0-based).
      */
     RecordPatField getField(int index) {
       result =
@@ -37,17 +37,17 @@ module Generated {
     }
 
     /**
-     * Gets any of the fields of this record pat field list.
+     * Gets any of the fields of this record pattern field list.
      */
     final RecordPatField getAField() { result = this.getField(_) }
 
     /**
-     * Gets the number of fields of this record pat field list.
+     * Gets the number of fields of this record pattern field list.
      */
     final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
 
     /**
-     * Gets the rest pat of this record pat field list, if it exists.
+     * Gets the rest pattern of this record pattern field list, if it exists.
      */
     RestPat getRestPat() {
       result =
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RefPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RefPat.qll
index 197030ea1cb..b954663a2db 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RefPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RefPat.qll
@@ -29,12 +29,12 @@ module Generated {
     override string getAPrimaryQlClass() { result = "RefPat" }
 
     /**
-     * Holds if this reference pat is mut.
+     * Holds if this reference pattern is mut.
      */
     predicate isMut() { Synth::convertRefPatToRaw(this).(Raw::RefPat).isMut() }
 
     /**
-     * Gets the pat of this reference pat, if it exists.
+     * Gets the pattern of this reference pattern, if it exists.
      */
     Pat getPat() {
       result = Synth::convertPatFromRaw(Synth::convertRefPatToRaw(this).(Raw::RefPat).getPat())
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RefType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RefType.qll
deleted file mode 100644
index ce0bbf1e416..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RefType.qll
+++ /dev/null
@@ -1,59 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `RefType`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.Lifetime
-import codeql.rust.elements.TypeRef
-import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `RefType` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A RefType. For example:
-   * ```rust
-   * todo!()
-   * ```
-   * INTERNAL: Do not reference the `Generated::RefType` class directly.
-   * Use the subclass `RefType`, where the following predicates are available.
-   */
-  class RefType extends Synth::TRefType, TypeRefImpl::TypeRef {
-    override string getAPrimaryQlClass() { result = "RefType" }
-
-    /**
-     * Holds if this reference type is mut.
-     */
-    predicate isMut() { Synth::convertRefTypeToRaw(this).(Raw::RefType).isMut() }
-
-    /**
-     * Gets the lifetime of this reference type, if it exists.
-     */
-    Lifetime getLifetime() {
-      result =
-        Synth::convertLifetimeFromRaw(Synth::convertRefTypeToRaw(this).(Raw::RefType).getLifetime())
-    }
-
-    /**
-     * Holds if `getLifetime()` exists.
-     */
-    final predicate hasLifetime() { exists(this.getLifetime()) }
-
-    /**
-     * Gets the ty of this reference type, if it exists.
-     */
-    TypeRef getTy() {
-      result = Synth::convertTypeRefFromRaw(Synth::convertRefTypeToRaw(this).(Raw::RefType).getTy())
-    }
-
-    /**
-     * Holds if `getTy()` exists.
-     */
-    final predicate hasTy() { exists(this.getTy()) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RefTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RefTypeRepr.qll
new file mode 100644
index 00000000000..6c013f9356d
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RefTypeRepr.qll
@@ -0,0 +1,64 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `RefTypeRepr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.Lifetime
+import codeql.rust.elements.TypeRepr
+import codeql.rust.elements.internal.TypeReprImpl::Impl as TypeReprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `RefTypeRepr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A RefTypeRepr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::RefTypeRepr` class directly.
+   * Use the subclass `RefTypeRepr`, where the following predicates are available.
+   */
+  class RefTypeRepr extends Synth::TRefTypeRepr, TypeReprImpl::TypeRepr {
+    override string getAPrimaryQlClass() { result = "RefTypeRepr" }
+
+    /**
+     * Holds if this reference type representation is mut.
+     */
+    predicate isMut() { Synth::convertRefTypeReprToRaw(this).(Raw::RefTypeRepr).isMut() }
+
+    /**
+     * Gets the lifetime of this reference type representation, if it exists.
+     */
+    Lifetime getLifetime() {
+      result =
+        Synth::convertLifetimeFromRaw(Synth::convertRefTypeReprToRaw(this)
+              .(Raw::RefTypeRepr)
+              .getLifetime())
+    }
+
+    /**
+     * Holds if `getLifetime()` exists.
+     */
+    final predicate hasLifetime() { exists(this.getLifetime()) }
+
+    /**
+     * Gets the type representation of this reference type representation, if it exists.
+     */
+    TypeRepr getTypeRepr() {
+      result =
+        Synth::convertTypeReprFromRaw(Synth::convertRefTypeReprToRaw(this)
+              .(Raw::RefTypeRepr)
+              .getTypeRepr())
+    }
+
+    /**
+     * Holds if `getTypeRepr()` exists.
+     */
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RestPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RestPat.qll
index 055c6476f4c..06d2947ee8a 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RestPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RestPat.qll
@@ -26,7 +26,7 @@ module Generated {
     override string getAPrimaryQlClass() { result = "RestPat" }
 
     /**
-     * Gets the `index`th attr of this rest pat (0-based).
+     * Gets the `index`th attr of this rest pattern (0-based).
      */
     Attr getAttr(int index) {
       result =
@@ -34,12 +34,12 @@ module Generated {
     }
 
     /**
-     * Gets any of the attrs of this rest pat.
+     * Gets any of the attrs of this rest pattern.
      */
     final Attr getAnAttr() { result = this.getAttr(_) }
 
     /**
-     * Gets the number of attrs of this rest pat.
+     * Gets the number of attrs of this rest pattern.
      */
     final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RetType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RetType.qll
deleted file mode 100644
index 3b916d7d20d..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/RetType.qll
+++ /dev/null
@@ -1,40 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `RetType`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
-import codeql.rust.elements.TypeRef
-
-/**
- * INTERNAL: This module contains the fully generated definition of `RetType` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A RetType. For example:
-   * ```rust
-   * todo!()
-   * ```
-   * INTERNAL: Do not reference the `Generated::RetType` class directly.
-   * Use the subclass `RetType`, where the following predicates are available.
-   */
-  class RetType extends Synth::TRetType, AstNodeImpl::AstNode {
-    override string getAPrimaryQlClass() { result = "RetType" }
-
-    /**
-     * Gets the ty of this ret type, if it exists.
-     */
-    TypeRef getTy() {
-      result = Synth::convertTypeRefFromRaw(Synth::convertRetTypeToRaw(this).(Raw::RetType).getTy())
-    }
-
-    /**
-     * Holds if `getTy()` exists.
-     */
-    final predicate hasTy() { exists(this.getTy()) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/RetTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/RetTypeRepr.qll
new file mode 100644
index 00000000000..352f4bcb960
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/RetTypeRepr.qll
@@ -0,0 +1,43 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `RetTypeRepr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.TypeRepr
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `RetTypeRepr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A RetTypeRepr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::RetTypeRepr` class directly.
+   * Use the subclass `RetTypeRepr`, where the following predicates are available.
+   */
+  class RetTypeRepr extends Synth::TRetTypeRepr, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "RetTypeRepr" }
+
+    /**
+     * Gets the type representation of this ret type representation, if it exists.
+     */
+    TypeRepr getTypeRepr() {
+      result =
+        Synth::convertTypeReprFromRaw(Synth::convertRetTypeReprToRaw(this)
+              .(Raw::RetTypeRepr)
+              .getTypeRepr())
+    }
+
+    /**
+     * Holds if `getTypeRepr()` exists.
+     */
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/SelfParam.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/SelfParam.qll
index 243d04e9bb7..b2cc6e4b0c4 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/SelfParam.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/SelfParam.qll
@@ -6,11 +6,9 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
-import codeql.rust.elements.Attr
 import codeql.rust.elements.Lifetime
 import codeql.rust.elements.Name
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.internal.ParamBaseImpl::Impl as ParamBaseImpl
 
 /**
  * INTERNAL: This module contains the fully generated definition of `SelfParam` and should not
@@ -18,34 +16,18 @@ import codeql.rust.elements.TypeRef
  */
 module Generated {
   /**
-   * A SelfParam. For example:
+   * A `self` parameter. For example `self` in:
    * ```rust
-   * todo!()
+   * fn push(&mut self, value: T) {
+   *   // ...
+   * }
    * ```
    * INTERNAL: Do not reference the `Generated::SelfParam` class directly.
    * Use the subclass `SelfParam`, where the following predicates are available.
    */
-  class SelfParam extends Synth::TSelfParam, AstNodeImpl::AstNode {
+  class SelfParam extends Synth::TSelfParam, ParamBaseImpl::ParamBase {
     override string getAPrimaryQlClass() { result = "SelfParam" }
 
-    /**
-     * Gets the `index`th attr of this self parameter (0-based).
-     */
-    Attr getAttr(int index) {
-      result =
-        Synth::convertAttrFromRaw(Synth::convertSelfParamToRaw(this).(Raw::SelfParam).getAttr(index))
-    }
-
-    /**
-     * Gets any of the attrs of this self parameter.
-     */
-    final Attr getAnAttr() { result = this.getAttr(_) }
-
-    /**
-     * Gets the number of attrs of this self parameter.
-     */
-    final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
-
     /**
      * Holds if this self parameter is mut.
      */
@@ -78,18 +60,5 @@ module Generated {
      * Holds if `getName()` exists.
      */
     final predicate hasName() { exists(this.getName()) }
-
-    /**
-     * Gets the ty of this self parameter, if it exists.
-     */
-    TypeRef getTy() {
-      result =
-        Synth::convertTypeRefFromRaw(Synth::convertSelfParamToRaw(this).(Raw::SelfParam).getTy())
-    }
-
-    /**
-     * Holds if `getTy()` exists.
-     */
-    final predicate hasTy() { exists(this.getTy()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/SlicePat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/SlicePat.qll
index 1f54445a659..2a252124872 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/SlicePat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/SlicePat.qll
@@ -30,7 +30,7 @@ module Generated {
     override string getAPrimaryQlClass() { result = "SlicePat" }
 
     /**
-     * Gets the `index`th pat of this slice pat (0-based).
+     * Gets the `index`th pattern of this slice pattern (0-based).
      */
     Pat getPat(int index) {
       result =
@@ -38,12 +38,12 @@ module Generated {
     }
 
     /**
-     * Gets any of the pats of this slice pat.
+     * Gets any of the patterns of this slice pattern.
      */
     final Pat getAPat() { result = this.getPat(_) }
 
     /**
-     * Gets the number of pats of this slice pat.
+     * Gets the number of patterns of this slice pattern.
      */
     final int getNumberOfPats() { result = count(int i | exists(this.getPat(i))) }
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/SliceType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/SliceType.qll
deleted file mode 100644
index 5576f34e13d..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/SliceType.qll
+++ /dev/null
@@ -1,41 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `SliceType`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.TypeRef
-import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `SliceType` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A SliceType. For example:
-   * ```rust
-   * todo!()
-   * ```
-   * INTERNAL: Do not reference the `Generated::SliceType` class directly.
-   * Use the subclass `SliceType`, where the following predicates are available.
-   */
-  class SliceType extends Synth::TSliceType, TypeRefImpl::TypeRef {
-    override string getAPrimaryQlClass() { result = "SliceType" }
-
-    /**
-     * Gets the ty of this slice type, if it exists.
-     */
-    TypeRef getTy() {
-      result =
-        Synth::convertTypeRefFromRaw(Synth::convertSliceTypeToRaw(this).(Raw::SliceType).getTy())
-    }
-
-    /**
-     * Holds if `getTy()` exists.
-     */
-    final predicate hasTy() { exists(this.getTy()) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/SliceTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/SliceTypeRepr.qll
new file mode 100644
index 00000000000..6d47596b7d7
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/SliceTypeRepr.qll
@@ -0,0 +1,43 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `SliceTypeRepr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.TypeRepr
+import codeql.rust.elements.internal.TypeReprImpl::Impl as TypeReprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `SliceTypeRepr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A SliceTypeRepr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::SliceTypeRepr` class directly.
+   * Use the subclass `SliceTypeRepr`, where the following predicates are available.
+   */
+  class SliceTypeRepr extends Synth::TSliceTypeRepr, TypeReprImpl::TypeRepr {
+    override string getAPrimaryQlClass() { result = "SliceTypeRepr" }
+
+    /**
+     * Gets the type representation of this slice type representation, if it exists.
+     */
+    TypeRepr getTypeRepr() {
+      result =
+        Synth::convertTypeReprFromRaw(Synth::convertSliceTypeReprToRaw(this)
+              .(Raw::SliceTypeRepr)
+              .getTypeRepr())
+    }
+
+    /**
+     * Holds if `getTypeRepr()` exists.
+     */
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Static.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Static.qll
index a7d5828ee98..8531b6c58a0 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Static.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Static.qll
@@ -11,7 +11,7 @@ import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExternItemImpl::Impl as ExternItemImpl
 import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
 import codeql.rust.elements.Name
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.Visibility
 
 /**
@@ -83,16 +83,17 @@ module Generated {
     final predicate hasName() { exists(this.getName()) }
 
     /**
-     * Gets the ty of this static, if it exists.
+     * Gets the type representation of this static, if it exists.
      */
-    TypeRef getTy() {
-      result = Synth::convertTypeRefFromRaw(Synth::convertStaticToRaw(this).(Raw::Static).getTy())
+    TypeRepr getTypeRepr() {
+      result =
+        Synth::convertTypeReprFromRaw(Synth::convertStaticToRaw(this).(Raw::Static).getTypeRepr())
     }
 
     /**
-     * Holds if `getTy()` exists.
+     * Holds if `getTypeRepr()` exists.
      */
-    final predicate hasTy() { exists(this.getTy()) }
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
 
     /**
      * Gets the visibility of this static, if it exists.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll
index 927ba1f238d..7e13da92fd7 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll
@@ -25,11 +25,19 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TArrayExpr(Raw::ArrayExpr id) { constructArrayExpr(id) } or
+    TArrayExprInternal(Raw::ArrayExprInternal id) { constructArrayExprInternal(id) } or
     /**
      * INTERNAL: Do not use.
      */
-    TArrayType(Raw::ArrayType id) { constructArrayType(id) } or
+    TArrayListExpr(Raw::ArrayExprInternal id) { constructArrayListExpr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TArrayRepeatExpr(Raw::ArrayExprInternal id) { constructArrayRepeatExpr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TArrayTypeRepr(Raw::ArrayTypeRepr id) { constructArrayTypeRepr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -113,7 +121,7 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TDynTraitType(Raw::DynTraitType id) { constructDynTraitType(id) } or
+    TDynTraitTypeRepr(Raw::DynTraitTypeRepr id) { constructDynTraitTypeRepr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -134,6 +142,10 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TExternItemList(Raw::ExternItemList id) { constructExternItemList(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TExtractorStep(Raw::ExtractorStep id) { constructExtractorStep(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -141,7 +153,7 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TFnPtrType(Raw::FnPtrType id) { constructFnPtrType(id) } or
+    TFnPtrTypeRepr(Raw::FnPtrTypeRepr id) { constructFnPtrTypeRepr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -149,7 +161,7 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TForType(Raw::ForType id) { constructForType(id) } or
+    TForTypeRepr(Raw::ForTypeRepr id) { constructForTypeRepr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -205,7 +217,7 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TImplTraitType(Raw::ImplTraitType id) { constructImplTraitType(id) } or
+    TImplTraitTypeRepr(Raw::ImplTraitTypeRepr id) { constructImplTraitTypeRepr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -213,7 +225,7 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TInferType(Raw::InferType id) { constructInferType(id) } or
+    TInferTypeRepr(Raw::InferTypeRepr id) { constructInferTypeRepr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -289,7 +301,7 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TMacroType(Raw::MacroType id) { constructMacroType(id) } or
+    TMacroTypeRepr(Raw::MacroTypeRepr id) { constructMacroTypeRepr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -333,7 +345,7 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TNeverType(Raw::NeverType id) { constructNeverType(id) } or
+    TNeverTypeRepr(Raw::NeverTypeRepr id) { constructNeverTypeRepr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -361,7 +373,7 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TParenType(Raw::ParenType id) { constructParenType(id) } or
+    TParenTypeRepr(Raw::ParenTypeRepr id) { constructParenTypeRepr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -381,7 +393,7 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TPathType(Raw::PathType id) { constructPathType(id) } or
+    TPathTypeRepr(Raw::PathTypeRepr id) { constructPathTypeRepr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -389,7 +401,7 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TPtrType(Raw::PtrType id) { constructPtrType(id) } or
+    TPtrTypeRepr(Raw::PtrTypeRepr id) { constructPtrTypeRepr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -441,7 +453,7 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TRefType(Raw::RefType id) { constructRefType(id) } or
+    TRefTypeRepr(Raw::RefTypeRepr id) { constructRefTypeRepr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -453,7 +465,7 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TRetType(Raw::RetType id) { constructRetType(id) } or
+    TRetTypeRepr(Raw::RetTypeRepr id) { constructRetTypeRepr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -473,7 +485,7 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TSliceType(Raw::SliceType id) { constructSliceType(id) } or
+    TSliceTypeRepr(Raw::SliceTypeRepr id) { constructSliceTypeRepr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -529,7 +541,7 @@ module Synth {
     /**
      * INTERNAL: Do not use.
      */
-    TTupleType(Raw::TupleType id) { constructTupleType(id) } or
+    TTupleTypeRepr(Raw::TupleTypeRepr id) { constructTupleTypeRepr(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -611,6 +623,16 @@ module Synth {
      */
     TYieldExpr(Raw::YieldExpr id) { constructYieldExpr(id) }
 
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TAddressable = TItem or TVariant;
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TArrayExpr = TArrayListExpr or TArrayRepeatExpr;
+
   /**
    * INTERNAL: Do not use.
    */
@@ -620,15 +642,15 @@ module Synth {
    * INTERNAL: Do not use.
    */
   class TAstNode =
-    TAbi or TArgList or TAssocItem or TAssocItemList or TAttr or TCallable or TClosureBinder or
-        TExpr or TExternItem or TExternItemList or TFieldList or TFormatArgsArg or TGenericArg or
-        TGenericArgList or TGenericParam or TGenericParamList or TItemList or TLabel or TLetElse or
-        TLifetime or TMacroItems or TMacroStmts or TMatchArm or TMatchArmList or TMatchGuard or
-        TMeta or TName or TNameRef or TParam or TParamList or TPat or TPathSegment or
-        TRecordExprField or TRecordExprFieldList or TRecordField or TRecordPatField or
-        TRecordPatFieldList or TRename or TResolvable or TRetType or TReturnTypeSyntax or
-        TSelfParam or TSourceFile or TStmt or TStmtList or TToken or TTokenTree or TTupleField or
-        TTypeBound or TTypeBoundList or TTypeRef or TUseTree or TUseTreeList or TVariant or
+    TAbi or TAddressable or TArgList or TAssocItem or TAssocItemList or TAttr or TCallable or
+        TClosureBinder or TExpr or TExternItem or TExternItemList or TFieldList or TFormatArgsArg or
+        TGenericArg or TGenericArgList or TGenericParam or TGenericParamList or TItemList or
+        TLabel or TLetElse or TLifetime or TMacroItems or TMacroStmts or TMatchArm or
+        TMatchArmList or TMatchGuard or TMeta or TName or TNameRef or TParamBase or TParamList or
+        TPat or TPathSegment or TRecordExprField or TRecordExprFieldList or TRecordField or
+        TRecordPatField or TRecordPatFieldList or TRename or TResolvable or TRetTypeRepr or
+        TReturnTypeSyntax or TSourceFile or TStmt or TStmtList or TToken or TTokenTree or
+        TTupleField or TTypeBound or TTypeBoundList or TTypeRepr or TUseTree or TUseTreeList or
         TVariantList or TVisibility or TWhereClause or TWherePred;
 
   /**
@@ -645,12 +667,12 @@ module Synth {
    * INTERNAL: Do not use.
    */
   class TExpr =
-    TArrayExpr or TAsmExpr or TAwaitExpr or TBecomeExpr or TBinaryExpr or TBlockExpr or
+    TArrayExpr or TArrayExprInternal or TAsmExpr or TAwaitExpr or TBecomeExpr or TBinaryExpr or
         TBreakExpr or TCallExprBase or TCastExpr or TClosureExpr or TContinueExpr or TFieldExpr or
-        TForExpr or TFormatArgsExpr or TIfExpr or TIndexExpr or TLetExpr or TLiteralExpr or
-        TLoopExpr or TMacroExpr or TMatchExpr or TOffsetOfExpr or TParenExpr or TPathExprBase or
-        TPrefixExpr or TRangeExpr or TRecordExpr or TRefExpr or TReturnExpr or TTryExpr or
-        TTupleExpr or TUnderscoreExpr or TWhileExpr or TYeetExpr or TYieldExpr;
+        TFormatArgsExpr or TIfExpr or TIndexExpr or TLabelableExpr or TLetExpr or TLiteralExpr or
+        TMacroExpr or TMatchExpr or TOffsetOfExpr or TParenExpr or TPathExprBase or TPrefixExpr or
+        TRangeExpr or TRecordExpr or TRefExpr or TReturnExpr or TTryExpr or TTupleExpr or
+        TUnderscoreExpr or TYeetExpr or TYieldExpr;
 
   /**
    * INTERNAL: Do not use.
@@ -680,11 +702,26 @@ module Synth {
         TMacroDef or TMacroRules or TModule or TStatic or TStruct or TTrait or TTraitAlias or
         TTypeAlias or TUnion or TUse;
 
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TLabelableExpr = TBlockExpr or TLoopingExpr;
+
   /**
    * INTERNAL: Do not use.
    */
   class TLocatable = TAstNode or TFormat or TFormatArgument;
 
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TLoopingExpr = TForExpr or TLoopExpr or TWhileExpr;
+
+  /**
+   * INTERNAL: Do not use.
+   */
+  class TParamBase = TParam or TSelfParam;
+
   /**
    * INTERNAL: Do not use.
    */
@@ -716,10 +753,10 @@ module Synth {
   /**
    * INTERNAL: Do not use.
    */
-  class TTypeRef =
-    TArrayType or TDynTraitType or TFnPtrType or TForType or TImplTraitType or TInferType or
-        TMacroType or TNeverType or TParenType or TPathType or TPtrType or TRefType or TSliceType or
-        TTupleType;
+  class TTypeRepr =
+    TArrayTypeRepr or TDynTraitTypeRepr or TFnPtrTypeRepr or TForTypeRepr or TImplTraitTypeRepr or
+        TInferTypeRepr or TMacroTypeRepr or TNeverTypeRepr or TParenTypeRepr or TPathTypeRepr or
+        TPtrTypeRepr or TRefTypeRepr or TSliceTypeRepr or TTupleTypeRepr;
 
   /**
    * INTERNAL: Do not use.
@@ -740,15 +777,29 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TArrayExpr`, if possible.
+   * Converts a raw element to a synthesized `TArrayExprInternal`, if possible.
    */
-  TArrayExpr convertArrayExprFromRaw(Raw::Element e) { result = TArrayExpr(e) }
+  TArrayExprInternal convertArrayExprInternalFromRaw(Raw::Element e) {
+    result = TArrayExprInternal(e)
+  }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TArrayType`, if possible.
+   * Converts a raw element to a synthesized `TArrayListExpr`, if possible.
    */
-  TArrayType convertArrayTypeFromRaw(Raw::Element e) { result = TArrayType(e) }
+  TArrayListExpr convertArrayListExprFromRaw(Raw::Element e) { result = TArrayListExpr(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TArrayRepeatExpr`, if possible.
+   */
+  TArrayRepeatExpr convertArrayRepeatExprFromRaw(Raw::Element e) { result = TArrayRepeatExpr(e) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TArrayTypeRepr`, if possible.
+   */
+  TArrayTypeRepr convertArrayTypeReprFromRaw(Raw::Element e) { result = TArrayTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
@@ -872,9 +923,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TDynTraitType`, if possible.
+   * Converts a raw element to a synthesized `TDynTraitTypeRepr`, if possible.
    */
-  TDynTraitType convertDynTraitTypeFromRaw(Raw::Element e) { result = TDynTraitType(e) }
+  TDynTraitTypeRepr convertDynTraitTypeReprFromRaw(Raw::Element e) { result = TDynTraitTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
@@ -906,6 +957,12 @@ module Synth {
    */
   TExternItemList convertExternItemListFromRaw(Raw::Element e) { result = TExternItemList(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TExtractorStep`, if possible.
+   */
+  TExtractorStep convertExtractorStepFromRaw(Raw::Element e) { result = TExtractorStep(e) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TFieldExpr`, if possible.
@@ -914,9 +971,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TFnPtrType`, if possible.
+   * Converts a raw element to a synthesized `TFnPtrTypeRepr`, if possible.
    */
-  TFnPtrType convertFnPtrTypeFromRaw(Raw::Element e) { result = TFnPtrType(e) }
+  TFnPtrTypeRepr convertFnPtrTypeReprFromRaw(Raw::Element e) { result = TFnPtrTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
@@ -926,9 +983,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TForType`, if possible.
+   * Converts a raw element to a synthesized `TForTypeRepr`, if possible.
    */
-  TForType convertForTypeFromRaw(Raw::Element e) { result = TForType(e) }
+  TForTypeRepr convertForTypeReprFromRaw(Raw::Element e) { result = TForTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
@@ -1000,9 +1057,11 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TImplTraitType`, if possible.
+   * Converts a raw element to a synthesized `TImplTraitTypeRepr`, if possible.
    */
-  TImplTraitType convertImplTraitTypeFromRaw(Raw::Element e) { result = TImplTraitType(e) }
+  TImplTraitTypeRepr convertImplTraitTypeReprFromRaw(Raw::Element e) {
+    result = TImplTraitTypeRepr(e)
+  }
 
   /**
    * INTERNAL: Do not use.
@@ -1012,9 +1071,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TInferType`, if possible.
+   * Converts a raw element to a synthesized `TInferTypeRepr`, if possible.
    */
-  TInferType convertInferTypeFromRaw(Raw::Element e) { result = TInferType(e) }
+  TInferTypeRepr convertInferTypeReprFromRaw(Raw::Element e) { result = TInferTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
@@ -1126,9 +1185,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TMacroType`, if possible.
+   * Converts a raw element to a synthesized `TMacroTypeRepr`, if possible.
    */
-  TMacroType convertMacroTypeFromRaw(Raw::Element e) { result = TMacroType(e) }
+  TMacroTypeRepr convertMacroTypeReprFromRaw(Raw::Element e) { result = TMacroTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
@@ -1192,9 +1251,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TNeverType`, if possible.
+   * Converts a raw element to a synthesized `TNeverTypeRepr`, if possible.
    */
-  TNeverType convertNeverTypeFromRaw(Raw::Element e) { result = TNeverType(e) }
+  TNeverTypeRepr convertNeverTypeReprFromRaw(Raw::Element e) { result = TNeverTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
@@ -1234,9 +1293,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TParenType`, if possible.
+   * Converts a raw element to a synthesized `TParenTypeRepr`, if possible.
    */
-  TParenType convertParenTypeFromRaw(Raw::Element e) { result = TParenType(e) }
+  TParenTypeRepr convertParenTypeReprFromRaw(Raw::Element e) { result = TParenTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
@@ -1264,9 +1323,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TPathType`, if possible.
+   * Converts a raw element to a synthesized `TPathTypeRepr`, if possible.
    */
-  TPathType convertPathTypeFromRaw(Raw::Element e) { result = TPathType(e) }
+  TPathTypeRepr convertPathTypeReprFromRaw(Raw::Element e) { result = TPathTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
@@ -1276,9 +1335,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TPtrType`, if possible.
+   * Converts a raw element to a synthesized `TPtrTypeRepr`, if possible.
    */
-  TPtrType convertPtrTypeFromRaw(Raw::Element e) { result = TPtrType(e) }
+  TPtrTypeRepr convertPtrTypeReprFromRaw(Raw::Element e) { result = TPtrTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
@@ -1358,9 +1417,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TRefType`, if possible.
+   * Converts a raw element to a synthesized `TRefTypeRepr`, if possible.
    */
-  TRefType convertRefTypeFromRaw(Raw::Element e) { result = TRefType(e) }
+  TRefTypeRepr convertRefTypeReprFromRaw(Raw::Element e) { result = TRefTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
@@ -1376,9 +1435,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TRetType`, if possible.
+   * Converts a raw element to a synthesized `TRetTypeRepr`, if possible.
    */
-  TRetType convertRetTypeFromRaw(Raw::Element e) { result = TRetType(e) }
+  TRetTypeRepr convertRetTypeReprFromRaw(Raw::Element e) { result = TRetTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
@@ -1406,9 +1465,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TSliceType`, if possible.
+   * Converts a raw element to a synthesized `TSliceTypeRepr`, if possible.
    */
-  TSliceType convertSliceTypeFromRaw(Raw::Element e) { result = TSliceType(e) }
+  TSliceTypeRepr convertSliceTypeReprFromRaw(Raw::Element e) { result = TSliceTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
@@ -1490,9 +1549,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TTupleType`, if possible.
+   * Converts a raw element to a synthesized `TTupleTypeRepr`, if possible.
    */
-  TTupleType convertTupleTypeFromRaw(Raw::Element e) { result = TTupleType(e) }
+  TTupleTypeRepr convertTupleTypeReprFromRaw(Raw::Element e) { result = TTupleTypeRepr(e) }
 
   /**
    * INTERNAL: Do not use.
@@ -1614,6 +1673,26 @@ module Synth {
    */
   TYieldExpr convertYieldExprFromRaw(Raw::Element e) { result = TYieldExpr(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TAddressable`, if possible.
+   */
+  TAddressable convertAddressableFromRaw(Raw::Element e) {
+    result = convertItemFromRaw(e)
+    or
+    result = convertVariantFromRaw(e)
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TArrayExpr`, if possible.
+   */
+  TArrayExpr convertArrayExprFromRaw(Raw::Element e) {
+    result = convertArrayListExprFromRaw(e)
+    or
+    result = convertArrayRepeatExprFromRaw(e)
+  }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TAssocItem`, if possible.
@@ -1635,6 +1714,8 @@ module Synth {
   TAstNode convertAstNodeFromRaw(Raw::Element e) {
     result = convertAbiFromRaw(e)
     or
+    result = convertAddressableFromRaw(e)
+    or
     result = convertArgListFromRaw(e)
     or
     result = convertAssocItemFromRaw(e)
@@ -1689,7 +1770,7 @@ module Synth {
     or
     result = convertNameRefFromRaw(e)
     or
-    result = convertParamFromRaw(e)
+    result = convertParamBaseFromRaw(e)
     or
     result = convertParamListFromRaw(e)
     or
@@ -1711,12 +1792,10 @@ module Synth {
     or
     result = convertResolvableFromRaw(e)
     or
-    result = convertRetTypeFromRaw(e)
+    result = convertRetTypeReprFromRaw(e)
     or
     result = convertReturnTypeSyntaxFromRaw(e)
     or
-    result = convertSelfParamFromRaw(e)
-    or
     result = convertSourceFileFromRaw(e)
     or
     result = convertStmtFromRaw(e)
@@ -1733,14 +1812,12 @@ module Synth {
     or
     result = convertTypeBoundListFromRaw(e)
     or
-    result = convertTypeRefFromRaw(e)
+    result = convertTypeReprFromRaw(e)
     or
     result = convertUseTreeFromRaw(e)
     or
     result = convertUseTreeListFromRaw(e)
     or
-    result = convertVariantFromRaw(e)
-    or
     result = convertVariantListFromRaw(e)
     or
     result = convertVisibilityFromRaw(e)
@@ -1775,6 +1852,8 @@ module Synth {
    * Converts a raw DB element to a synthesized `TElement`, if possible.
    */
   TElement convertElementFromRaw(Raw::Element e) {
+    result = convertExtractorStepFromRaw(e)
+    or
     result = convertLocatableFromRaw(e)
     or
     result = convertUnextractedFromRaw(e)
@@ -1787,6 +1866,8 @@ module Synth {
   TExpr convertExprFromRaw(Raw::Element e) {
     result = convertArrayExprFromRaw(e)
     or
+    result = convertArrayExprInternalFromRaw(e)
+    or
     result = convertAsmExprFromRaw(e)
     or
     result = convertAwaitExprFromRaw(e)
@@ -1795,8 +1876,6 @@ module Synth {
     or
     result = convertBinaryExprFromRaw(e)
     or
-    result = convertBlockExprFromRaw(e)
-    or
     result = convertBreakExprFromRaw(e)
     or
     result = convertCallExprBaseFromRaw(e)
@@ -1809,20 +1888,18 @@ module Synth {
     or
     result = convertFieldExprFromRaw(e)
     or
-    result = convertForExprFromRaw(e)
-    or
     result = convertFormatArgsExprFromRaw(e)
     or
     result = convertIfExprFromRaw(e)
     or
     result = convertIndexExprFromRaw(e)
     or
+    result = convertLabelableExprFromRaw(e)
+    or
     result = convertLetExprFromRaw(e)
     or
     result = convertLiteralExprFromRaw(e)
     or
-    result = convertLoopExprFromRaw(e)
-    or
     result = convertMacroExprFromRaw(e)
     or
     result = convertMatchExprFromRaw(e)
@@ -1849,8 +1926,6 @@ module Synth {
     or
     result = convertUnderscoreExprFromRaw(e)
     or
-    result = convertWhileExprFromRaw(e)
-    or
     result = convertYeetExprFromRaw(e)
     or
     result = convertYieldExprFromRaw(e)
@@ -1946,6 +2021,16 @@ module Synth {
     result = convertUseFromRaw(e)
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TLabelableExpr`, if possible.
+   */
+  TLabelableExpr convertLabelableExprFromRaw(Raw::Element e) {
+    result = convertBlockExprFromRaw(e)
+    or
+    result = convertLoopingExprFromRaw(e)
+  }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TLocatable`, if possible.
@@ -1958,6 +2043,28 @@ module Synth {
     result = convertFormatArgumentFromRaw(e)
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TLoopingExpr`, if possible.
+   */
+  TLoopingExpr convertLoopingExprFromRaw(Raw::Element e) {
+    result = convertForExprFromRaw(e)
+    or
+    result = convertLoopExprFromRaw(e)
+    or
+    result = convertWhileExprFromRaw(e)
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw DB element to a synthesized `TParamBase`, if possible.
+   */
+  TParamBase convertParamBaseFromRaw(Raw::Element e) {
+    result = convertParamFromRaw(e)
+    or
+    result = convertSelfParamFromRaw(e)
+  }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TPat`, if possible.
@@ -2036,36 +2143,36 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a raw DB element to a synthesized `TTypeRef`, if possible.
+   * Converts a raw DB element to a synthesized `TTypeRepr`, if possible.
    */
-  TTypeRef convertTypeRefFromRaw(Raw::Element e) {
-    result = convertArrayTypeFromRaw(e)
+  TTypeRepr convertTypeReprFromRaw(Raw::Element e) {
+    result = convertArrayTypeReprFromRaw(e)
     or
-    result = convertDynTraitTypeFromRaw(e)
+    result = convertDynTraitTypeReprFromRaw(e)
     or
-    result = convertFnPtrTypeFromRaw(e)
+    result = convertFnPtrTypeReprFromRaw(e)
     or
-    result = convertForTypeFromRaw(e)
+    result = convertForTypeReprFromRaw(e)
     or
-    result = convertImplTraitTypeFromRaw(e)
+    result = convertImplTraitTypeReprFromRaw(e)
     or
-    result = convertInferTypeFromRaw(e)
+    result = convertInferTypeReprFromRaw(e)
     or
-    result = convertMacroTypeFromRaw(e)
+    result = convertMacroTypeReprFromRaw(e)
     or
-    result = convertNeverTypeFromRaw(e)
+    result = convertNeverTypeReprFromRaw(e)
     or
-    result = convertParenTypeFromRaw(e)
+    result = convertParenTypeReprFromRaw(e)
     or
-    result = convertPathTypeFromRaw(e)
+    result = convertPathTypeReprFromRaw(e)
     or
-    result = convertPtrTypeFromRaw(e)
+    result = convertPtrTypeReprFromRaw(e)
     or
-    result = convertRefTypeFromRaw(e)
+    result = convertRefTypeReprFromRaw(e)
     or
-    result = convertSliceTypeFromRaw(e)
+    result = convertSliceTypeReprFromRaw(e)
     or
-    result = convertTupleTypeFromRaw(e)
+    result = convertTupleTypeReprFromRaw(e)
   }
 
   /**
@@ -2092,15 +2199,29 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TArrayExpr` to a raw DB element, if possible.
+   * Converts a synthesized `TArrayExprInternal` to a raw DB element, if possible.
    */
-  Raw::Element convertArrayExprToRaw(TArrayExpr e) { e = TArrayExpr(result) }
+  Raw::Element convertArrayExprInternalToRaw(TArrayExprInternal e) {
+    e = TArrayExprInternal(result)
+  }
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TArrayType` to a raw DB element, if possible.
+   * Converts a synthesized `TArrayListExpr` to a raw DB element, if possible.
    */
-  Raw::Element convertArrayTypeToRaw(TArrayType e) { e = TArrayType(result) }
+  Raw::Element convertArrayListExprToRaw(TArrayListExpr e) { e = TArrayListExpr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TArrayRepeatExpr` to a raw DB element, if possible.
+   */
+  Raw::Element convertArrayRepeatExprToRaw(TArrayRepeatExpr e) { e = TArrayRepeatExpr(result) }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TArrayTypeRepr` to a raw DB element, if possible.
+   */
+  Raw::Element convertArrayTypeReprToRaw(TArrayTypeRepr e) { e = TArrayTypeRepr(result) }
 
   /**
    * INTERNAL: Do not use.
@@ -2224,9 +2345,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TDynTraitType` to a raw DB element, if possible.
+   * Converts a synthesized `TDynTraitTypeRepr` to a raw DB element, if possible.
    */
-  Raw::Element convertDynTraitTypeToRaw(TDynTraitType e) { e = TDynTraitType(result) }
+  Raw::Element convertDynTraitTypeReprToRaw(TDynTraitTypeRepr e) { e = TDynTraitTypeRepr(result) }
 
   /**
    * INTERNAL: Do not use.
@@ -2258,6 +2379,12 @@ module Synth {
    */
   Raw::Element convertExternItemListToRaw(TExternItemList e) { e = TExternItemList(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TExtractorStep` to a raw DB element, if possible.
+   */
+  Raw::Element convertExtractorStepToRaw(TExtractorStep e) { e = TExtractorStep(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TFieldExpr` to a raw DB element, if possible.
@@ -2266,9 +2393,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TFnPtrType` to a raw DB element, if possible.
+   * Converts a synthesized `TFnPtrTypeRepr` to a raw DB element, if possible.
    */
-  Raw::Element convertFnPtrTypeToRaw(TFnPtrType e) { e = TFnPtrType(result) }
+  Raw::Element convertFnPtrTypeReprToRaw(TFnPtrTypeRepr e) { e = TFnPtrTypeRepr(result) }
 
   /**
    * INTERNAL: Do not use.
@@ -2278,9 +2405,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TForType` to a raw DB element, if possible.
+   * Converts a synthesized `TForTypeRepr` to a raw DB element, if possible.
    */
-  Raw::Element convertForTypeToRaw(TForType e) { e = TForType(result) }
+  Raw::Element convertForTypeReprToRaw(TForTypeRepr e) { e = TForTypeRepr(result) }
 
   /**
    * INTERNAL: Do not use.
@@ -2350,9 +2477,11 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TImplTraitType` to a raw DB element, if possible.
+   * Converts a synthesized `TImplTraitTypeRepr` to a raw DB element, if possible.
    */
-  Raw::Element convertImplTraitTypeToRaw(TImplTraitType e) { e = TImplTraitType(result) }
+  Raw::Element convertImplTraitTypeReprToRaw(TImplTraitTypeRepr e) {
+    e = TImplTraitTypeRepr(result)
+  }
 
   /**
    * INTERNAL: Do not use.
@@ -2362,9 +2491,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TInferType` to a raw DB element, if possible.
+   * Converts a synthesized `TInferTypeRepr` to a raw DB element, if possible.
    */
-  Raw::Element convertInferTypeToRaw(TInferType e) { e = TInferType(result) }
+  Raw::Element convertInferTypeReprToRaw(TInferTypeRepr e) { e = TInferTypeRepr(result) }
 
   /**
    * INTERNAL: Do not use.
@@ -2476,9 +2605,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TMacroType` to a raw DB element, if possible.
+   * Converts a synthesized `TMacroTypeRepr` to a raw DB element, if possible.
    */
-  Raw::Element convertMacroTypeToRaw(TMacroType e) { e = TMacroType(result) }
+  Raw::Element convertMacroTypeReprToRaw(TMacroTypeRepr e) { e = TMacroTypeRepr(result) }
 
   /**
    * INTERNAL: Do not use.
@@ -2542,9 +2671,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TNeverType` to a raw DB element, if possible.
+   * Converts a synthesized `TNeverTypeRepr` to a raw DB element, if possible.
    */
-  Raw::Element convertNeverTypeToRaw(TNeverType e) { e = TNeverType(result) }
+  Raw::Element convertNeverTypeReprToRaw(TNeverTypeRepr e) { e = TNeverTypeRepr(result) }
 
   /**
    * INTERNAL: Do not use.
@@ -2584,9 +2713,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TParenType` to a raw DB element, if possible.
+   * Converts a synthesized `TParenTypeRepr` to a raw DB element, if possible.
    */
-  Raw::Element convertParenTypeToRaw(TParenType e) { e = TParenType(result) }
+  Raw::Element convertParenTypeReprToRaw(TParenTypeRepr e) { e = TParenTypeRepr(result) }
 
   /**
    * INTERNAL: Do not use.
@@ -2614,9 +2743,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TPathType` to a raw DB element, if possible.
+   * Converts a synthesized `TPathTypeRepr` to a raw DB element, if possible.
    */
-  Raw::Element convertPathTypeToRaw(TPathType e) { e = TPathType(result) }
+  Raw::Element convertPathTypeReprToRaw(TPathTypeRepr e) { e = TPathTypeRepr(result) }
 
   /**
    * INTERNAL: Do not use.
@@ -2626,9 +2755,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TPtrType` to a raw DB element, if possible.
+   * Converts a synthesized `TPtrTypeRepr` to a raw DB element, if possible.
    */
-  Raw::Element convertPtrTypeToRaw(TPtrType e) { e = TPtrType(result) }
+  Raw::Element convertPtrTypeReprToRaw(TPtrTypeRepr e) { e = TPtrTypeRepr(result) }
 
   /**
    * INTERNAL: Do not use.
@@ -2708,9 +2837,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TRefType` to a raw DB element, if possible.
+   * Converts a synthesized `TRefTypeRepr` to a raw DB element, if possible.
    */
-  Raw::Element convertRefTypeToRaw(TRefType e) { e = TRefType(result) }
+  Raw::Element convertRefTypeReprToRaw(TRefTypeRepr e) { e = TRefTypeRepr(result) }
 
   /**
    * INTERNAL: Do not use.
@@ -2726,9 +2855,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TRetType` to a raw DB element, if possible.
+   * Converts a synthesized `TRetTypeRepr` to a raw DB element, if possible.
    */
-  Raw::Element convertRetTypeToRaw(TRetType e) { e = TRetType(result) }
+  Raw::Element convertRetTypeReprToRaw(TRetTypeRepr e) { e = TRetTypeRepr(result) }
 
   /**
    * INTERNAL: Do not use.
@@ -2756,9 +2885,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TSliceType` to a raw DB element, if possible.
+   * Converts a synthesized `TSliceTypeRepr` to a raw DB element, if possible.
    */
-  Raw::Element convertSliceTypeToRaw(TSliceType e) { e = TSliceType(result) }
+  Raw::Element convertSliceTypeReprToRaw(TSliceTypeRepr e) { e = TSliceTypeRepr(result) }
 
   /**
    * INTERNAL: Do not use.
@@ -2840,9 +2969,9 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TTupleType` to a raw DB element, if possible.
+   * Converts a synthesized `TTupleTypeRepr` to a raw DB element, if possible.
    */
-  Raw::Element convertTupleTypeToRaw(TTupleType e) { e = TTupleType(result) }
+  Raw::Element convertTupleTypeReprToRaw(TTupleTypeRepr e) { e = TTupleTypeRepr(result) }
 
   /**
    * INTERNAL: Do not use.
@@ -2964,6 +3093,26 @@ module Synth {
    */
   Raw::Element convertYieldExprToRaw(TYieldExpr e) { e = TYieldExpr(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TAddressable` to a raw DB element, if possible.
+   */
+  Raw::Element convertAddressableToRaw(TAddressable e) {
+    result = convertItemToRaw(e)
+    or
+    result = convertVariantToRaw(e)
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TArrayExpr` to a raw DB element, if possible.
+   */
+  Raw::Element convertArrayExprToRaw(TArrayExpr e) {
+    result = convertArrayListExprToRaw(e)
+    or
+    result = convertArrayRepeatExprToRaw(e)
+  }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TAssocItem` to a raw DB element, if possible.
@@ -2985,6 +3134,8 @@ module Synth {
   Raw::Element convertAstNodeToRaw(TAstNode e) {
     result = convertAbiToRaw(e)
     or
+    result = convertAddressableToRaw(e)
+    or
     result = convertArgListToRaw(e)
     or
     result = convertAssocItemToRaw(e)
@@ -3039,7 +3190,7 @@ module Synth {
     or
     result = convertNameRefToRaw(e)
     or
-    result = convertParamToRaw(e)
+    result = convertParamBaseToRaw(e)
     or
     result = convertParamListToRaw(e)
     or
@@ -3061,12 +3212,10 @@ module Synth {
     or
     result = convertResolvableToRaw(e)
     or
-    result = convertRetTypeToRaw(e)
+    result = convertRetTypeReprToRaw(e)
     or
     result = convertReturnTypeSyntaxToRaw(e)
     or
-    result = convertSelfParamToRaw(e)
-    or
     result = convertSourceFileToRaw(e)
     or
     result = convertStmtToRaw(e)
@@ -3083,14 +3232,12 @@ module Synth {
     or
     result = convertTypeBoundListToRaw(e)
     or
-    result = convertTypeRefToRaw(e)
+    result = convertTypeReprToRaw(e)
     or
     result = convertUseTreeToRaw(e)
     or
     result = convertUseTreeListToRaw(e)
     or
-    result = convertVariantToRaw(e)
-    or
     result = convertVariantListToRaw(e)
     or
     result = convertVisibilityToRaw(e)
@@ -3125,6 +3272,8 @@ module Synth {
    * Converts a synthesized `TElement` to a raw DB element, if possible.
    */
   Raw::Element convertElementToRaw(TElement e) {
+    result = convertExtractorStepToRaw(e)
+    or
     result = convertLocatableToRaw(e)
     or
     result = convertUnextractedToRaw(e)
@@ -3137,6 +3286,8 @@ module Synth {
   Raw::Element convertExprToRaw(TExpr e) {
     result = convertArrayExprToRaw(e)
     or
+    result = convertArrayExprInternalToRaw(e)
+    or
     result = convertAsmExprToRaw(e)
     or
     result = convertAwaitExprToRaw(e)
@@ -3145,8 +3296,6 @@ module Synth {
     or
     result = convertBinaryExprToRaw(e)
     or
-    result = convertBlockExprToRaw(e)
-    or
     result = convertBreakExprToRaw(e)
     or
     result = convertCallExprBaseToRaw(e)
@@ -3159,20 +3308,18 @@ module Synth {
     or
     result = convertFieldExprToRaw(e)
     or
-    result = convertForExprToRaw(e)
-    or
     result = convertFormatArgsExprToRaw(e)
     or
     result = convertIfExprToRaw(e)
     or
     result = convertIndexExprToRaw(e)
     or
+    result = convertLabelableExprToRaw(e)
+    or
     result = convertLetExprToRaw(e)
     or
     result = convertLiteralExprToRaw(e)
     or
-    result = convertLoopExprToRaw(e)
-    or
     result = convertMacroExprToRaw(e)
     or
     result = convertMatchExprToRaw(e)
@@ -3199,8 +3346,6 @@ module Synth {
     or
     result = convertUnderscoreExprToRaw(e)
     or
-    result = convertWhileExprToRaw(e)
-    or
     result = convertYeetExprToRaw(e)
     or
     result = convertYieldExprToRaw(e)
@@ -3296,6 +3441,16 @@ module Synth {
     result = convertUseToRaw(e)
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TLabelableExpr` to a raw DB element, if possible.
+   */
+  Raw::Element convertLabelableExprToRaw(TLabelableExpr e) {
+    result = convertBlockExprToRaw(e)
+    or
+    result = convertLoopingExprToRaw(e)
+  }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TLocatable` to a raw DB element, if possible.
@@ -3308,6 +3463,28 @@ module Synth {
     result = convertFormatArgumentToRaw(e)
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TLoopingExpr` to a raw DB element, if possible.
+   */
+  Raw::Element convertLoopingExprToRaw(TLoopingExpr e) {
+    result = convertForExprToRaw(e)
+    or
+    result = convertLoopExprToRaw(e)
+    or
+    result = convertWhileExprToRaw(e)
+  }
+
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TParamBase` to a raw DB element, if possible.
+   */
+  Raw::Element convertParamBaseToRaw(TParamBase e) {
+    result = convertParamToRaw(e)
+    or
+    result = convertSelfParamToRaw(e)
+  }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TPat` to a raw DB element, if possible.
@@ -3386,36 +3563,36 @@ module Synth {
 
   /**
    * INTERNAL: Do not use.
-   * Converts a synthesized `TTypeRef` to a raw DB element, if possible.
+   * Converts a synthesized `TTypeRepr` to a raw DB element, if possible.
    */
-  Raw::Element convertTypeRefToRaw(TTypeRef e) {
-    result = convertArrayTypeToRaw(e)
+  Raw::Element convertTypeReprToRaw(TTypeRepr e) {
+    result = convertArrayTypeReprToRaw(e)
     or
-    result = convertDynTraitTypeToRaw(e)
+    result = convertDynTraitTypeReprToRaw(e)
     or
-    result = convertFnPtrTypeToRaw(e)
+    result = convertFnPtrTypeReprToRaw(e)
     or
-    result = convertForTypeToRaw(e)
+    result = convertForTypeReprToRaw(e)
     or
-    result = convertImplTraitTypeToRaw(e)
+    result = convertImplTraitTypeReprToRaw(e)
     or
-    result = convertInferTypeToRaw(e)
+    result = convertInferTypeReprToRaw(e)
     or
-    result = convertMacroTypeToRaw(e)
+    result = convertMacroTypeReprToRaw(e)
     or
-    result = convertNeverTypeToRaw(e)
+    result = convertNeverTypeReprToRaw(e)
     or
-    result = convertParenTypeToRaw(e)
+    result = convertParenTypeReprToRaw(e)
     or
-    result = convertPathTypeToRaw(e)
+    result = convertPathTypeReprToRaw(e)
     or
-    result = convertPtrTypeToRaw(e)
+    result = convertPtrTypeReprToRaw(e)
     or
-    result = convertRefTypeToRaw(e)
+    result = convertRefTypeReprToRaw(e)
     or
-    result = convertSliceTypeToRaw(e)
+    result = convertSliceTypeReprToRaw(e)
     or
-    result = convertTupleTypeToRaw(e)
+    result = convertTupleTypeReprToRaw(e)
   }
 
   /**
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll
index 9b68c858c6a..3b2a58083b1 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll
@@ -5,8 +5,10 @@
 
 import codeql.rust.elements.internal.AbiConstructor
 import codeql.rust.elements.internal.ArgListConstructor
-import codeql.rust.elements.internal.ArrayExprConstructor
-import codeql.rust.elements.internal.ArrayTypeConstructor
+import codeql.rust.elements.internal.ArrayExprInternalConstructor
+import codeql.rust.elements.internal.ArrayListExprConstructor
+import codeql.rust.elements.internal.ArrayRepeatExprConstructor
+import codeql.rust.elements.internal.ArrayTypeReprConstructor
 import codeql.rust.elements.internal.AsmExprConstructor
 import codeql.rust.elements.internal.AssocItemListConstructor
 import codeql.rust.elements.internal.AssocTypeArgConstructor
@@ -27,16 +29,17 @@ import codeql.rust.elements.internal.ConstArgConstructor
 import codeql.rust.elements.internal.ConstBlockPatConstructor
 import codeql.rust.elements.internal.ConstParamConstructor
 import codeql.rust.elements.internal.ContinueExprConstructor
-import codeql.rust.elements.internal.DynTraitTypeConstructor
+import codeql.rust.elements.internal.DynTraitTypeReprConstructor
 import codeql.rust.elements.internal.EnumConstructor
 import codeql.rust.elements.internal.ExprStmtConstructor
 import codeql.rust.elements.internal.ExternBlockConstructor
 import codeql.rust.elements.internal.ExternCrateConstructor
 import codeql.rust.elements.internal.ExternItemListConstructor
+import codeql.rust.elements.internal.ExtractorStepConstructor
 import codeql.rust.elements.internal.FieldExprConstructor
-import codeql.rust.elements.internal.FnPtrTypeConstructor
+import codeql.rust.elements.internal.FnPtrTypeReprConstructor
 import codeql.rust.elements.internal.ForExprConstructor
-import codeql.rust.elements.internal.ForTypeConstructor
+import codeql.rust.elements.internal.ForTypeReprConstructor
 import codeql.rust.elements.internal.FormatConstructor
 import codeql.rust.elements.internal.FormatArgsArgConstructor
 import codeql.rust.elements.internal.FormatArgsExprConstructor
@@ -48,9 +51,9 @@ import codeql.rust.elements.internal.GenericParamListConstructor
 import codeql.rust.elements.internal.IdentPatConstructor
 import codeql.rust.elements.internal.IfExprConstructor
 import codeql.rust.elements.internal.ImplConstructor
-import codeql.rust.elements.internal.ImplTraitTypeConstructor
+import codeql.rust.elements.internal.ImplTraitTypeReprConstructor
 import codeql.rust.elements.internal.IndexExprConstructor
-import codeql.rust.elements.internal.InferTypeConstructor
+import codeql.rust.elements.internal.InferTypeReprConstructor
 import codeql.rust.elements.internal.ItemListConstructor
 import codeql.rust.elements.internal.LabelConstructor
 import codeql.rust.elements.internal.LetElseConstructor
@@ -69,7 +72,7 @@ import codeql.rust.elements.internal.MacroItemsConstructor
 import codeql.rust.elements.internal.MacroPatConstructor
 import codeql.rust.elements.internal.MacroRulesConstructor
 import codeql.rust.elements.internal.MacroStmtsConstructor
-import codeql.rust.elements.internal.MacroTypeConstructor
+import codeql.rust.elements.internal.MacroTypeReprConstructor
 import codeql.rust.elements.internal.MatchArmConstructor
 import codeql.rust.elements.internal.MatchArmListConstructor
 import codeql.rust.elements.internal.MatchExprConstructor
@@ -80,21 +83,21 @@ import codeql.rust.elements.internal.MissingConstructor
 import codeql.rust.elements.internal.ModuleConstructor
 import codeql.rust.elements.internal.NameConstructor
 import codeql.rust.elements.internal.NameRefConstructor
-import codeql.rust.elements.internal.NeverTypeConstructor
+import codeql.rust.elements.internal.NeverTypeReprConstructor
 import codeql.rust.elements.internal.OffsetOfExprConstructor
 import codeql.rust.elements.internal.OrPatConstructor
 import codeql.rust.elements.internal.ParamConstructor
 import codeql.rust.elements.internal.ParamListConstructor
 import codeql.rust.elements.internal.ParenExprConstructor
 import codeql.rust.elements.internal.ParenPatConstructor
-import codeql.rust.elements.internal.ParenTypeConstructor
+import codeql.rust.elements.internal.ParenTypeReprConstructor
 import codeql.rust.elements.internal.PathConstructor
 import codeql.rust.elements.internal.PathExprConstructor
 import codeql.rust.elements.internal.PathPatConstructor
 import codeql.rust.elements.internal.PathSegmentConstructor
-import codeql.rust.elements.internal.PathTypeConstructor
+import codeql.rust.elements.internal.PathTypeReprConstructor
 import codeql.rust.elements.internal.PrefixExprConstructor
-import codeql.rust.elements.internal.PtrTypeConstructor
+import codeql.rust.elements.internal.PtrTypeReprConstructor
 import codeql.rust.elements.internal.RangeExprConstructor
 import codeql.rust.elements.internal.RangePatConstructor
 import codeql.rust.elements.internal.RecordExprConstructor
@@ -107,15 +110,15 @@ import codeql.rust.elements.internal.RecordPatFieldConstructor
 import codeql.rust.elements.internal.RecordPatFieldListConstructor
 import codeql.rust.elements.internal.RefExprConstructor
 import codeql.rust.elements.internal.RefPatConstructor
-import codeql.rust.elements.internal.RefTypeConstructor
+import codeql.rust.elements.internal.RefTypeReprConstructor
 import codeql.rust.elements.internal.RenameConstructor
 import codeql.rust.elements.internal.RestPatConstructor
-import codeql.rust.elements.internal.RetTypeConstructor
+import codeql.rust.elements.internal.RetTypeReprConstructor
 import codeql.rust.elements.internal.ReturnExprConstructor
 import codeql.rust.elements.internal.ReturnTypeSyntaxConstructor
 import codeql.rust.elements.internal.SelfParamConstructor
 import codeql.rust.elements.internal.SlicePatConstructor
-import codeql.rust.elements.internal.SliceTypeConstructor
+import codeql.rust.elements.internal.SliceTypeReprConstructor
 import codeql.rust.elements.internal.SourceFileConstructor
 import codeql.rust.elements.internal.StaticConstructor
 import codeql.rust.elements.internal.StmtListConstructor
@@ -129,7 +132,7 @@ import codeql.rust.elements.internal.TupleFieldConstructor
 import codeql.rust.elements.internal.TupleFieldListConstructor
 import codeql.rust.elements.internal.TuplePatConstructor
 import codeql.rust.elements.internal.TupleStructPatConstructor
-import codeql.rust.elements.internal.TupleTypeConstructor
+import codeql.rust.elements.internal.TupleTypeReprConstructor
 import codeql.rust.elements.internal.TypeAliasConstructor
 import codeql.rust.elements.internal.TypeArgConstructor
 import codeql.rust.elements.internal.TypeBoundConstructor
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleField.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleField.qll
index fa7b8a338ff..e7dd183a171 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleField.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleField.qll
@@ -8,7 +8,7 @@ private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
 import codeql.rust.elements.Attr
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.Visibility
 
 /**
@@ -48,17 +48,19 @@ module Generated {
     final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
 
     /**
-     * Gets the ty of this tuple field, if it exists.
+     * Gets the type representation of this tuple field, if it exists.
      */
-    TypeRef getTy() {
+    TypeRepr getTypeRepr() {
       result =
-        Synth::convertTypeRefFromRaw(Synth::convertTupleFieldToRaw(this).(Raw::TupleField).getTy())
+        Synth::convertTypeReprFromRaw(Synth::convertTupleFieldToRaw(this)
+              .(Raw::TupleField)
+              .getTypeRepr())
     }
 
     /**
-     * Holds if `getTy()` exists.
+     * Holds if `getTypeRepr()` exists.
      */
-    final predicate hasTy() { exists(this.getTy()) }
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
 
     /**
      * Gets the visibility of this tuple field, if it exists.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TuplePat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TuplePat.qll
index 0e7fc44809e..724a827f7c3 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TuplePat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TuplePat.qll
@@ -27,7 +27,7 @@ module Generated {
     override string getAPrimaryQlClass() { result = "TuplePat" }
 
     /**
-     * Gets the `index`th field of this tuple pat (0-based).
+     * Gets the `index`th field of this tuple pattern (0-based).
      */
     Pat getField(int index) {
       result =
@@ -35,12 +35,12 @@ module Generated {
     }
 
     /**
-     * Gets any of the fields of this tuple pat.
+     * Gets any of the fields of this tuple pattern.
      */
     final Pat getAField() { result = this.getField(_) }
 
     /**
-     * Gets the number of fields of this tuple pat.
+     * Gets the number of fields of this tuple pattern.
      */
     final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
   }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleStructPat.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleStructPat.qll
index ed4e57d8719..73cf9a1d9c3 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleStructPat.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleStructPat.qll
@@ -31,7 +31,7 @@ module Generated {
     override string getAPrimaryQlClass() { result = "TupleStructPat" }
 
     /**
-     * Gets the `index`th field of this tuple struct pat (0-based).
+     * Gets the `index`th field of this tuple struct pattern (0-based).
      */
     Pat getField(int index) {
       result =
@@ -41,17 +41,17 @@ module Generated {
     }
 
     /**
-     * Gets any of the fields of this tuple struct pat.
+     * Gets any of the fields of this tuple struct pattern.
      */
     final Pat getAField() { result = this.getField(_) }
 
     /**
-     * Gets the number of fields of this tuple struct pat.
+     * Gets the number of fields of this tuple struct pattern.
      */
     final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
 
     /**
-     * Gets the path of this tuple struct pat, if it exists.
+     * Gets the path of this tuple struct pattern, if it exists.
      */
     Path getPath() {
       result =
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleType.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleType.qll
deleted file mode 100644
index ec7d95114d8..00000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleType.qll
+++ /dev/null
@@ -1,48 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `TupleType`.
- * INTERNAL: Do not import directly.
- */
-
-private import codeql.rust.elements.internal.generated.Synth
-private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.TypeRef
-import codeql.rust.elements.internal.TypeRefImpl::Impl as TypeRefImpl
-
-/**
- * INTERNAL: This module contains the fully generated definition of `TupleType` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * A TupleType. For example:
-   * ```rust
-   * todo!()
-   * ```
-   * INTERNAL: Do not reference the `Generated::TupleType` class directly.
-   * Use the subclass `TupleType`, where the following predicates are available.
-   */
-  class TupleType extends Synth::TTupleType, TypeRefImpl::TypeRef {
-    override string getAPrimaryQlClass() { result = "TupleType" }
-
-    /**
-     * Gets the `index`th field of this tuple type (0-based).
-     */
-    TypeRef getField(int index) {
-      result =
-        Synth::convertTypeRefFromRaw(Synth::convertTupleTypeToRaw(this)
-              .(Raw::TupleType)
-              .getField(index))
-    }
-
-    /**
-     * Gets any of the fields of this tuple type.
-     */
-    final TypeRef getAField() { result = this.getField(_) }
-
-    /**
-     * Gets the number of fields of this tuple type.
-     */
-    final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleTypeRepr.qll
new file mode 100644
index 00000000000..5929c019ff4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleTypeRepr.qll
@@ -0,0 +1,48 @@
+// generated by codegen, do not edit
+/**
+ * This module provides the generated definition of `TupleTypeRepr`.
+ * INTERNAL: Do not import directly.
+ */
+
+private import codeql.rust.elements.internal.generated.Synth
+private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.TypeRepr
+import codeql.rust.elements.internal.TypeReprImpl::Impl as TypeReprImpl
+
+/**
+ * INTERNAL: This module contains the fully generated definition of `TupleTypeRepr` and should not
+ * be referenced directly.
+ */
+module Generated {
+  /**
+   * A TupleTypeRepr. For example:
+   * ```rust
+   * todo!()
+   * ```
+   * INTERNAL: Do not reference the `Generated::TupleTypeRepr` class directly.
+   * Use the subclass `TupleTypeRepr`, where the following predicates are available.
+   */
+  class TupleTypeRepr extends Synth::TTupleTypeRepr, TypeReprImpl::TypeRepr {
+    override string getAPrimaryQlClass() { result = "TupleTypeRepr" }
+
+    /**
+     * Gets the `index`th field of this tuple type representation (0-based).
+     */
+    TypeRepr getField(int index) {
+      result =
+        Synth::convertTypeReprFromRaw(Synth::convertTupleTypeReprToRaw(this)
+              .(Raw::TupleTypeRepr)
+              .getField(index))
+    }
+
+    /**
+     * Gets any of the fields of this tuple type representation.
+     */
+    final TypeRepr getAField() { result = this.getField(_) }
+
+    /**
+     * Gets the number of fields of this tuple type representation.
+     */
+    final int getNumberOfFields() { result = count(int i | exists(this.getField(i))) }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeAlias.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeAlias.qll
index 2f5294ef65e..b460194cdc3 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeAlias.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeAlias.qll
@@ -13,7 +13,7 @@ import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
 import codeql.rust.elements.Name
 import codeql.rust.elements.TypeBoundList
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.Visibility
 import codeql.rust.elements.WhereClause
 
@@ -87,17 +87,19 @@ module Generated {
     final predicate hasName() { exists(this.getName()) }
 
     /**
-     * Gets the ty of this type alias, if it exists.
+     * Gets the type representation of this type alias, if it exists.
      */
-    TypeRef getTy() {
+    TypeRepr getTypeRepr() {
       result =
-        Synth::convertTypeRefFromRaw(Synth::convertTypeAliasToRaw(this).(Raw::TypeAlias).getTy())
+        Synth::convertTypeReprFromRaw(Synth::convertTypeAliasToRaw(this)
+              .(Raw::TypeAlias)
+              .getTypeRepr())
     }
 
     /**
-     * Holds if `getTy()` exists.
+     * Holds if `getTypeRepr()` exists.
      */
-    final predicate hasTy() { exists(this.getTy()) }
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
 
     /**
      * Gets the type bound list of this type alias, if it exists.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeArg.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeArg.qll
index 29b24efb930..da8742cd188 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeArg.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeArg.qll
@@ -7,7 +7,7 @@
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.GenericArgImpl::Impl as GenericArgImpl
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * INTERNAL: This module contains the fully generated definition of `TypeArg` and should not
@@ -26,15 +26,16 @@ module Generated {
     override string getAPrimaryQlClass() { result = "TypeArg" }
 
     /**
-     * Gets the ty of this type argument, if it exists.
+     * Gets the type representation of this type argument, if it exists.
      */
-    TypeRef getTy() {
-      result = Synth::convertTypeRefFromRaw(Synth::convertTypeArgToRaw(this).(Raw::TypeArg).getTy())
+    TypeRepr getTypeRepr() {
+      result =
+        Synth::convertTypeReprFromRaw(Synth::convertTypeArgToRaw(this).(Raw::TypeArg).getTypeRepr())
     }
 
     /**
-     * Holds if `getTy()` exists.
+     * Holds if `getTypeRepr()` exists.
      */
-    final predicate hasTy() { exists(this.getTy()) }
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBound.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBound.qll
index e83586d9cdf..ff19afa1184 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBound.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBound.qll
@@ -9,7 +9,7 @@ private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
 import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.Lifetime
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * INTERNAL: This module contains the fully generated definition of `TypeBound` and should not
@@ -68,16 +68,18 @@ module Generated {
     final predicate hasLifetime() { exists(this.getLifetime()) }
 
     /**
-     * Gets the ty of this type bound, if it exists.
+     * Gets the type representation of this type bound, if it exists.
      */
-    TypeRef getTy() {
+    TypeRepr getTypeRepr() {
       result =
-        Synth::convertTypeRefFromRaw(Synth::convertTypeBoundToRaw(this).(Raw::TypeBound).getTy())
+        Synth::convertTypeReprFromRaw(Synth::convertTypeBoundToRaw(this)
+              .(Raw::TypeBound)
+              .getTypeRepr())
     }
 
     /**
-     * Holds if `getTy()` exists.
+     * Holds if `getTypeRepr()` exists.
      */
-    final predicate hasTy() { exists(this.getTy()) }
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeParam.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeParam.qll
index 6b010ca50db..0c7c71df4f4 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeParam.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeParam.qll
@@ -10,7 +10,7 @@ import codeql.rust.elements.Attr
 import codeql.rust.elements.internal.GenericParamImpl::Impl as GenericParamImpl
 import codeql.rust.elements.Name
 import codeql.rust.elements.TypeBoundList
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * INTERNAL: This module contains the fully generated definition of `TypeParam` and should not
@@ -49,9 +49,9 @@ module Generated {
     /**
      * Gets the default type of this type parameter, if it exists.
      */
-    TypeRef getDefaultType() {
+    TypeRepr getDefaultType() {
       result =
-        Synth::convertTypeRefFromRaw(Synth::convertTypeParamToRaw(this)
+        Synth::convertTypeReprFromRaw(Synth::convertTypeParamToRaw(this)
               .(Raw::TypeParam)
               .getDefaultType())
     }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeRef.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeRepr.qll
similarity index 62%
rename from rust/ql/lib/codeql/rust/elements/internal/generated/TypeRef.qll
rename to rust/ql/lib/codeql/rust/elements/internal/generated/TypeRepr.qll
index 2eab9874ecc..0bb253c389d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeRef.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeRepr.qll
@@ -1,6 +1,6 @@
 // generated by codegen, do not edit
 /**
- * This module provides the generated definition of `TypeRef`.
+ * This module provides the generated definition of `TypeRepr`.
  * INTERNAL: Do not import directly.
  */
 
@@ -9,7 +9,7 @@ private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
 
 /**
- * INTERNAL: This module contains the fully generated definition of `TypeRef` and should not
+ * INTERNAL: This module contains the fully generated definition of `TypeRepr` and should not
  * be referenced directly.
  */
 module Generated {
@@ -20,8 +20,8 @@ module Generated {
    * let y: Vec<i32>;
    * let z: Option<i32>;
    * ```
-   * INTERNAL: Do not reference the `Generated::TypeRef` class directly.
-   * Use the subclass `TypeRef`, where the following predicates are available.
+   * INTERNAL: Do not reference the `Generated::TypeRepr` class directly.
+   * Use the subclass `TypeRepr`, where the following predicates are available.
    */
-  class TypeRef extends Synth::TTypeRef, AstNodeImpl::AstNode { }
+  class TypeRepr extends Synth::TTypeRepr, AstNodeImpl::AstNode { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Variant.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Variant.qll
index ec57b2a03da..b78043e0922 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Variant.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Variant.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.internal.AddressableImpl::Impl as AddressableImpl
 import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.FieldList
@@ -26,7 +26,7 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::Variant` class directly.
    * Use the subclass `Variant`, where the following predicates are available.
    */
-  class Variant extends Synth::TVariant, AstNodeImpl::AstNode {
+  class Variant extends Synth::TVariant, AddressableImpl::Addressable {
     override string getAPrimaryQlClass() { result = "Variant" }
 
     /**
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/WherePred.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/WherePred.qll
index 90a1d732b30..6e68c7a25a6 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/WherePred.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/WherePred.qll
@@ -10,7 +10,7 @@ import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
 import codeql.rust.elements.GenericParamList
 import codeql.rust.elements.Lifetime
 import codeql.rust.elements.TypeBoundList
-import codeql.rust.elements.TypeRef
+import codeql.rust.elements.TypeRepr
 
 /**
  * INTERNAL: This module contains the fully generated definition of `WherePred` and should not
@@ -59,17 +59,19 @@ module Generated {
     final predicate hasLifetime() { exists(this.getLifetime()) }
 
     /**
-     * Gets the ty of this where pred, if it exists.
+     * Gets the type representation of this where pred, if it exists.
      */
-    TypeRef getTy() {
+    TypeRepr getTypeRepr() {
       result =
-        Synth::convertTypeRefFromRaw(Synth::convertWherePredToRaw(this).(Raw::WherePred).getTy())
+        Synth::convertTypeReprFromRaw(Synth::convertWherePredToRaw(this)
+              .(Raw::WherePred)
+              .getTypeRepr())
     }
 
     /**
-     * Holds if `getTy()` exists.
+     * Holds if `getTypeRepr()` exists.
      */
-    final predicate hasTy() { exists(this.getTy()) }
+    final predicate hasTypeRepr() { exists(this.getTypeRepr()) }
 
     /**
      * Gets the type bound list of this where pred, if it exists.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/WhileExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/WhileExpr.qll
index 5cd48bb2506..fa4a4aee65c 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/WhileExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/WhileExpr.qll
@@ -7,10 +7,8 @@
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.Attr
-import codeql.rust.elements.BlockExpr
 import codeql.rust.elements.Expr
-import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
-import codeql.rust.elements.Label
+import codeql.rust.elements.internal.LoopingExprImpl::Impl as LoopingExprImpl
 
 /**
  * INTERNAL: This module contains the fully generated definition of `WhileExpr` and should not
@@ -25,7 +23,7 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::WhileExpr` class directly.
    * Use the subclass `WhileExpr`, where the following predicates are available.
    */
-  class WhileExpr extends Synth::TWhileExpr, ExprImpl::Expr {
+  class WhileExpr extends Synth::TWhileExpr, LoopingExprImpl::LoopingExpr {
     override string getAPrimaryQlClass() { result = "WhileExpr" }
 
     /**
@@ -58,33 +56,5 @@ module Generated {
      * Holds if `getCondition()` exists.
      */
     final predicate hasCondition() { exists(this.getCondition()) }
-
-    /**
-     * Gets the label of this while expression, if it exists.
-     */
-    Label getLabel() {
-      result =
-        Synth::convertLabelFromRaw(Synth::convertWhileExprToRaw(this).(Raw::WhileExpr).getLabel())
-    }
-
-    /**
-     * Holds if `getLabel()` exists.
-     */
-    final predicate hasLabel() { exists(this.getLabel()) }
-
-    /**
-     * Gets the loop body of this while expression, if it exists.
-     */
-    BlockExpr getLoopBody() {
-      result =
-        Synth::convertBlockExprFromRaw(Synth::convertWhileExprToRaw(this)
-              .(Raw::WhileExpr)
-              .getLoopBody())
-    }
-
-    /**
-     * Holds if `getLoopBody()` exists.
-     */
-    final predicate hasLoopBody() { exists(this.getLoopBody()) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/frameworks/Reqwest.qll b/rust/ql/lib/codeql/rust/frameworks/Reqwest.qll
new file mode 100644
index 00000000000..f46c12feab9
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/frameworks/Reqwest.qll
@@ -0,0 +1,20 @@
+/**
+ * Provides modeling for the `reqwest` library.
+ */
+
+private import rust
+private import codeql.rust.Concepts
+
+/**
+ * A call to `reqwest::get` or `reqwest::blocking::get`.
+ */
+private class ReqwestGet extends RemoteSource::Range {
+  ReqwestGet() {
+    exists(CallExpr ce |
+      this.asExpr().getExpr() = ce and
+      ce.getFunction().(PathExpr).getPath().getResolvedCrateOrigin().matches("%reqwest") and
+      ce.getFunction().(PathExpr).getPath().getResolvedPath() =
+        ["crate::get", "crate::blocking::get"]
+    )
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/frameworks/Sqlx.qll b/rust/ql/lib/codeql/rust/frameworks/Sqlx.qll
new file mode 100644
index 00000000000..f00c7375448
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/frameworks/Sqlx.qll
@@ -0,0 +1,40 @@
+/**
+ * Provides modeling for the `SQLx` library.
+ */
+
+private import rust
+private import codeql.rust.Concepts
+private import codeql.rust.dataflow.DataFlow
+
+/**
+ * A call to `sqlx::query` and variations.
+ */
+private class SqlxQuery extends SqlConstruction::Range {
+  CallExpr call;
+
+  SqlxQuery() {
+    this.asExpr().getExpr() = call and
+    call.getFunction().(PathExpr).getPath().getResolvedPath() =
+      [
+        "crate::query::query", "crate::query_as::query_as", "crate::query_with::query_with",
+        "crate::query_as_with::query_as_with", "crate::query_scalar::query_scalar",
+        "crate::query_scalar_with::query_scalar_with", "crate::raw_sql::raw_sql"
+      ]
+  }
+
+  override DataFlow::Node getSql() { result.asExpr().getExpr() = call.getArgList().getArg(0) }
+}
+
+/**
+ * A call to `sqlx::Executor::execute`.
+ */
+private class SqlxExecute extends SqlExecution::Range {
+  MethodCallExpr call;
+
+  SqlxExecute() {
+    this.asExpr().getExpr() = call and
+    call.(Resolvable).getResolvedPath() = "crate::executor::Executor::execute"
+  }
+
+  override DataFlow::Node getSql() { result.asExpr().getExpr() = call.getArgList().getArg(0) }
+}
diff --git a/rust/ql/lib/codeql/rust/frameworks/stdlib/Env.qll b/rust/ql/lib/codeql/rust/frameworks/stdlib/Env.qll
new file mode 100644
index 00000000000..3e769ae84d4
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/frameworks/stdlib/Env.qll
@@ -0,0 +1,36 @@
+/**
+ * Provides modeling for the `std::env` library.
+ */
+
+private import rust
+private import codeql.rust.Concepts
+
+/**
+ * A call to `std::env::args` or `std::env::args_os`.
+ */
+private class StdEnvArgs extends CommandLineArgsSource::Range {
+  StdEnvArgs() {
+    this.asExpr().getExpr().(CallExpr).getFunction().(PathExpr).getPath().getResolvedPath() =
+      ["crate::env::args", "crate::env::args_os"]
+  }
+}
+
+/**
+ * A call to `std::env::current_dir`, `std::env::current_exe` or `std::env::home_dir`.
+ */
+private class StdEnvDir extends CommandLineArgsSource::Range {
+  StdEnvDir() {
+    this.asExpr().getExpr().(CallExpr).getFunction().(PathExpr).getPath().getResolvedPath() =
+      ["crate::env::current_dir", "crate::env::current_exe", "crate::env::home_dir"]
+  }
+}
+
+/**
+ * A call to `std::env::var`, `std::env::var_os`, `std::env::vars` or `std::env::vars_os`.
+ */
+private class StdEnvVar extends EnvironmentSource::Range {
+  StdEnvVar() {
+    this.asExpr().getExpr().(CallExpr).getFunction().(PathExpr).getPath().getResolvedPath() =
+      ["crate::env::var", "crate::env::var_os", "crate::env::vars", "crate::env::vars_os"]
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/internal/CachedStages.qll b/rust/ql/lib/codeql/rust/internal/CachedStages.qll
index 162853846f2..1fdd3c2a9b8 100644
--- a/rust/ql/lib/codeql/rust/internal/CachedStages.qll
+++ b/rust/ql/lib/codeql/rust/internal/CachedStages.qll
@@ -71,6 +71,7 @@ module Stages {
     private import codeql.rust.controlflow.internal.Splitting
     private import codeql.rust.controlflow.internal.SuccessorType
     private import codeql.rust.controlflow.internal.ControlFlowGraphImpl
+    private import codeql.rust.controlflow.CfgNodes
 
     /**
      * Always holds.
@@ -93,6 +94,8 @@ module Stages {
       exists(TNormalSuccessor())
       or
       exists(AstCfgNode n)
+      or
+      exists(CallExprCfgNode n | exists(n.getFunction()))
     }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/security/SqlInjectionExtensions.qll b/rust/ql/lib/codeql/rust/security/SqlInjectionExtensions.qll
new file mode 100644
index 00000000000..db6239d7811
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/security/SqlInjectionExtensions.qll
@@ -0,0 +1,50 @@
+/**
+ * Provides classes and predicates for reasoning about database
+ * queries built from user-controlled sources (that is, SQL injection
+ * vulnerabilities).
+ */
+
+import rust
+private import codeql.rust.dataflow.DataFlow
+private import codeql.rust.Concepts
+private import codeql.util.Unit
+
+/**
+ * Provides default sources, sinks and barriers for detecting SQL injection
+ * vulnerabilities, as well as extension points for adding your own.
+ */
+module SqlInjection {
+  /**
+   * A data flow source for SQL injection vulnerabilities.
+   */
+  abstract class Source extends DataFlow::Node { }
+
+  /**
+   * A data flow sink for SQL injection vulnerabilities.
+   */
+  abstract class Sink extends DataFlow::Node { }
+
+  /**
+   * A barrier for SQL injection vulnerabilities.
+   */
+  abstract class Barrier extends DataFlow::Node { }
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
+
+  /**
+   * A flow sink that is the statement of an SQL construction.
+   */
+  class SqlConstructionAsSink extends Sink {
+    SqlConstructionAsSink() { this = any(SqlConstruction c).getSql() }
+  }
+
+  /**
+   * A flow sink that is the statement of an SQL execution.
+   */
+  class SqlExecutionAsSink extends Sink {
+    SqlExecutionAsSink() { this = any(SqlExecution e).getSql() }
+  }
+}
diff --git a/rust/ql/lib/qlpack.yml b/rust/ql/lib/qlpack.yml
index 649d02c8e3a..53ccf6dfced 100644
--- a/rust/ql/lib/qlpack.yml
+++ b/rust/ql/lib/qlpack.yml
@@ -8,6 +8,7 @@ dependencies:
   codeql/controlflow: ${workspace}
   codeql/dataflow: ${workspace}
   codeql/regex: ${workspace}
+  codeql/threat-models: ${workspace}
   codeql/mad: ${workspace}
   codeql/ssa: ${workspace}
   codeql/tutorial: ${workspace}
diff --git a/rust/ql/lib/rust.dbscheme b/rust/ql/lib/rust.dbscheme
index 666a1e2b0e1..c0f9cf44822 100644
--- a/rust/ql/lib/rust.dbscheme
+++ b/rust/ql/lib/rust.dbscheme
@@ -120,10 +120,18 @@ locatable_locations(
 // from schema
 
 @element =
-  @locatable
+  @extractor_step
+| @locatable
 | @unextracted
 ;
 
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int file: @file ref,
+  int duration_ms: int ref
+);
+
 @locatable =
   @ast_node
 ;
@@ -135,6 +143,7 @@ locatable_locations(
 
 @ast_node =
   @abi
+| @addressable
 | @arg_list
 | @assoc_item
 | @assoc_item_list
@@ -162,7 +171,7 @@ locatable_locations(
 | @meta
 | @name
 | @name_ref
-| @param
+| @param_base
 | @param_list
 | @pat
 | @path_segment
@@ -173,9 +182,8 @@ locatable_locations(
 | @record_pat_field_list
 | @rename
 | @resolvable
-| @ret_type
+| @ret_type_repr
 | @return_type_syntax
-| @self_param
 | @source_file
 | @stmt
 | @stmt_list
@@ -184,10 +192,9 @@ locatable_locations(
 | @tuple_field
 | @type_bound
 | @type_bound_list
-| @type_ref
+| @type_repr
 | @use_tree
 | @use_tree_list
-| @variant
 | @variant_list
 | @visibility
 | @where_clause
@@ -212,6 +219,23 @@ abi_abi_strings(
   string abi_string: string ref
 );
 
+@addressable =
+  @item
+| @variant
+;
+
+#keyset[id]
+addressable_extended_canonical_paths(
+  int id: @addressable ref,
+  string extended_canonical_path: string ref
+);
+
+#keyset[id]
+addressable_crate_origins(
+  int id: @addressable ref,
+  string crate_origin: string ref
+);
+
 arg_lists(
   unique int id: @arg_list
 );
@@ -287,25 +311,23 @@ closure_binder_generic_param_lists(
 );
 
 @expr =
-  @array_expr
+  @array_expr_internal
 | @asm_expr
 | @await_expr
 | @become_expr
 | @binary_expr
-| @block_expr
 | @break_expr
 | @call_expr_base
 | @cast_expr
 | @closure_expr
 | @continue_expr
 | @field_expr
-| @for_expr
 | @format_args_expr
 | @if_expr
 | @index_expr
+| @labelable_expr
 | @let_expr
 | @literal_expr
-| @loop_expr
 | @macro_expr
 | @match_expr
 | @offset_of_expr
@@ -319,7 +341,6 @@ closure_binder_generic_param_lists(
 | @try_expr
 | @tuple_expr
 | @underscore_expr
-| @while_expr
 | @yeet_expr
 | @yield_expr
 ;
@@ -585,27 +606,22 @@ name_ref_texts(
   string text: string ref
 );
 
-params(
-  unique int id: @param
-);
+@param_base =
+  @param
+| @self_param
+;
 
 #keyset[id, index]
-param_attrs(
-  int id: @param ref,
+param_base_attrs(
+  int id: @param_base ref,
   int index: int ref,
   int attr: @attr ref
 );
 
 #keyset[id]
-param_pats(
-  int id: @param ref,
-  int pat: @pat ref
-);
-
-#keyset[id]
-param_ties(
-  int id: @param ref,
-  int ty: @type_ref ref
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
 );
 
 param_lists(
@@ -669,13 +685,13 @@ path_segment_param_lists(
 #keyset[id]
 path_segment_path_types(
   int id: @path_segment ref,
-  int path_type: @path_type ref
+  int path_type: @path_type_repr ref
 );
 
 #keyset[id]
 path_segment_ret_types(
   int id: @path_segment ref,
-  int ret_type: @ret_type ref
+  int ret_type: @ret_type_repr ref
 );
 
 #keyset[id]
@@ -685,9 +701,9 @@ path_segment_return_type_syntaxes(
 );
 
 #keyset[id]
-path_segment_ties(
+path_segment_type_reprs(
   int id: @path_segment ref,
-  int ty: @type_ref ref
+  int type_repr: @type_repr ref
 );
 
 record_expr_fields(
@@ -755,9 +771,9 @@ record_field_names(
 );
 
 #keyset[id]
-record_field_ties(
+record_field_type_reprs(
   int id: @record_field ref,
-  int ty: @type_ref ref
+  int type_repr: @type_repr ref
 );
 
 #keyset[id]
@@ -833,54 +849,20 @@ resolvable_resolved_crate_origins(
   string resolved_crate_origin: string ref
 );
 
-ret_types(
-  unique int id: @ret_type
+ret_type_reprs(
+  unique int id: @ret_type_repr
 );
 
 #keyset[id]
-ret_type_ties(
-  int id: @ret_type ref,
-  int ty: @type_ref ref
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
 );
 
 return_type_syntaxes(
   unique int id: @return_type_syntax
 );
 
-self_params(
-  unique int id: @self_param
-);
-
-#keyset[id, index]
-self_param_attrs(
-  int id: @self_param ref,
-  int index: int ref,
-  int attr: @attr ref
-);
-
-#keyset[id]
-self_param_is_mut(
-  int id: @self_param ref
-);
-
-#keyset[id]
-self_param_lifetimes(
-  int id: @self_param ref,
-  int lifetime: @lifetime ref
-);
-
-#keyset[id]
-self_param_names(
-  int id: @self_param ref,
-  int name: @name ref
-);
-
-#keyset[id]
-self_param_ties(
-  int id: @self_param ref,
-  int ty: @type_ref ref
-);
-
 source_files(
   unique int id: @source_file
 );
@@ -949,9 +931,9 @@ tuple_field_attrs(
 );
 
 #keyset[id]
-tuple_field_ties(
+tuple_field_type_reprs(
   int id: @tuple_field ref,
-  int ty: @type_ref ref
+  int type_repr: @type_repr ref
 );
 
 #keyset[id]
@@ -987,9 +969,9 @@ type_bound_lifetimes(
 );
 
 #keyset[id]
-type_bound_ties(
+type_bound_type_reprs(
   int id: @type_bound ref,
-  int ty: @type_ref ref
+  int type_repr: @type_repr ref
 );
 
 type_bound_lists(
@@ -1003,21 +985,21 @@ type_bound_list_bounds(
   int bound: @type_bound ref
 );
 
-@type_ref =
-  @array_type
-| @dyn_trait_type
-| @fn_ptr_type
-| @for_type
-| @impl_trait_type
-| @infer_type
-| @macro_type
-| @never_type
-| @paren_type
-| @path_type
-| @ptr_type
-| @ref_type
-| @slice_type
-| @tuple_type
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
 ;
 
 use_trees(
@@ -1053,41 +1035,6 @@ use_tree_list_use_trees(
   int use_tree: @use_tree ref
 );
 
-variants(
-  unique int id: @variant
-);
-
-#keyset[id, index]
-variant_attrs(
-  int id: @variant ref,
-  int index: int ref,
-  int attr: @attr ref
-);
-
-#keyset[id]
-variant_exprs(
-  int id: @variant ref,
-  int expr: @expr ref
-);
-
-#keyset[id]
-variant_field_lists(
-  int id: @variant ref,
-  int field_list: @field_list ref
-);
-
-#keyset[id]
-variant_names(
-  int id: @variant ref,
-  int name: @name ref
-);
-
-#keyset[id]
-variant_visibilities(
-  int id: @variant ref,
-  int visibility: @visibility ref
-);
-
 variant_lists(
   unique int id: @variant_list
 );
@@ -1137,9 +1084,9 @@ where_pred_lifetimes(
 );
 
 #keyset[id]
-where_pred_ties(
+where_pred_type_reprs(
   int id: @where_pred ref,
-  int ty: @type_ref ref
+  int type_repr: @type_repr ref
 );
 
 #keyset[id]
@@ -1148,38 +1095,43 @@ where_pred_type_bound_lists(
   int type_bound_list: @type_bound_list ref
 );
 
-array_exprs(
-  unique int id: @array_expr
+array_expr_internals(
+  unique int id: @array_expr_internal
 );
 
 #keyset[id, index]
-array_expr_attrs(
-  int id: @array_expr ref,
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
   int index: int ref,
   int attr: @attr ref
 );
 
 #keyset[id, index]
-array_expr_exprs(
-  int id: @array_expr ref,
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
   int index: int ref,
   int expr: @expr ref
 );
 
-array_types(
-  unique int id: @array_type
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
 );
 
 #keyset[id]
-array_type_const_args(
-  int id: @array_type ref,
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
   int const_arg: @const_arg ref
 );
 
 #keyset[id]
-array_type_ties(
-  int id: @array_type ref,
-  int ty: @type_ref ref
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
 );
 
 asm_exprs(
@@ -1230,7 +1182,7 @@ assoc_type_arg_param_lists(
 #keyset[id]
 assoc_type_arg_ret_types(
   int id: @assoc_type_arg ref,
-  int ret_type: @ret_type ref
+  int ret_type: @ret_type_repr ref
 );
 
 #keyset[id]
@@ -1240,9 +1192,9 @@ assoc_type_arg_return_type_syntaxes(
 );
 
 #keyset[id]
-assoc_type_arg_ties(
+assoc_type_arg_type_reprs(
   int id: @assoc_type_arg ref,
-  int ty: @type_ref ref
+  int type_repr: @type_repr ref
 );
 
 #keyset[id]
@@ -1314,59 +1266,6 @@ binary_expr_rhs(
   int rhs: @expr ref
 );
 
-block_exprs(
-  unique int id: @block_expr
-);
-
-#keyset[id, index]
-block_expr_attrs(
-  int id: @block_expr ref,
-  int index: int ref,
-  int attr: @attr ref
-);
-
-#keyset[id]
-block_expr_is_async(
-  int id: @block_expr ref
-);
-
-#keyset[id]
-block_expr_is_const(
-  int id: @block_expr ref
-);
-
-#keyset[id]
-block_expr_is_gen(
-  int id: @block_expr ref
-);
-
-#keyset[id]
-block_expr_is_move(
-  int id: @block_expr ref
-);
-
-#keyset[id]
-block_expr_is_try(
-  int id: @block_expr ref
-);
-
-#keyset[id]
-block_expr_is_unsafe(
-  int id: @block_expr ref
-);
-
-#keyset[id]
-block_expr_labels(
-  int id: @block_expr ref,
-  int label: @label ref
-);
-
-#keyset[id]
-block_expr_stmt_lists(
-  int id: @block_expr ref,
-  int stmt_list: @stmt_list ref
-);
-
 box_pats(
   unique int id: @box_pat
 );
@@ -1436,9 +1335,9 @@ cast_expr_exprs(
 );
 
 #keyset[id]
-cast_expr_ties(
+cast_expr_type_reprs(
   int id: @cast_expr ref,
-  int ty: @type_ref ref
+  int type_repr: @type_repr ref
 );
 
 closure_exprs(
@@ -1485,7 +1384,7 @@ closure_expr_is_static(
 #keyset[id]
 closure_expr_ret_types(
   int id: @closure_expr ref,
-  int ret_type: @ret_type ref
+  int ret_type: @ret_type_repr ref
 );
 
 comments(
@@ -1548,9 +1447,9 @@ const_param_names(
 );
 
 #keyset[id]
-const_param_ties(
+const_param_type_reprs(
   int id: @const_param ref,
-  int ty: @type_ref ref
+  int type_repr: @type_repr ref
 );
 
 continue_exprs(
@@ -1570,13 +1469,13 @@ continue_expr_lifetimes(
   int lifetime: @lifetime ref
 );
 
-dyn_trait_types(
-  unique int id: @dyn_trait_type
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
 );
 
 #keyset[id]
-dyn_trait_type_type_bound_lists(
-  int id: @dyn_trait_type ref,
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
   int type_bound_list: @type_bound_list ref
 );
 
@@ -1613,92 +1512,57 @@ field_expr_name_refs(
   int name_ref: @name_ref ref
 );
 
-fn_ptr_types(
-  unique int id: @fn_ptr_type
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
 );
 
 #keyset[id]
-fn_ptr_type_abis(
-  int id: @fn_ptr_type ref,
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
   int abi: @abi ref
 );
 
 #keyset[id]
-fn_ptr_type_is_async(
-  int id: @fn_ptr_type ref
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
 );
 
 #keyset[id]
-fn_ptr_type_is_const(
-  int id: @fn_ptr_type ref
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
 );
 
 #keyset[id]
-fn_ptr_type_is_unsafe(
-  int id: @fn_ptr_type ref
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
 );
 
 #keyset[id]
-fn_ptr_type_param_lists(
-  int id: @fn_ptr_type ref,
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
   int param_list: @param_list ref
 );
 
 #keyset[id]
-fn_ptr_type_ret_types(
-  int id: @fn_ptr_type ref,
-  int ret_type: @ret_type ref
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
 );
 
-for_exprs(
-  unique int id: @for_expr
-);
-
-#keyset[id, index]
-for_expr_attrs(
-  int id: @for_expr ref,
-  int index: int ref,
-  int attr: @attr ref
+for_type_reprs(
+  unique int id: @for_type_repr
 );
 
 #keyset[id]
-for_expr_iterables(
-  int id: @for_expr ref,
-  int iterable: @expr ref
-);
-
-#keyset[id]
-for_expr_labels(
-  int id: @for_expr ref,
-  int label: @label ref
-);
-
-#keyset[id]
-for_expr_loop_bodies(
-  int id: @for_expr ref,
-  int loop_body: @block_expr ref
-);
-
-#keyset[id]
-for_expr_pats(
-  int id: @for_expr ref,
-  int pat: @pat ref
-);
-
-for_types(
-  unique int id: @for_type
-);
-
-#keyset[id]
-for_type_generic_param_lists(
-  int id: @for_type ref,
+for_type_repr_generic_param_lists(
+  int id: @for_type_repr ref,
   int generic_param_list: @generic_param_list ref
 );
 
 #keyset[id]
-for_type_ties(
-  int id: @for_type ref,
-  int ty: @type_ref ref
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
 );
 
 format_args_exprs(
@@ -1787,13 +1651,13 @@ if_expr_thens(
   int then: @block_expr ref
 );
 
-impl_trait_types(
-  unique int id: @impl_trait_type
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
 );
 
 #keyset[id]
-impl_trait_type_type_bound_lists(
-  int id: @impl_trait_type ref,
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
   int type_bound_list: @type_bound_list ref
 );
 
@@ -1820,8 +1684,8 @@ index_expr_indices(
   int index: @expr ref
 );
 
-infer_types(
-  unique int id: @infer_type
+infer_type_reprs(
+  unique int id: @infer_type_repr
 );
 
 @item =
@@ -1844,16 +1708,15 @@ infer_types(
 | @use
 ;
 
-#keyset[id]
-item_extended_canonical_paths(
-  int id: @item ref,
-  string extended_canonical_path: string ref
-);
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
 
 #keyset[id]
-item_crate_origins(
-  int id: @item ref,
-  string crate_origin: string ref
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
 );
 
 let_exprs(
@@ -1868,9 +1731,9 @@ let_expr_attrs(
 );
 
 #keyset[id]
-let_expr_exprs(
+let_expr_scrutinees(
   int id: @let_expr ref,
-  int expr: @expr ref
+  int scrutinee: @expr ref
 );
 
 #keyset[id]
@@ -1909,9 +1772,9 @@ let_stmt_pats(
 );
 
 #keyset[id]
-let_stmt_ties(
+let_stmt_type_reprs(
   int id: @let_stmt ref,
-  int ty: @type_ref ref
+  int type_repr: @type_repr ref
 );
 
 lifetime_args(
@@ -1974,29 +1837,6 @@ literal_pat_literals(
   int literal: @literal_expr ref
 );
 
-loop_exprs(
-  unique int id: @loop_expr
-);
-
-#keyset[id, index]
-loop_expr_attrs(
-  int id: @loop_expr ref,
-  int index: int ref,
-  int attr: @attr ref
-);
-
-#keyset[id]
-loop_expr_labels(
-  int id: @loop_expr ref,
-  int label: @label ref
-);
-
-#keyset[id]
-loop_expr_loop_bodies(
-  int id: @loop_expr ref,
-  int loop_body: @block_expr ref
-);
-
 macro_exprs(
   unique int id: @macro_expr
 );
@@ -2017,13 +1857,13 @@ macro_pat_macro_calls(
   int macro_call: @macro_call ref
 );
 
-macro_types(
-  unique int id: @macro_type
+macro_type_reprs(
+  unique int id: @macro_type_repr
 );
 
 #keyset[id]
-macro_type_macro_calls(
-  int id: @macro_type ref,
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
   int macro_call: @macro_call ref
 );
 
@@ -2039,9 +1879,9 @@ match_expr_attrs(
 );
 
 #keyset[id]
-match_expr_exprs(
+match_expr_scrutinees(
   int id: @match_expr ref,
-  int expr: @expr ref
+  int scrutinee: @expr ref
 );
 
 #keyset[id]
@@ -2050,8 +1890,8 @@ match_expr_match_arm_lists(
   int match_arm_list: @match_arm_list ref
 );
 
-never_types(
-  unique int id: @never_type
+never_type_reprs(
+  unique int id: @never_type_repr
 );
 
 offset_of_exprs(
@@ -2073,9 +1913,9 @@ offset_of_expr_fields(
 );
 
 #keyset[id]
-offset_of_expr_ties(
+offset_of_expr_type_reprs(
   int id: @offset_of_expr ref,
-  int ty: @type_ref ref
+  int type_repr: @type_repr ref
 );
 
 or_pats(
@@ -2089,6 +1929,16 @@ or_pat_pats(
   int pat: @pat ref
 );
 
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
 paren_exprs(
   unique int id: @paren_expr
 );
@@ -2116,14 +1966,14 @@ paren_pat_pats(
   int pat: @pat ref
 );
 
-paren_types(
-  unique int id: @paren_type
+paren_type_reprs(
+  unique int id: @paren_type_repr
 );
 
 #keyset[id]
-paren_type_ties(
-  int id: @paren_type ref,
-  int ty: @type_ref ref
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
 );
 
 paths(
@@ -2156,13 +2006,13 @@ path_pat_paths(
   int path: @path ref
 );
 
-path_types(
-  unique int id: @path_type
+path_type_reprs(
+  unique int id: @path_type_repr
 );
 
 #keyset[id]
-path_type_paths(
-  int id: @path_type ref,
+path_type_repr_paths(
+  int id: @path_type_repr ref,
   int path: @path ref
 );
 
@@ -2189,24 +2039,24 @@ prefix_expr_operator_names(
   string operator_name: string ref
 );
 
-ptr_types(
-  unique int id: @ptr_type
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
 );
 
 #keyset[id]
-ptr_type_is_const(
-  int id: @ptr_type ref
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
 );
 
 #keyset[id]
-ptr_type_is_mut(
-  int id: @ptr_type ref
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
 );
 
 #keyset[id]
-ptr_type_ties(
-  int id: @ptr_type ref,
-  int ty: @type_ref ref
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
 );
 
 range_exprs(
@@ -2350,25 +2200,25 @@ ref_pat_pats(
   int pat: @pat ref
 );
 
-ref_types(
-  unique int id: @ref_type
+ref_type_reprs(
+  unique int id: @ref_type_repr
 );
 
 #keyset[id]
-ref_type_is_mut(
-  int id: @ref_type ref
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
 );
 
 #keyset[id]
-ref_type_lifetimes(
-  int id: @ref_type ref,
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
   int lifetime: @lifetime ref
 );
 
 #keyset[id]
-ref_type_ties(
-  int id: @ref_type ref,
-  int ty: @type_ref ref
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
 );
 
 rest_pats(
@@ -2399,6 +2249,27 @@ return_expr_exprs(
   int expr: @expr ref
 );
 
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
 slice_pats(
   unique int id: @slice_pat
 );
@@ -2410,14 +2281,14 @@ slice_pat_pats(
   int pat: @pat ref
 );
 
-slice_types(
-  unique int id: @slice_type
+slice_type_reprs(
+  unique int id: @slice_type_repr
 );
 
 #keyset[id]
-slice_type_ties(
-  int id: @slice_type ref,
-  int ty: @type_ref ref
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
 );
 
 try_exprs(
@@ -2494,15 +2365,15 @@ tuple_struct_pat_paths(
   int path: @path ref
 );
 
-tuple_types(
-  unique int id: @tuple_type
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
 );
 
 #keyset[id, index]
-tuple_type_fields(
-  int id: @tuple_type ref,
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
   int index: int ref,
-  int field: @type_ref ref
+  int field: @type_repr ref
 );
 
 type_args(
@@ -2510,9 +2381,9 @@ type_args(
 );
 
 #keyset[id]
-type_arg_ties(
+type_arg_type_reprs(
   int id: @type_arg ref,
-  int ty: @type_ref ref
+  int type_repr: @type_repr ref
 );
 
 type_params(
@@ -2529,7 +2400,7 @@ type_param_attrs(
 #keyset[id]
 type_param_default_types(
   int id: @type_param ref,
-  int default_type: @type_ref ref
+  int default_type: @type_repr ref
 );
 
 #keyset[id]
@@ -2555,33 +2426,39 @@ underscore_expr_attrs(
   int attr: @attr ref
 );
 
-while_exprs(
-  unique int id: @while_expr
+variants(
+  unique int id: @variant
 );
 
 #keyset[id, index]
-while_expr_attrs(
-  int id: @while_expr ref,
+variant_attrs(
+  int id: @variant ref,
   int index: int ref,
   int attr: @attr ref
 );
 
 #keyset[id]
-while_expr_conditions(
-  int id: @while_expr ref,
-  int condition: @expr ref
+variant_exprs(
+  int id: @variant ref,
+  int expr: @expr ref
 );
 
 #keyset[id]
-while_expr_labels(
-  int id: @while_expr ref,
-  int label: @label ref
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
 );
 
 #keyset[id]
-while_expr_loop_bodies(
-  int id: @while_expr ref,
-  int loop_body: @block_expr ref
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
 );
 
 wildcard_pats(
@@ -2622,14 +2499,61 @@ yield_expr_exprs(
   int expr: @expr ref
 );
 
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_try(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
 call_exprs(
   unique int id: @call_expr
 );
 
 #keyset[id]
-call_expr_exprs(
+call_expr_functions(
   int id: @call_expr ref,
-  int expr: @expr ref
+  int function: @expr ref
 );
 
 consts(
@@ -2666,9 +2590,9 @@ const_names(
 );
 
 #keyset[id]
-const_ties(
+const_type_reprs(
   int id: @const ref,
-  int ty: @type_ref ref
+  int type_repr: @type_repr ref
 );
 
 #keyset[id]
@@ -2831,7 +2755,7 @@ function_names(
 #keyset[id]
 function_ret_types(
   int id: @function ref,
-  int ret_type: @ret_type ref
+  int ret_type: @ret_type_repr ref
 );
 
 #keyset[id]
@@ -2887,13 +2811,13 @@ impl_is_unsafe(
 #keyset[id]
 impl_self_ties(
   int id: @impl ref,
-  int self_ty: @type_ref ref
+  int self_ty: @type_repr ref
 );
 
 #keyset[id]
 impl_traits(
   int id: @impl ref,
-  int trait: @type_ref ref
+  int trait: @type_repr ref
 );
 
 #keyset[id]
@@ -2908,6 +2832,18 @@ impl_where_clauses(
   int where_clause: @where_clause ref
 );
 
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
 macro_calls(
   unique int id: @macro_call
 );
@@ -3103,9 +3039,9 @@ static_names(
 );
 
 #keyset[id]
-static_ties(
+static_type_reprs(
   int id: @static ref,
-  int ty: @type_ref ref
+  int type_repr: @type_repr ref
 );
 
 #keyset[id]
@@ -3282,9 +3218,9 @@ type_alias_names(
 );
 
 #keyset[id]
-type_alias_ties(
+type_alias_type_reprs(
   int id: @type_alias ref,
-  int ty: @type_ref ref
+  int type_repr: @type_repr ref
 );
 
 #keyset[id]
@@ -3368,3 +3304,54 @@ use_visibilities(
   int id: @use ref,
   int visibility: @visibility ref
 );
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/ql/src/queries/diagnostics/DataFlowConsistencyCounts.ql b/rust/ql/src/queries/diagnostics/DataFlowConsistencyCounts.ql
index 79c582adb08..ecc7d1eb55a 100644
--- a/rust/ql/src/queries/diagnostics/DataFlowConsistencyCounts.ql
+++ b/rust/ql/src/queries/diagnostics/DataFlowConsistencyCounts.ql
@@ -5,17 +5,10 @@
  * @id rust/diagnostics/data-flow-consistency-counts
  */
 
-private import rust
-private import codeql.rust.dataflow.internal.DataFlowImpl
-private import codeql.rust.dataflow.internal.TaintTrackingImpl
-private import codeql.dataflow.internal.DataFlowImplConsistency
-
-private module Input implements InputSig<Location, RustDataFlow> { }
+import codeql.rust.dataflow.internal.DataFlowConsistency as Consistency
 
 // see also `rust/diagnostics/data-flow-consistency`, which lists the
 // individual inconsistency results.
 from string type, int num
-where
-  num =
-    MakeConsistency<Location, RustDataFlow, RustTaintTracking, Input>::getInconsistencyCounts(type)
+where num = Consistency::getInconsistencyCounts(type)
 select type, num
diff --git a/rust/ql/src/queries/diagnostics/ExtractedFiles.ql b/rust/ql/src/queries/diagnostics/ExtractedFiles.ql
index ce5aa699e67..112fb2949dc 100644
--- a/rust/ql/src/queries/diagnostics/ExtractedFiles.ql
+++ b/rust/ql/src/queries/diagnostics/ExtractedFiles.ql
@@ -8,6 +8,6 @@
 
 import rust
 
-from File f
+from ExtractedFile f
 where exists(f.getRelativePath())
 select f, "File successfully extracted."
diff --git a/rust/ql/src/queries/diagnostics/ExtractionErrors.ql b/rust/ql/src/queries/diagnostics/ExtractionErrors.ql
index 68be66f8ca9..bd5ec3426fb 100644
--- a/rust/ql/src/queries/diagnostics/ExtractionErrors.ql
+++ b/rust/ql/src/queries/diagnostics/ExtractionErrors.ql
@@ -11,7 +11,7 @@ import codeql.files.FileSystem
 /** Gets the SARIF severity to associate with an error. */
 int getSeverity() { result = 2 }
 
-from ExtractionError error, File f
+from ExtractionError error, ExtractedFile f
 where
   f = error.getLocation().getFile() and
   exists(f.getRelativePath())
diff --git a/rust/ql/src/queries/diagnostics/UnextractedElements.ql b/rust/ql/src/queries/diagnostics/UnextractedElements.ql
index dccf7d2ab09..1a819e3f784 100644
--- a/rust/ql/src/queries/diagnostics/UnextractedElements.ql
+++ b/rust/ql/src/queries/diagnostics/UnextractedElements.ql
@@ -1,6 +1,7 @@
 /**
  * @name Unextracted Elements
  * @description List all elements that weren't extracted due to unimplemented features or parse errors.
+ * @kind diagnostic
  * @id rust/diagnostics/unextracted-elements
  */
 
diff --git a/rust/ql/src/queries/diagnostics/UnresolvedMacroCalls.ql b/rust/ql/src/queries/diagnostics/UnresolvedMacroCalls.ql
new file mode 100644
index 00000000000..a20c5035b6a
--- /dev/null
+++ b/rust/ql/src/queries/diagnostics/UnresolvedMacroCalls.ql
@@ -0,0 +1,12 @@
+/**
+ * @name Unresolved Macro Calls
+ * @description List all macro calls that were not resolved to a target.
+ * @kind diagnostic
+ * @id rust/diagnostics/unresolved-macro-calls
+ */
+
+import rust
+
+from MacroCall mc
+where not mc.hasExpanded()
+select mc, "Macro call was not resolved to a target."
diff --git a/rust/ql/src/queries/security/CWE-089/SqlInjection.qhelp b/rust/ql/src/queries/security/CWE-089/SqlInjection.qhelp
new file mode 100644
index 00000000000..0b56ac54d0d
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-089/SqlInjection.qhelp
@@ -0,0 +1,39 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+<overview>
+
+<p>
+If a database query (such as an SQL query) is built from user-provided data without sufficient sanitization, a user may be able to run malicious database queries. An attacker can craft the part of the query they control to change the overall meaning of the query.
+</p>
+
+</overview>
+<recommendation>
+
+<p>
+Most database connector libraries offer a way to safely embed untrusted data into a query using query parameters or prepared statements. You should use these features to build queries, rather than string concatenation or similar methods. You can also escape (sanitize) user-controlled strings so that they can be included directly in an SQL command. A library function should be used for escaping, because this approach is only safe if the escaping function is robust against all possible inputs.
+</p>
+
+</recommendation>
+<example>
+
+<p>
+In the following examples, an SQL query is prepared using string formatting to directly include a user-controlled value <code>remote_controlled_string</code>. An attacker could craft <code>remote_controlled_string</code> to change the overall meaning of the SQL query.
+</p>
+
+<sample src="SqlInjectionBad.rs" />
+
+<p>A better way to do this is with a prepared statement, binding <code>remote_controlled_string</code> to a parameter of that statement. An attacker who controls <code>remote_controlled_string</code> now cannot change the overall meaning of the query.
+</p>
+
+<sample src="SqlInjectionGood.rs" />
+
+</example>
+<references>
+
+<li>Wikipedia: <a href="https://en.wikipedia.org/wiki/SQL_injection">SQL injection</a>.</li>
+<li>OWASP: <a href="https://cheatsheetseries.owasp.org/cheatsheets/SQL_Injection_Prevention_Cheat_Sheet.html">SQL Injection Prevention Cheat Sheet</a>.</li>
+
+</references>
+</qhelp>
diff --git a/rust/ql/src/queries/security/CWE-089/SqlInjection.ql b/rust/ql/src/queries/security/CWE-089/SqlInjection.ql
new file mode 100644
index 00000000000..ee2a3d14486
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-089/SqlInjection.ql
@@ -0,0 +1,35 @@
+/**
+ * @name Database query built from user-controlled sources
+ * @description Building a database query from user-controlled sources is vulnerable to insertion of malicious code by attackers.
+ * @kind path-problem
+ * @problem.severity error
+ * @security-severity 8.8
+ * @precision high
+ * @id rust/sql-injection
+ * @tags security
+ *       external/cwe/cwe-089
+ */
+
+import rust
+import codeql.rust.dataflow.DataFlow
+import codeql.rust.dataflow.TaintTracking
+import codeql.rust.security.SqlInjectionExtensions
+import SqlInjectionFlow::PathGraph
+
+/**
+ * A taint configuration for tainted data that reaches a SQL sink.
+ */
+module SqlInjectionConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node node) { node instanceof SqlInjection::Source }
+
+  predicate isSink(DataFlow::Node node) { node instanceof SqlInjection::Sink }
+
+  predicate isBarrier(DataFlow::Node barrier) { barrier instanceof SqlInjection::Barrier }
+}
+
+module SqlInjectionFlow = TaintTracking::Global<SqlInjectionConfig>;
+
+from SqlInjectionFlow::PathNode sourceNode, SqlInjectionFlow::PathNode sinkNode
+where SqlInjectionFlow::flowPath(sourceNode, sinkNode)
+select sinkNode.getNode(), sourceNode, sinkNode, "This query depends on a $@.",
+  sourceNode.getNode(), "user-provided value"
diff --git a/rust/ql/src/queries/security/CWE-089/SqlInjectionBad.rs b/rust/ql/src/queries/security/CWE-089/SqlInjectionBad.rs
new file mode 100644
index 00000000000..4184399a4f1
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-089/SqlInjectionBad.rs
@@ -0,0 +1,7 @@
+// with SQLx
+
+let unsafe_query = format!("SELECT * FROM people WHERE firstname='{remote_controlled_string}'");
+
+let _ = conn.execute(unsafe_query.as_str()).await?; // BAD (arbitrary SQL injection is possible)
+
+let _ = sqlx::query(unsafe_query.as_str()).fetch_all(&mut conn).await?; // BAD (arbitrary SQL injection is possible)
diff --git a/rust/ql/src/queries/security/CWE-089/SqlInjectionGood.rs b/rust/ql/src/queries/security/CWE-089/SqlInjectionGood.rs
new file mode 100644
index 00000000000..238665cc273
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-089/SqlInjectionGood.rs
@@ -0,0 +1,5 @@
+// with SQLx
+
+let prepared_query = "SELECT * FROM people WHERE firstname=?";
+
+let _ = sqlx::query(prepared_query_1).bind(&remote_controlled_string).fetch_all(&mut conn).await?; // GOOD (prepared statement with bound parameter)
diff --git a/rust/ql/src/queries/security/CWE-696/BadCtorInitialization.qhelp b/rust/ql/src/queries/security/CWE-696/BadCtorInitialization.qhelp
new file mode 100644
index 00000000000..8dd16d6f6b1
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-696/BadCtorInitialization.qhelp
@@ -0,0 +1,44 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+<overview>
+
+<p>
+Calling functions and methods in the Rust <code>std</code> library from a <code>#[ctor]</code> or <code>#[dtor]</code> function is not safe. This is because the <code>std</code> library only guarantees stability and portability between the beginning and the end of <code>main</code>, whereas <code>#[ctor]</code> functions are called before <code>main</code>, and <code>#[dtor]</code> functions are called after it.
+</p>
+
+</overview>
+<recommendation>
+
+<p>
+Do not call any part of the <code>std</code> library from a <code>#[ctor]</code> or <code>#[dtor]</code> function. Instead either:
+</p>
+<ul>
+  <li>Move the code to a different location, such as inside your program's <code>main</code> function.</li>
+  <li>Rewrite the code using an alternative library.</li>
+</ul>
+
+</recommendation>
+<example>
+
+<p>
+In the following example, a <code>#[ctor]</code> function uses the <code>println!</code> macro which calls <code>std</code> library functions. This may cause unexpected behavior at runtime.
+</p>
+
+<sample src="BadCtorInitializationBad.rs" />
+
+<p>
+The issue can be fixed by replacing <code>println!</code> with something that does not rely on the <code>std</code> library. In the fixed code below, we used the <code>libc_println!</code> macro from the <code>libc-print</code> library:
+</p>
+
+<sample src="BadCtorInitializationGood.rs" />
+
+</example>
+<references>
+
+<li>GitHub: <a href="https://github.com/mmastrac/rust-ctor?tab=readme-ov-file#warnings">rust-ctor - Warnings</a>.</li>
+<li>Rust Programming Language: <a href="https://doc.rust-lang.org/std/#use-before-and-after-main">Crate std - Use before and after main()</a>.</li>
+
+</references>
+</qhelp>
diff --git a/rust/ql/src/queries/security/CWE-696/BadCtorInitialization.ql b/rust/ql/src/queries/security/CWE-696/BadCtorInitialization.ql
new file mode 100644
index 00000000000..c7a3e0d1cda
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-696/BadCtorInitialization.ql
@@ -0,0 +1,76 @@
+/**
+ * @name Bad 'ctor' initialization
+ * @description Calling functions in the Rust std library from a ctor or dtor function is not safe.
+ * @kind path-problem
+ * @problem.severity error
+ * @precision high
+ * @id rust/ctor-initialization
+ * @tags reliability
+ *       correctness
+ *       external/cwe/cwe-696
+ *       external/cwe/cwe-665
+ */
+
+import rust
+
+/**
+ * A `#[ctor]` or `#[dtor]` attribute, that is, a source for this query.
+ */
+class CtorAttr extends Attr {
+  string whichAttr;
+
+  CtorAttr() {
+    whichAttr = this.getMeta().getPath().getPart().getNameRef().getText() and
+    whichAttr = ["ctor", "dtor"]
+  }
+
+  string getWhichAttr() { result = whichAttr }
+}
+
+/**
+ * A call into the Rust standard library, that is, a sink for this query.
+ */
+class StdCall extends Expr {
+  StdCall() {
+    this.(CallExpr).getFunction().(PathExpr).getPath().getResolvedCrateOrigin() = "lang:std" or
+    this.(MethodCallExpr).getResolvedCrateOrigin() = "lang:std"
+  }
+}
+
+class PathElement = AstNode;
+
+/**
+ * Holds if (`pred`, `succ`) represents a candidate edge for the query that is
+ * reachable from a source.
+ */
+predicate edgesFwd(PathElement pred, PathElement succ) {
+  // attribute (source) -> callable
+  pred.(CtorAttr) = succ.(Callable).getAnAttr()
+  or
+  // [forwards reachable] callable -> enclosed call
+  edgesFwd(_, pred) and
+  pred = succ.(CallExprBase).getEnclosingCallable()
+  or
+  // [forwards reachable] call -> target callable
+  edgesFwd(_, pred) and
+  pred.(CallExprBase).getStaticTarget() = succ
+}
+
+/**
+ * Holds if (`pred`, `succ`) represents an edge for the query that is reachable
+ * from a source and backwards reachable from a sink (adding the backwards
+ * reachability constraint reduces the amount of output data produced).
+ */
+query predicate edges(PathElement pred, PathElement succ) {
+  edgesFwd(pred, succ) and
+  (
+    succ instanceof StdCall // sink
+    or
+    edges(succ, _) // backwards reachable from a sink
+  )
+}
+
+from CtorAttr source, StdCall sink
+where edges+(source, sink)
+select sink, source, sink,
+  "Call to " + sink.toString() + " in a function with the " + source.getWhichAttr() + " attribute."
diff --git a/rust/ql/src/queries/security/CWE-696/BadCtorInitializationBad.rs b/rust/ql/src/queries/security/CWE-696/BadCtorInitializationBad.rs
new file mode 100644
index 00000000000..2a6c60272d5
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-696/BadCtorInitializationBad.rs
@@ -0,0 +1,5 @@
+
+#[ctor::ctor]
+fn bad_example() {
+    println!("Hello, world!"); // BAD: the println! macro calls std library functions
+}
diff --git a/rust/ql/src/queries/security/CWE-696/BadCtorInitializationGood.rs b/rust/ql/src/queries/security/CWE-696/BadCtorInitializationGood.rs
new file mode 100644
index 00000000000..cbb8bc089a3
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-696/BadCtorInitializationGood.rs
@@ -0,0 +1,5 @@
+
+#[ctor::ctor]
+fn good_example() {
+    libc_print::libc_println!("Hello, world!"); // GOOD: libc-print does not use the std library
+}
diff --git a/rust/ql/src/queries/summary/Stats.qll b/rust/ql/src/queries/summary/Stats.qll
index aec671098eb..c2993b47899 100644
--- a/rust/ql/src/queries/summary/Stats.qll
+++ b/rust/ql/src/queries/summary/Stats.qll
@@ -7,7 +7,7 @@ private import codeql.rust.dataflow.internal.DataFlowImpl
 private import codeql.rust.dataflow.internal.TaintTrackingImpl
 private import codeql.rust.AstConsistency as AstConsistency
 private import codeql.rust.controlflow.internal.CfgConsistency as CfgConsistency
-private import codeql.dataflow.internal.DataFlowImplConsistency as DataFlowImplConsistency
+private import codeql.rust.dataflow.internal.DataFlowConsistency as DataFlowConsistency
 
 /**
  * Gets a count of the total number of lines of code in the database.
@@ -35,15 +35,9 @@ int getTotalCfgInconsistencies() {
   result = sum(string type | | CfgConsistency::getCfgInconsistencyCounts(type))
 }
 
-private module Input implements DataFlowImplConsistency::InputSig<Location, RustDataFlow> { }
-
 /**
  * Gets a count of the total number of data flow inconsistencies in the database.
  */
 int getTotalDataFlowInconsistencies() {
-  result =
-    sum(string type |
-      |
-      DataFlowImplConsistency::MakeConsistency<Location, RustDataFlow, RustTaintTracking, Input>::getInconsistencyCounts(type)
-    )
+  result = sum(string type | | DataFlowConsistency::getInconsistencyCounts(type))
 }
diff --git a/rust/ql/src/queries/summary/SummaryStats.ql b/rust/ql/src/queries/summary/SummaryStats.ql
index 3f24eb50d19..ffe7cbf1a8f 100644
--- a/rust/ql/src/queries/summary/SummaryStats.ql
+++ b/rust/ql/src/queries/summary/SummaryStats.ql
@@ -7,6 +7,7 @@
  */
 
 import rust
+import codeql.rust.Concepts
 import codeql.rust.Diagnostics
 import Stats
 
@@ -20,10 +21,13 @@ where
   or
   key = "Extraction warnings" and value = count(ExtractionWarning w)
   or
-  key = "Files extracted - total" and value = count(File f | exists(f.getRelativePath()))
+  key = "Files extracted - total" and value = count(ExtractedFile f | exists(f.getRelativePath()))
   or
   key = "Files extracted - with errors" and
-  value = count(File f | exists(f.getRelativePath()) and not f instanceof SuccessfullyExtractedFile)
+  value =
+    count(ExtractedFile f |
+      exists(f.getRelativePath()) and not f instanceof SuccessfullyExtractedFile
+    )
   or
   key = "Files extracted - without errors" and
   value = count(SuccessfullyExtractedFile f | exists(f.getRelativePath()))
@@ -37,4 +41,14 @@ where
   key = "Inconsistencies - CFG" and value = getTotalCfgInconsistencies()
   or
   key = "Inconsistencies - data flow" and value = getTotalDataFlowInconsistencies()
-select key, value
+  or
+  key = "Macro calls - total" and value = count(MacroCall mc)
+  or
+  key = "Macro calls - resolved" and value = count(MacroCall mc | mc.hasExpanded())
+  or
+  key = "Macro calls - unresolved" and value = count(MacroCall mc | not mc.hasExpanded())
+  or
+  key = "Taint sources - total" and value = count(ThreatModelSource s)
+  or
+  key = "Taint sources - active" and value = count(ActiveThreatModelSource s)
+select key, value order by key
diff --git a/rust/ql/src/queries/summary/TaintSources.ql b/rust/ql/src/queries/summary/TaintSources.ql
new file mode 100644
index 00000000000..9ac72b706ef
--- /dev/null
+++ b/rust/ql/src/queries/summary/TaintSources.ql
@@ -0,0 +1,18 @@
+/**
+ * @name Taint Sources
+ * @description List all sources of untrusted input that have been idenfitied
+ *              in the database.
+ * @kind problem
+ * @problem.severity info
+ * @id rust/summary/taint-sources
+ * @tags summary
+ */
+
+import rust
+import codeql.rust.Concepts
+
+from ThreatModelSource s, string defaultString
+where
+  if s instanceof ActiveThreatModelSource then defaultString = " (DEFAULT)" else defaultString = ""
+select s,
+  "Flow source '" + s.getSourceType() + "' of type " + s.getThreatModel() + defaultString + "."
diff --git a/rust/ql/test/extractor-tests/File/File.expected b/rust/ql/test/extractor-tests/File/File.expected
index 924ed370b35..77fee3c3c42 100644
--- a/rust/ql/test/extractor-tests/File/File.expected
+++ b/rust/ql/test/extractor-tests/File/File.expected
@@ -1,3 +1,4 @@
-| a_file.rs:0:0:0:0 | a_file.rs |
-| another_file.rs:0:0:0:0 | another_file.rs |
-| lib.rs:0:0:0:0 | lib.rs |
+| Cargo.toml:0:0:0:0 | Cargo.toml | fromSource: no |
+| a_file.rs:0:0:0:0 | a_file.rs | fromSource: yes |
+| another_file.rs:0:0:0:0 | another_file.rs | fromSource: yes |
+| lib.rs:0:0:0:0 | lib.rs | fromSource: yes |
diff --git a/rust/ql/test/extractor-tests/File/File.ql b/rust/ql/test/extractor-tests/File/File.ql
index fcb2b274e78..316099193d1 100644
--- a/rust/ql/test/extractor-tests/File/File.ql
+++ b/rust/ql/test/extractor-tests/File/File.ql
@@ -1,5 +1,7 @@
 import rust
 
-from File f
-where exists(f.getRelativePath())
-select f
+from File f, string fromSource
+where
+  exists(f.getRelativePath()) and
+  if f.fromSource() then fromSource = "fromSource: yes" else fromSource = "fromSource: no"
+select f, fromSource
diff --git a/rust/ql/test/extractor-tests/canonical_path/anonymous.rs b/rust/ql/test/extractor-tests/canonical_path/anonymous.rs
new file mode 100644
index 00000000000..81e32169bfb
--- /dev/null
+++ b/rust/ql/test/extractor-tests/canonical_path/anonymous.rs
@@ -0,0 +1,36 @@
+use super::regular::Trait;
+
+fn canonicals() {
+    struct OtherStruct;
+
+    trait OtherTrait {
+        fn g(&self);
+    }
+
+    impl OtherTrait for OtherStruct {
+        fn g(&self) {}
+    }
+
+    impl OtherTrait for crate::regular::Struct {
+        fn g(&self) {}
+    }
+
+    impl crate::regular::Trait for OtherStruct {
+        fn f(&self) {}
+    }
+
+    fn nested() {
+        struct OtherStruct;
+    }
+
+    fn usage() {
+        let s = OtherStruct {};
+        s.f();
+        s.g();
+        nested();
+    }
+}
+
+fn other() {
+    struct OtherStruct;
+}
diff --git a/rust/ql/test/extractor-tests/canonical_path/canonical_paths.expected b/rust/ql/test/extractor-tests/canonical_path/canonical_paths.expected
index 622652e091f..0b973174828 100644
--- a/rust/ql/test/extractor-tests/canonical_path/canonical_paths.expected
+++ b/rust/ql/test/extractor-tests/canonical_path/canonical_paths.expected
@@ -1,70 +1,89 @@
 canonicalPaths
-| canonical_paths.rs:1:1:34:1 | Module | repo::test | crate::canonical_paths::a |
-| canonical_paths.rs:2:5:3:22 | Struct | repo::test | crate::canonical_paths::a::Struct |
-| canonical_paths.rs:5:5:7:5 | Trait | repo::test | crate::canonical_paths::a::Trait |
-| canonical_paths.rs:6:9:6:20 | f | repo::test | crate::canonical_paths::a::Trait::f |
-| canonical_paths.rs:9:5:11:5 | Impl | None | None |
-| canonical_paths.rs:10:9:10:22 | f | repo::test | <crate::canonical_paths::a::Struct as crate::canonical_paths::a::Trait>::f |
-| canonical_paths.rs:13:5:15:5 | Impl | None | None |
-| canonical_paths.rs:14:9:14:22 | g | repo::test | <crate::canonical_paths::a::Struct>::g |
-| canonical_paths.rs:17:5:19:5 | Trait | repo::test | crate::canonical_paths::a::TraitWithBlanketImpl |
-| canonical_paths.rs:18:9:18:20 | h | repo::test | crate::canonical_paths::a::TraitWithBlanketImpl::h |
-| canonical_paths.rs:21:5:23:5 | Impl | None | None |
-| canonical_paths.rs:22:9:22:22 | h | repo::test | <_ as crate::canonical_paths::a::TraitWithBlanketImpl>::h |
-| canonical_paths.rs:25:5:25:16 | free | repo::test | crate::canonical_paths::a::free |
-| canonical_paths.rs:27:5:33:5 | usage | repo::test | crate::canonical_paths::a::usage |
-| canonical_paths.rs:36:1:73:1 | Module | repo::test | crate::canonical_paths::without |
-| canonical_paths.rs:37:5:37:24 | Use | None | None |
-| canonical_paths.rs:39:5:68:5 | canonicals | repo::test | crate::canonical_paths::without::canonicals |
-| canonical_paths.rs:40:9:40:27 | Struct | repo::test | {34}::OtherStruct |
-| canonical_paths.rs:42:9:44:9 | Trait | repo::test | {34}::OtherTrait |
-| canonical_paths.rs:43:13:43:24 | g | repo::test | {34}::OtherTrait::g |
-| canonical_paths.rs:46:9:48:9 | Impl | None | None |
-| canonical_paths.rs:47:13:47:26 | g | repo::test | <{34}::OtherStruct as {34}::OtherTrait>::g |
-| canonical_paths.rs:50:9:52:9 | Impl | None | None |
-| canonical_paths.rs:51:13:51:26 | g | repo::test | <crate::canonical_paths::a::Struct as {34}::OtherTrait>::g |
-| canonical_paths.rs:54:9:56:9 | Impl | None | None |
-| canonical_paths.rs:55:13:55:26 | f | repo::test | <{34}::OtherStruct as crate::canonical_paths::a::Trait>::f |
-| canonical_paths.rs:58:9:60:9 | nested | repo::test | {34}::nested |
-| canonical_paths.rs:59:13:59:31 | Struct | repo::test | {35}::OtherStruct |
-| canonical_paths.rs:62:9:67:9 | usage | repo::test | {34}::usage |
-| canonical_paths.rs:70:5:72:5 | other | repo::test | crate::canonical_paths::without::other |
-| canonical_paths.rs:71:9:71:27 | Struct | repo::test | {36}::OtherStruct |
-| lib.rs:1:1:1:20 | Module | repo::test | crate::canonical_paths |
+| anonymous.rs:1:1:1:26 | Use | None | None |
+| anonymous.rs:3:1:32:1 | fn canonicals | repo::test | crate::anonymous::canonicals |
+| anonymous.rs:4:5:4:23 | Struct | repo::test | {0}::OtherStruct |
+| anonymous.rs:6:5:8:5 | trait OtherTrait | repo::test | {0}::OtherTrait |
+| anonymous.rs:7:9:7:20 | fn g | repo::test | {0}::OtherTrait::g |
+| anonymous.rs:10:5:12:5 | impl OtherTrait for OtherStruct { ... } | None | None |
+| anonymous.rs:11:9:11:22 | fn g | repo::test | <{0}::OtherStruct as {0}::OtherTrait>::g |
+| anonymous.rs:14:5:16:5 | impl OtherTrait for ...::Struct { ... } | None | None |
+| anonymous.rs:15:9:15:22 | fn g | repo::test | <crate::regular::Struct as {0}::OtherTrait>::g |
+| anonymous.rs:18:5:20:5 | impl ...::Trait for OtherStruct { ... } | None | None |
+| anonymous.rs:19:9:19:22 | fn f | repo::test | <{0}::OtherStruct as crate::regular::Trait>::f |
+| anonymous.rs:22:5:24:5 | fn nested | repo::test | {0}::nested |
+| anonymous.rs:23:9:23:27 | Struct | repo::test | {1}::OtherStruct |
+| anonymous.rs:26:5:31:5 | fn usage | repo::test | {0}::usage |
+| anonymous.rs:34:1:36:1 | fn other | repo::test | crate::anonymous::other |
+| anonymous.rs:35:5:35:23 | Struct | repo::test | {36}::OtherStruct |
+| lib.rs:1:1:1:14 | mod anonymous | repo::test | crate::anonymous |
+| lib.rs:2:1:2:12 | mod regular | repo::test | crate::regular |
+| regular.rs:1:1:2:18 | Struct | repo::test | crate::regular::Struct |
+| regular.rs:4:1:6:1 | trait Trait | repo::test | crate::regular::Trait |
+| regular.rs:5:5:5:16 | fn f | repo::test | crate::regular::Trait::f |
+| regular.rs:8:1:10:1 | impl Trait for Struct { ... } | None | None |
+| regular.rs:9:5:9:18 | fn f | repo::test | <crate::regular::Struct as crate::regular::Trait>::f |
+| regular.rs:12:1:14:1 | impl Struct { ... } | None | None |
+| regular.rs:13:5:13:18 | fn g | repo::test | <crate::regular::Struct>::g |
+| regular.rs:16:1:18:1 | trait TraitWithBlanketImpl | repo::test | crate::regular::TraitWithBlanketImpl |
+| regular.rs:17:5:17:16 | fn h | repo::test | crate::regular::TraitWithBlanketImpl::h |
+| regular.rs:20:1:22:1 | impl TraitWithBlanketImpl for T { ... } | None | None |
+| regular.rs:21:5:21:18 | fn h | repo::test | <_ as crate::regular::TraitWithBlanketImpl>::h |
+| regular.rs:24:1:24:12 | fn free | repo::test | crate::regular::free |
+| regular.rs:26:1:32:1 | fn usage | repo::test | crate::regular::usage |
+| regular.rs:34:1:38:1 | enum MyEnum | repo::test | crate::regular::MyEnum |
+| regular.rs:40:1:46:1 | fn enum_qualified_usage | repo::test | crate::regular::enum_qualified_usage |
+| regular.rs:48:1:55:1 | fn enum_unqualified_usage | repo::test | crate::regular::enum_unqualified_usage |
+| regular.rs:51:5:51:18 | Use | None | None |
 resolvedPaths
-| canonical_paths.rs:2:7:2:12 | derive | None | None |
-| canonical_paths.rs:9:10:9:14 | Trait | repo::test | crate::canonical_paths::a::Trait |
-| canonical_paths.rs:9:20:9:25 | Struct | repo::test | crate::canonical_paths::a::Struct |
-| canonical_paths.rs:13:10:13:15 | Struct | repo::test | crate::canonical_paths::a::Struct |
-| canonical_paths.rs:21:13:21:14 | Eq | lang:core | crate::cmp::Eq |
-| canonical_paths.rs:21:17:21:36 | TraitWithBlanketImpl | repo::test | crate::canonical_paths::a::TraitWithBlanketImpl |
-| canonical_paths.rs:21:42:21:42 | T | None | None |
-| canonical_paths.rs:28:17:28:22 | Struct | repo::test | crate::canonical_paths::a::Struct |
-| canonical_paths.rs:29:9:29:9 | s | None | None |
-| canonical_paths.rs:29:9:29:13 | ... .f(...) | repo::test | <crate::canonical_paths::a::Struct as crate::canonical_paths::a::Trait>::f |
-| canonical_paths.rs:30:9:30:9 | s | None | None |
-| canonical_paths.rs:30:9:30:13 | ... .g(...) | repo::test | <crate::canonical_paths::a::Struct>::g |
-| canonical_paths.rs:31:9:31:9 | s | None | None |
-| canonical_paths.rs:31:9:31:13 | ... .h(...) | repo::test | <_ as crate::canonical_paths::a::TraitWithBlanketImpl>::h |
-| canonical_paths.rs:32:9:32:12 | free | repo::test | crate::canonical_paths::a::free |
-| canonical_paths.rs:37:9:37:13 | super | repo::test | crate::canonical_paths |
-| canonical_paths.rs:37:9:37:16 | super::a | repo::test | crate::canonical_paths::a |
-| canonical_paths.rs:37:9:37:23 | super::a::Trait | repo::test | crate::canonical_paths::a::Trait |
-| canonical_paths.rs:46:14:46:23 | OtherTrait | repo::test | {34}::OtherTrait |
-| canonical_paths.rs:46:29:46:39 | OtherStruct | repo::test | {34}::OtherStruct |
-| canonical_paths.rs:50:14:50:23 | OtherTrait | repo::test | {34}::OtherTrait |
-| canonical_paths.rs:50:29:50:33 | crate | None | None |
-| canonical_paths.rs:50:29:50:50 | crate::canonical_paths | repo::test | crate::canonical_paths |
-| canonical_paths.rs:50:29:50:53 | crate::canonical_paths::a | repo::test | crate::canonical_paths::a |
-| canonical_paths.rs:50:29:50:61 | crate::canonical_paths::a::Struct | repo::test | crate::canonical_paths::a::Struct |
-| canonical_paths.rs:54:14:54:18 | crate | None | None |
-| canonical_paths.rs:54:14:54:35 | crate::canonical_paths | repo::test | crate::canonical_paths |
-| canonical_paths.rs:54:14:54:38 | crate::canonical_paths::a | repo::test | crate::canonical_paths::a |
-| canonical_paths.rs:54:14:54:45 | crate::canonical_paths::a::Trait | repo::test | crate::canonical_paths::a::Trait |
-| canonical_paths.rs:54:51:54:61 | OtherStruct | repo::test | {34}::OtherStruct |
-| canonical_paths.rs:63:21:63:31 | OtherStruct | repo::test | {34}::OtherStruct |
-| canonical_paths.rs:64:13:64:13 | s | None | None |
-| canonical_paths.rs:64:13:64:17 | ... .f(...) | repo::test | <{34}::OtherStruct as crate::canonical_paths::a::Trait>::f |
-| canonical_paths.rs:65:13:65:13 | s | None | None |
-| canonical_paths.rs:65:13:65:17 | ... .g(...) | repo::test | <{34}::OtherStruct as {34}::OtherTrait>::g |
-| canonical_paths.rs:66:13:66:18 | nested | repo::test | {34}::nested |
+| anonymous.rs:1:5:1:9 | super | None | None |
+| anonymous.rs:1:5:1:18 | ...::regular | repo::test | crate::regular |
+| anonymous.rs:1:5:1:25 | ...::Trait | repo::test | crate::regular::Trait |
+| anonymous.rs:10:10:10:19 | OtherTrait | repo::test | {0}::OtherTrait |
+| anonymous.rs:10:25:10:35 | OtherStruct | repo::test | {0}::OtherStruct |
+| anonymous.rs:14:10:14:19 | OtherTrait | repo::test | {0}::OtherTrait |
+| anonymous.rs:14:25:14:29 | crate | None | None |
+| anonymous.rs:14:25:14:38 | ...::regular | repo::test | crate::regular |
+| anonymous.rs:14:25:14:46 | ...::Struct | repo::test | crate::regular::Struct |
+| anonymous.rs:18:10:18:14 | crate | None | None |
+| anonymous.rs:18:10:18:23 | ...::regular | repo::test | crate::regular |
+| anonymous.rs:18:10:18:30 | ...::Trait | repo::test | crate::regular::Trait |
+| anonymous.rs:18:36:18:46 | OtherStruct | repo::test | {0}::OtherStruct |
+| anonymous.rs:27:17:27:27 | OtherStruct | repo::test | {0}::OtherStruct |
+| anonymous.rs:28:9:28:9 | s | None | None |
+| anonymous.rs:28:9:28:13 | ... .f(...) | repo::test | <{0}::OtherStruct as crate::regular::Trait>::f |
+| anonymous.rs:29:9:29:9 | s | None | None |
+| anonymous.rs:29:9:29:13 | ... .g(...) | repo::test | <{0}::OtherStruct as {0}::OtherTrait>::g |
+| anonymous.rs:30:9:30:14 | nested | repo::test | {0}::nested |
+| regular.rs:1:3:1:8 | derive | None | None |
+| regular.rs:8:6:8:10 | Trait | repo::test | crate::regular::Trait |
+| regular.rs:8:16:8:21 | Struct | repo::test | crate::regular::Struct |
+| regular.rs:12:6:12:11 | Struct | repo::test | crate::regular::Struct |
+| regular.rs:20:9:20:10 | Eq | lang:core | crate::cmp::Eq |
+| regular.rs:20:13:20:32 | TraitWithBlanketImpl | repo::test | crate::regular::TraitWithBlanketImpl |
+| regular.rs:20:38:20:38 | T | None | None |
+| regular.rs:27:13:27:18 | Struct | repo::test | crate::regular::Struct |
+| regular.rs:28:5:28:5 | s | None | None |
+| regular.rs:28:5:28:9 | ... .f(...) | repo::test | <crate::regular::Struct as crate::regular::Trait>::f |
+| regular.rs:29:5:29:5 | s | None | None |
+| regular.rs:29:5:29:9 | ... .g(...) | repo::test | <crate::regular::Struct>::g |
+| regular.rs:30:5:30:5 | s | None | None |
+| regular.rs:30:5:30:9 | ... .h(...) | repo::test | <_ as crate::regular::TraitWithBlanketImpl>::h |
+| regular.rs:31:5:31:8 | free | repo::test | crate::regular::free |
+| regular.rs:36:14:36:18 | usize | None | None |
+| regular.rs:37:19:37:23 | usize | None | None |
+| regular.rs:41:9:41:14 | Option | lang:core | crate::option::Option |
+| regular.rs:41:9:41:26 | ...::None::<...> | lang:core | crate::option::Option::None |
+| regular.rs:42:9:42:14 | Option | lang:core | crate::option::Option |
+| regular.rs:42:9:42:20 | ...::Some | lang:core | crate::option::Option::Some |
+| regular.rs:43:9:43:14 | MyEnum | repo::test | crate::regular::MyEnum |
+| regular.rs:43:9:43:24 | ...::Variant1 | repo::test | crate::regular::MyEnum::Variant1 |
+| regular.rs:44:9:44:14 | MyEnum | repo::test | crate::regular::MyEnum |
+| regular.rs:44:9:44:24 | ...::Variant2 | repo::test | crate::regular::MyEnum::Variant2 |
+| regular.rs:45:9:45:14 | MyEnum | repo::test | crate::regular::MyEnum |
+| regular.rs:45:9:45:24 | ...::Variant3 | repo::test | crate::regular::MyEnum::Variant3 |
+| regular.rs:49:9:49:18 | None::<...> | lang:core | crate::option::Option::None |
+| regular.rs:50:9:50:12 | Some | lang:core | crate::option::Option::Some |
+| regular.rs:51:9:51:14 | MyEnum | repo::test | crate::regular::MyEnum |
+| regular.rs:52:9:52:16 | Variant1 | repo::test | crate::regular::MyEnum::Variant1 |
+| regular.rs:53:9:53:16 | Variant2 | repo::test | crate::regular::MyEnum::Variant2 |
+| regular.rs:54:9:54:16 | Variant3 | repo::test | crate::regular::MyEnum::Variant3 |
diff --git a/rust/ql/test/extractor-tests/canonical_path/canonical_paths.rs b/rust/ql/test/extractor-tests/canonical_path/canonical_paths.rs
deleted file mode 100644
index 7444903dc01..00000000000
--- a/rust/ql/test/extractor-tests/canonical_path/canonical_paths.rs
+++ /dev/null
@@ -1,73 +0,0 @@
-mod a {
-    #[derive(Eq, PartialEq)]
-    pub struct Struct;
-
-    pub trait Trait {
-        fn f(&self);
-    }
-
-    impl Trait for Struct {
-        fn f(&self) {}
-    }
-
-    impl Struct {
-        fn g(&self) {}
-    }
-
-    trait TraitWithBlanketImpl {
-        fn h(&self);
-    }
-
-    impl<T: Eq> TraitWithBlanketImpl for T {
-        fn h(&self) {}
-    }
-
-    fn free() {}
-
-    fn usage() {
-        let s = Struct {};
-        s.f();
-        s.g();
-        s.h();
-        free();
-    }
-}
-
-mod without {
-    use super::a::Trait;
-
-    fn canonicals() {
-        struct OtherStruct;
-
-        trait OtherTrait {
-            fn g(&self);
-        }
-
-        impl OtherTrait for OtherStruct {
-            fn g(&self) {}
-        }
-
-        impl OtherTrait for crate::canonical_paths::a::Struct {
-            fn g(&self) {}
-        }
-
-        impl crate::canonical_paths::a::Trait for OtherStruct {
-            fn f(&self) {}
-        }
-
-        fn nested() {
-            struct OtherStruct;
-        }
-
-        fn usage() {
-            let s = OtherStruct {};
-            s.f();
-            s.g();
-            nested();
-        }
-    }
-
-    fn other() {
-        struct OtherStruct;
-    }
-}
diff --git a/rust/ql/test/extractor-tests/canonical_path/regular.rs b/rust/ql/test/extractor-tests/canonical_path/regular.rs
new file mode 100644
index 00000000000..ac06a12d24a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/canonical_path/regular.rs
@@ -0,0 +1,55 @@
+#[derive(Eq, PartialEq)]
+pub struct Struct;
+
+pub trait Trait {
+    fn f(&self);
+}
+
+impl Trait for Struct {
+    fn f(&self) {}
+}
+
+impl Struct {
+    fn g(&self) {}
+}
+
+trait TraitWithBlanketImpl {
+    fn h(&self);
+}
+
+impl<T: Eq> TraitWithBlanketImpl for T {
+    fn h(&self) {}
+}
+
+fn free() {}
+
+fn usage() {
+    let s = Struct {};
+    s.f();
+    s.g();
+    s.h();
+    free();
+}
+
+enum MyEnum {
+    Variant1,
+    Variant2(usize),
+    Variant3 { x: usize },
+}
+
+fn enum_qualified_usage() {
+    _ = Option::None::<()>;
+    _ = Option::Some(0);
+    _ = MyEnum::Variant1;
+    _ = MyEnum::Variant2(0);
+    _ = MyEnum::Variant3 { x: 1 };
+}
+
+fn enum_unqualified_usage() {
+    _ = None::<()>;
+    _ = Some(0);
+    use MyEnum::*;
+    _ = Variant1;
+    _ = Variant2(0);
+    _ = Variant3 { x: 1 };
+}
diff --git a/rust/ql/test/extractor-tests/generated/.generated_tests.list b/rust/ql/test/extractor-tests/generated/.generated_tests.list
index b60779ebd86..b39bf6b63ee 100644
--- a/rust/ql/test/extractor-tests/generated/.generated_tests.list
+++ b/rust/ql/test/extractor-tests/generated/.generated_tests.list
@@ -1,7 +1,8 @@
 Abi/gen_abi.rs 5d2f6eccb2bab86080188be9700ab64a34fa6e8e8e7b08f65a5c97d1de0a900c 5d2f6eccb2bab86080188be9700ab64a34fa6e8e8e7b08f65a5c97d1de0a900c
 ArgList/gen_arg_list.rs 569d0b9b0479de5453ae0f89e4f90e32b02ee84dfb3d815821d722ece6f75b64 569d0b9b0479de5453ae0f89e4f90e32b02ee84dfb3d815821d722ece6f75b64
-ArrayExpr/gen_array_expr.rs e4863b428ea2b5cfd59773f201e58fd905f7363512e54e4fdebd02c297bd85ff e4863b428ea2b5cfd59773f201e58fd905f7363512e54e4fdebd02c297bd85ff
-ArrayType/gen_array_type.rs 3cb5f35006648d676ead1088aa330cd34beaabaaad7b9aa952e6375bc1cec5cb 3cb5f35006648d676ead1088aa330cd34beaabaaad7b9aa952e6375bc1cec5cb
+ArrayListExpr/gen_array_list_expr.rs 99a1233b77a6b6eb0a538025688ca5a0824118a123bef0fe3f92a81834b17924 99a1233b77a6b6eb0a538025688ca5a0824118a123bef0fe3f92a81834b17924
+ArrayRepeatExpr/gen_array_repeat_expr.rs 8cc7c0a435a02864290db6a498a5fcf227d8ee7ed87ee1943ad4d326c8314a0e 8cc7c0a435a02864290db6a498a5fcf227d8ee7ed87ee1943ad4d326c8314a0e
+ArrayTypeRepr/gen_array_type_repr.rs 9cf7a12a6f7da3342db4ab65dfb5deefb1ef57398e2236fbb49d3280dad944ae 9cf7a12a6f7da3342db4ab65dfb5deefb1ef57398e2236fbb49d3280dad944ae
 AsmExpr/gen_asm_expr.rs 00b21fd66fe12785174bd0160d0317a6c78ff05dbba73313eb07b56531cf3158 00b21fd66fe12785174bd0160d0317a6c78ff05dbba73313eb07b56531cf3158
 AssocTypeArg/gen_assoc_type_arg.rs 00ec0e22c4d73338de605dc3b1b1306bc83a95f87376ce976f08d2f9923cc2b4 00ec0e22c4d73338de605dc3b1b1306bc83a95f87376ce976f08d2f9923cc2b4
 Attr/gen_attr.rs cd6e50f5ebb17066209682b1a9f22ff116584ffef180d8ab51e2ba5cab6a91ec cd6e50f5ebb17066209682b1a9f22ff116584ffef180d8ab51e2ba5cab6a91ec
@@ -21,27 +22,29 @@ ConstArg/gen_const_arg.rs feab3cdbbc469a287884ff7605e9a7541f904e9e5bd1f14a8e0f74
 ConstBlockPat/gen_const_block_pat.rs 7e3057cd24d22e752354369cf7e08e9536642812c0947b36aa5d8290a45476fd 7e3057cd24d22e752354369cf7e08e9536642812c0947b36aa5d8290a45476fd
 ConstParam/gen_const_param.rs f0a4176333b9519b4cc2533a083f68f6859b5b0855d1b0dbcef4d4e206721830 f0a4176333b9519b4cc2533a083f68f6859b5b0855d1b0dbcef4d4e206721830
 ContinueExpr/gen_continue_expr.rs 63840dcd8440aaf1b96b713b80eb2b56acb1639d3200b3c732b45291a071b5ff 63840dcd8440aaf1b96b713b80eb2b56acb1639d3200b3c732b45291a071b5ff
-DynTraitType/gen_dyn_trait_type.rs 65b8e54bdc4bdfff8b68480582acca642bf2d28e316c5251fb3b8371cd7328bd 65b8e54bdc4bdfff8b68480582acca642bf2d28e316c5251fb3b8371cd7328bd
+DynTraitTypeRepr/gen_dyn_trait_type_repr.rs ca6cb23c5996713121e3920652251c1c75136d31319558e366ef56941e9fe7de ca6cb23c5996713121e3920652251c1c75136d31319558e366ef56941e9fe7de
 Enum/gen_enum.rs efa816c579bfba60d1f32f818b022956d08d397af508c82b7331f14615f25be4 efa816c579bfba60d1f32f818b022956d08d397af508c82b7331f14615f25be4
 ExprStmt/gen_expr_stmt.rs 6ce47428a8d33b902c1f14b06cc375d08eff95251e4a81dac2fa51872b7649b1 6ce47428a8d33b902c1f14b06cc375d08eff95251e4a81dac2fa51872b7649b1
 ExternBlock/gen_extern_block.rs 5b5c4d7a2c4a91027df1578b74900ae1b971aede7720ab12de9bb918c42a583d 5b5c4d7a2c4a91027df1578b74900ae1b971aede7720ab12de9bb918c42a583d
 ExternCrate/gen_extern_crate.rs 9b3ab23a56b7778723ce436b25310547b2b0aeca3e5c6b7e61f273b5ce5573e3 9b3ab23a56b7778723ce436b25310547b2b0aeca3e5c6b7e61f273b5ce5573e3
 ExternItemList/gen_extern_item_list.rs ff2baaaa32099808b86fbf6f4853171146594d5db23c6ee447eb5cec10cee7cf ff2baaaa32099808b86fbf6f4853171146594d5db23c6ee447eb5cec10cee7cf
 FieldExpr/gen_field_expr.rs 9a70500d592e0a071b03d974a55558b3bc0df531ff11bce5898feb36e17ffd8b 9a70500d592e0a071b03d974a55558b3bc0df531ff11bce5898feb36e17ffd8b
-FnPtrType/gen_fn_ptr_type.rs a7842d8c21636739d1be959e5ce5e0b23482d5ef6eab5c45b009895da8175932 a7842d8c21636739d1be959e5ce5e0b23482d5ef6eab5c45b009895da8175932
+FnPtrTypeRepr/gen_fn_ptr_type_repr.rs 46af312570a9caec11e14ba05190e95e750c32565559f1622a132f7145320253 46af312570a9caec11e14ba05190e95e750c32565559f1622a132f7145320253
 ForExpr/gen_for_expr.rs 67decf3073e1a9363d9df05a5a64a6059349e50b81356f480f7aeb352189136d 67decf3073e1a9363d9df05a5a64a6059349e50b81356f480f7aeb352189136d
-ForType/gen_for_type.rs 6cb447df02c61b192e283e019576c28225added02d167030d64ebd0bebb1b158 6cb447df02c61b192e283e019576c28225added02d167030d64ebd0bebb1b158
-FormatArgsArg/gen_format_args_arg.rs c466f2fc2c0f9592061a159a217a87551d67f1ccb0e4d8f7f56a463a2aa4a73a c466f2fc2c0f9592061a159a217a87551d67f1ccb0e4d8f7f56a463a2aa4a73a
-FormatArgsExpr/gen_format_args_expr.rs 7184dbb8833f970676e59fca3a40ec51d14a68e3151d8a6d637896494f2b4454 7184dbb8833f970676e59fca3a40ec51d14a68e3151d8a6d637896494f2b4454
+ForTypeRepr/gen_for_type_repr.rs 5108a5d63ce440305b92dd87387c22a0a57abfd19d88e03e1984e1537779f4a4 5108a5d63ce440305b92dd87387c22a0a57abfd19d88e03e1984e1537779f4a4
+FormatArgsExpr/gen_format.rs bd009cb152c35e2aacd147b5520a42be31e66e9a8715ec1d0fd57b8e97c743ed bd009cb152c35e2aacd147b5520a42be31e66e9a8715ec1d0fd57b8e97c743ed
+FormatArgsExpr/gen_format_args_arg.rs c466f2fc2c0f9592061a159a217a87551d67f1ccb0e4d8f7f56a463a2aa4a73a c466f2fc2c0f9592061a159a217a87551d67f1ccb0e4d8f7f56a463a2aa4a73a
+FormatArgsExpr/gen_format_args_expr.rs 72c806ed163e9dcce2d0c5c8664d409b2aa635c1022c91959f9e8ae084f05bf2 72c806ed163e9dcce2d0c5c8664d409b2aa635c1022c91959f9e8ae084f05bf2
+FormatArgsExpr/gen_format_argument.rs 350d370e6f1db03d756384a3dbdb294697d241ff7c28d159cf57748abe99cfe9 350d370e6f1db03d756384a3dbdb294697d241ff7c28d159cf57748abe99cfe9
 Function/gen_function.rs ba6ecb9e0d89183295eb02f3c20ebbf5c209f89bd0172c73a3b4a6dacbf3a54c ba6ecb9e0d89183295eb02f3c20ebbf5c209f89bd0172c73a3b4a6dacbf3a54c
 GenericArgList/gen_generic_arg_list.rs cfb072d3b48f9dd568c23d4dfefba28766628678f66bbf9a436de9919ead35f5 cfb072d3b48f9dd568c23d4dfefba28766628678f66bbf9a436de9919ead35f5
 GenericParamList/gen_generic_param_list.rs 4cc9b628f53e1a6c5781ad195b8648fa6dee0bb41b24007fbd986527374d3669 4cc9b628f53e1a6c5781ad195b8648fa6dee0bb41b24007fbd986527374d3669
 IdentPat/gen_ident_pat.rs 87f9201ca47683ff6f12a0c844c062fdedb6d86546794522d358b117ba0fe477 87f9201ca47683ff6f12a0c844c062fdedb6d86546794522d358b117ba0fe477
 IfExpr/gen_if_expr.rs 2df66735394ebb20db29d3fbf2721ad4812afbe8d4614d03f26265c1f481f1e8 2df66735394ebb20db29d3fbf2721ad4812afbe8d4614d03f26265c1f481f1e8
 Impl/gen_impl.rs dd97fa44ec844b735b30e7dfd1b8ecd4449c7914af1ea427edcba848194a84ed dd97fa44ec844b735b30e7dfd1b8ecd4449c7914af1ea427edcba848194a84ed
-ImplTraitType/gen_impl_trait_type.rs feef13242cbee4e8c59a6db01778384d6d27d5b702431c2fd8dca0859f04a831 feef13242cbee4e8c59a6db01778384d6d27d5b702431c2fd8dca0859f04a831
+ImplTraitTypeRepr/gen_impl_trait_type_repr.rs 3d8bc5bb967bcb3ff38bf0487411e2945a57b36aad43dedcad17de9c6bf717d5 3d8bc5bb967bcb3ff38bf0487411e2945a57b36aad43dedcad17de9c6bf717d5
 IndexExpr/gen_index_expr.rs 22d7f81ba43dc63f1f49e21a2c25ce25a1b8f6e8e95e1a66f518f010a4d73c61 22d7f81ba43dc63f1f49e21a2c25ce25a1b8f6e8e95e1a66f518f010a4d73c61
-InferType/gen_infer_type.rs d1b7ee04417cfa8617bfd170920a48e8cfe97373b704153f5e2182ae29072ca3 d1b7ee04417cfa8617bfd170920a48e8cfe97373b704153f5e2182ae29072ca3
+InferTypeRepr/gen_infer_type_repr.rs 96f1b2d20319b031dde75b0bd612d4a4366315f2bc75590e5e422603f7a35541 96f1b2d20319b031dde75b0bd612d4a4366315f2bc75590e5e422603f7a35541
 ItemList/gen_item_list.rs 2ea6180e66de963627aabdaf64ce3c95c40cc7628d8734607ae2720bab857643 2ea6180e66de963627aabdaf64ce3c95c40cc7628d8734607ae2720bab857643
 Label/gen_label.rs 0584f519f210f621d7ebc0cb8c95ce05db0795d6109c0d16866f8f699a28213c 0584f519f210f621d7ebc0cb8c95ce05db0795d6109c0d16866f8f699a28213c
 LetElse/gen_let_else.rs 2cb09461b0ea48f666bd65a208663e64a874efadacb22764301871ea07956901 2cb09461b0ea48f666bd65a208663e64a874efadacb22764301871ea07956901
@@ -60,7 +63,7 @@ MacroItems/gen_macro_items.rs 8ef3e16b73635dc97afa3ffa4db2bb21a8f1b435176861a594
 MacroPat/gen_macro_pat.rs b8041370598bd7fb26778d829a15c415c2078d69124f6af634ddeba13a114aa0 b8041370598bd7fb26778d829a15c415c2078d69124f6af634ddeba13a114aa0
 MacroRules/gen_macro_rules.rs 7e03b410f4669e422d3b4328f7aafdca2e286e5d951495dd69cee0d44cb793a9 7e03b410f4669e422d3b4328f7aafdca2e286e5d951495dd69cee0d44cb793a9
 MacroStmts/gen_macro_stmts.rs 2e45dcf44bf2e8404b49ce9abeee4931572693174b5d96f3fd81eb40ea8e7b4b 2e45dcf44bf2e8404b49ce9abeee4931572693174b5d96f3fd81eb40ea8e7b4b
-MacroType/gen_macro_type.rs 84db79c78860512b14f885391fcae999ca7282f2d8a9ab65d30cc413d5bbebd0 84db79c78860512b14f885391fcae999ca7282f2d8a9ab65d30cc413d5bbebd0
+MacroTypeRepr/gen_macro_type_repr.rs 03c15f1fd5af63821e49a125d236704c63889fe20a32f03f3ecf3e29b1cad9df 03c15f1fd5af63821e49a125d236704c63889fe20a32f03f3ecf3e29b1cad9df
 MatchArm/gen_match_arm.rs ac75b4836a103e2755bd47a1ee1b74af6eb8349adc4ebedaaa27b3ea3ae41aa5 ac75b4836a103e2755bd47a1ee1b74af6eb8349adc4ebedaaa27b3ea3ae41aa5
 MatchArmList/gen_match_arm_list.rs dbf36444d371421a2b8768a188660dd45ed3b823fb1c56b90c1ba77f177d23d6 dbf36444d371421a2b8768a188660dd45ed3b823fb1c56b90c1ba77f177d23d6
 MatchExpr/gen_match_expr.rs 081c5d4c78cb71ccd13fb37a93d7f525267c51b179f44b5a22ca3297897002a0 081c5d4c78cb71ccd13fb37a93d7f525267c51b179f44b5a22ca3297897002a0
@@ -70,21 +73,20 @@ MethodCallExpr/gen_method_call_expr.rs f2b4679eb1ec095981fe6bd656b632c22bf6bd0da
 Module/gen_module.rs 815605a604fea1d9276684f8d6738a4e833eacad57ceeb27e2095fc450264fc1 815605a604fea1d9276684f8d6738a4e833eacad57ceeb27e2095fc450264fc1
 Name/gen_name.rs bbf5cff7da2400de554712ed66ff1e6370170ba988209b4e346bc053421df1ff bbf5cff7da2400de554712ed66ff1e6370170ba988209b4e346bc053421df1ff
 NameRef/gen_name_ref.rs 41307c2f7ca82d28217129639e556bd4c91221cf3a4170250b313fd53b9e3f82 41307c2f7ca82d28217129639e556bd4c91221cf3a4170250b313fd53b9e3f82
-NeverType/gen_never_type.rs a5413fab6a45dcfc2ff0ec5c8308b6c515963212ec4aa9edb9a96ec9a7e96830 a5413fab6a45dcfc2ff0ec5c8308b6c515963212ec4aa9edb9a96ec9a7e96830
+NeverTypeRepr/gen_never_type_repr.rs b9bf7cc4df2e5be4e85c0701b94ec189080db1dbc6e2c9ef0480c7f2f4b0fc17 b9bf7cc4df2e5be4e85c0701b94ec189080db1dbc6e2c9ef0480c7f2f4b0fc17
 OffsetOfExpr/gen_offset_of_expr.rs 8e2077b4d7b85c91c17c3630511bc4f929950e9007261cbf0471c4a064c4b934 8e2077b4d7b85c91c17c3630511bc4f929950e9007261cbf0471c4a064c4b934
 OrPat/gen_or_pat.rs 71feef6e056bfe4cc8c22c9eb54fa3fecef613606769061d0efd059adbbd6f56 71feef6e056bfe4cc8c22c9eb54fa3fecef613606769061d0efd059adbbd6f56
-Param/gen_param.rs 6c9e4a972b2dc0702dc29ebcbdcbe2c6a433b3cd372ad6924feedcea4698faba 6c9e4a972b2dc0702dc29ebcbdcbe2c6a433b3cd372ad6924feedcea4698faba
+Param/gen_param.rs 39f3979d6cb10e4c43e0b5601af2a92b7520a75a104211955bbbb5e6f13e9db9 39f3979d6cb10e4c43e0b5601af2a92b7520a75a104211955bbbb5e6f13e9db9
 ParamList/gen_param_list.rs ef2e83d0aed45b969fe78dd717e87ef3c1f848e6179cfb4dc3cb136f1836b998 ef2e83d0aed45b969fe78dd717e87ef3c1f848e6179cfb4dc3cb136f1836b998
 ParenExpr/gen_paren_expr.rs dd0c4a21a92e54e8a6151145e013cbec9c9e1cad093d572e293b4f51d6c44aea dd0c4a21a92e54e8a6151145e013cbec9c9e1cad093d572e293b4f51d6c44aea
 ParenPat/gen_paren_pat.rs c8d18521b9a0b7d39841eb72e3895914aa652b7235dea42ed12a4eb280e3bf0e c8d18521b9a0b7d39841eb72e3895914aa652b7235dea42ed12a4eb280e3bf0e
-ParenType/gen_paren_type.rs ae1a945b56020eab14bb0ef75ae9ccb735d8e45d1213adee210a90e6dba8430f ae1a945b56020eab14bb0ef75ae9ccb735d8e45d1213adee210a90e6dba8430f
-Path/gen_path.rs e32637d04445d5b9411086f3ad5d8b41de24327f7ad641d1a1a25c1d160121c8 e32637d04445d5b9411086f3ad5d8b41de24327f7ad641d1a1a25c1d160121c8
-PathExpr/gen_path_expr.rs a1e0ececfe62a63a43583c9bd8064a80a90c042c55bac29d86776c0c6559f33a a1e0ececfe62a63a43583c9bd8064a80a90c042c55bac29d86776c0c6559f33a
-PathPat/gen_path_pat.rs fd7f941f8b33f19d3693be1fdb595c2fb2e85e8296702b82bf12bcd44632f371 fd7f941f8b33f19d3693be1fdb595c2fb2e85e8296702b82bf12bcd44632f371
-PathSegment/gen_path_segment.rs bc0c914821a70f9a7db23766f4d84e2d69fc76d5075a8bc3341f2ba59a8ce911 bc0c914821a70f9a7db23766f4d84e2d69fc76d5075a8bc3341f2ba59a8ce911
-PathType/gen_path_type.rs 710a5505615769da940202e7c6d9031edc23a4b05cd9fb25241c60affbba4027 710a5505615769da940202e7c6d9031edc23a4b05cd9fb25241c60affbba4027
+ParenTypeRepr/gen_paren_type_repr.rs 360a9415390ab572cb10015603537823cc0451bb94ef487d04bbfd7d523bee95 360a9415390ab572cb10015603537823cc0451bb94ef487d04bbfd7d523bee95
+Path/gen_path.rs 490268d6bfb1635883b8bdefc683d59c4dd0e9c7f86c2e55954661efb3ab0253 490268d6bfb1635883b8bdefc683d59c4dd0e9c7f86c2e55954661efb3ab0253
+Path/gen_path_expr.rs dcc9cc16cafff0e2225c1853a91612d3f666016c53fcb4ab5716ed31a33a41cd dcc9cc16cafff0e2225c1853a91612d3f666016c53fcb4ab5716ed31a33a41cd
+Path/gen_path_pat.rs fd7f941f8b33f19d3693be1fdb595c2fb2e85e8296702b82bf12bcd44632f371 fd7f941f8b33f19d3693be1fdb595c2fb2e85e8296702b82bf12bcd44632f371
+Path/gen_path_type_repr.rs 0cff40a38cf0201b70230ac3f1863728c0fa5f7099651fc437ae02824d12655b 0cff40a38cf0201b70230ac3f1863728c0fa5f7099651fc437ae02824d12655b
 PrefixExpr/gen_prefix_expr.rs c4b53e87f370713b9a9e257be26d082b0761497bac19b1d7401a31b22b30d1ab c4b53e87f370713b9a9e257be26d082b0761497bac19b1d7401a31b22b30d1ab
-PtrType/gen_ptr_type.rs dd7faad19454b92d7942ef664df1a5f26c01863e408b87249aa4d5d4f68c78b3 dd7faad19454b92d7942ef664df1a5f26c01863e408b87249aa4d5d4f68c78b3
+PtrTypeRepr/gen_ptr_type_repr.rs 290d64a8ab4e8946b2e37496e7d2837529135e99b61cfb16a98c00f4d6ff8679 290d64a8ab4e8946b2e37496e7d2837529135e99b61cfb16a98c00f4d6ff8679
 RangeExpr/gen_range_expr.rs 3f27cff9cc76b2703beff622d1453b84121e1970a869e45f9428deac92c4ecb0 3f27cff9cc76b2703beff622d1453b84121e1970a869e45f9428deac92c4ecb0
 RangePat/gen_range_pat.rs 18b5169c3ab9230c95d86c4897f8343b2176d9602c9ea371c70c1eb0dbf89a28 18b5169c3ab9230c95d86c4897f8343b2176d9602c9ea371c70c1eb0dbf89a28
 RecordExpr/gen_record_expr.rs f8a7db88ae9e2a47588d26a76331cba64014dc6d5e065af28adcd718c8c52727 f8a7db88ae9e2a47588d26a76331cba64014dc6d5e065af28adcd718c8c52727
@@ -97,15 +99,15 @@ RecordPatField/gen_record_pat_field.rs f6c31bd08e6021aa4da6e8238561a77208f0ef723
 RecordPatFieldList/gen_record_pat_field_list.rs 35aa6ce694da1c822a593a9b1251e2a2c61365489edf2c0e9710251d8d02fe3f 35aa6ce694da1c822a593a9b1251e2a2c61365489edf2c0e9710251d8d02fe3f
 RefExpr/gen_ref_expr.rs 82695467551def4a00c78aa1ea6a1460e9edbef7df2672f13daccb0ee5d6b4c6 82695467551def4a00c78aa1ea6a1460e9edbef7df2672f13daccb0ee5d6b4c6
 RefPat/gen_ref_pat.rs aba7518649d9a37928e59a40d42f76cc0f4735e8daf711a3def6d2f0520e1f54 aba7518649d9a37928e59a40d42f76cc0f4735e8daf711a3def6d2f0520e1f54
-RefType/gen_ref_type.rs 9d5c6d8257e580b550cbec5717e96b5cea6257c9e261e6f56db36c8570363b9d 9d5c6d8257e580b550cbec5717e96b5cea6257c9e261e6f56db36c8570363b9d
+RefTypeRepr/gen_ref_type_repr.rs 39a79cf148b7ee30e23a12c9349854dbe83aee1790153a388c43ff749907f8ea 39a79cf148b7ee30e23a12c9349854dbe83aee1790153a388c43ff749907f8ea
 Rename/gen_rename.rs 553c16f243d1ae3b6b28510d39436c83425944e5085171c18e0a2aa40deb74fc 553c16f243d1ae3b6b28510d39436c83425944e5085171c18e0a2aa40deb74fc
 RestPat/gen_rest_pat.rs e762bf7537225f97da751c5dca6a2cd3836ad7579b68c748b8c6cba65087acca e762bf7537225f97da751c5dca6a2cd3836ad7579b68c748b8c6cba65087acca
-RetType/gen_ret_type.rs 0947aed0974461b7a5b56bbc5fe36131663bde715c37302345d4eee23b71c825 0947aed0974461b7a5b56bbc5fe36131663bde715c37302345d4eee23b71c825
+RetTypeRepr/gen_ret_type_repr.rs 25edbd60ad63ab4266f6426ef50f1dd17e24132f5a24404d240a3f07daef6a31 25edbd60ad63ab4266f6426ef50f1dd17e24132f5a24404d240a3f07daef6a31
 ReturnExpr/gen_return_expr.rs 4f6ef29d7b3c60d6d71d1a6034a0721671f517428ba21897361a92b01009d38f 4f6ef29d7b3c60d6d71d1a6034a0721671f517428ba21897361a92b01009d38f
 ReturnTypeSyntax/gen_return_type_syntax.rs 0b11a4cc400f9a2001996f99d61391bdb636e8aea036f587cf18ad6a957fe496 0b11a4cc400f9a2001996f99d61391bdb636e8aea036f587cf18ad6a957fe496
-SelfParam/gen_self_param.rs b7bf9f23fedad6f1a15f02e5fac33fc2c68ec3409b44f24142c2fdec1e5e6f1f b7bf9f23fedad6f1a15f02e5fac33fc2c68ec3409b44f24142c2fdec1e5e6f1f
+SelfParam/gen_self_param.rs 9be528c454e2734292d54550f8850ae8e48e1558da46dcf7f06fc7a7a8c3e569 9be528c454e2734292d54550f8850ae8e48e1558da46dcf7f06fc7a7a8c3e569
 SlicePat/gen_slice_pat.rs df4a6692f5100aa11dd777561400ce71e37b85f2363b0638c21975a1771b15d5 df4a6692f5100aa11dd777561400ce71e37b85f2363b0638c21975a1771b15d5
-SliceType/gen_slice_type.rs 073282f4755994473933db7e4f1e4d34a80363d7e331299ec4ac1a2d6a235b86 073282f4755994473933db7e4f1e4d34a80363d7e331299ec4ac1a2d6a235b86
+SliceTypeRepr/gen_slice_type_repr.rs e50c142b7cf7bc3040ad64f351488557323d0b2fd5d004b41ed0fa8e522b5648 e50c142b7cf7bc3040ad64f351488557323d0b2fd5d004b41ed0fa8e522b5648
 SourceFile/gen_source_file.rs a7a1d4fa77b53adb6fbc031bf7ab49cf7c8787728ba0a687c348b5eefbb5b9df a7a1d4fa77b53adb6fbc031bf7ab49cf7c8787728ba0a687c348b5eefbb5b9df
 Static/gen_static.rs ff01782c2f0f702373fc6df45ac9277fbdd8d4fad69dbe5f984a14790a46e7b9 ff01782c2f0f702373fc6df45ac9277fbdd8d4fad69dbe5f984a14790a46e7b9
 StmtList/gen_stmt_list.rs bb3791a613b91a2086c19cb0eddbf978bb37bbb2bd79d3e61b40be35c71daaad bb3791a613b91a2086c19cb0eddbf978bb37bbb2bd79d3e61b40be35c71daaad
@@ -119,7 +121,7 @@ TupleField/gen_tuple_field.rs 8a77f7f1c2e4ac4374a147c27db7789e80496b5a405fd9cc33
 TupleFieldList/gen_tuple_field_list.rs d2a5151b413be3edbf093c4f47a8d57945e794d399378971940f6a5c65d4c223 d2a5151b413be3edbf093c4f47a8d57945e794d399378971940f6a5c65d4c223
 TuplePat/gen_tuple_pat.rs b1b0c9c5ff1b787f380644691c77807655a4f6441fc7431c90ecf78c54c26148 b1b0c9c5ff1b787f380644691c77807655a4f6441fc7431c90ecf78c54c26148
 TupleStructPat/gen_tuple_struct_pat.rs 601ca8813272d15b4c8fd7402d0d28a42a62be82865eb5e86b985ad31464ca98 601ca8813272d15b4c8fd7402d0d28a42a62be82865eb5e86b985ad31464ca98
-TupleType/gen_tuple_type.rs f4302ca264cb17e0c27015f657e678a13147f691c06323cba778836467815265 f4302ca264cb17e0c27015f657e678a13147f691c06323cba778836467815265
+TupleTypeRepr/gen_tuple_type_repr.rs 4ce074df3739c7614eae850d54d28f0ee4869d64ccc5736c5b73bed7800a0470 4ce074df3739c7614eae850d54d28f0ee4869d64ccc5736c5b73bed7800a0470
 TypeAlias/gen_type_alias.rs eee732f674d9f999fee1e1976c426ba07f23c63b58b3a53c2026a4b922c00c8f eee732f674d9f999fee1e1976c426ba07f23c63b58b3a53c2026a4b922c00c8f
 TypeArg/gen_type_arg.rs 11e024708429bb683adc848d0be168cd9d190793833880e6ec74139df296e818 11e024708429bb683adc848d0be168cd9d190793833880e6ec74139df296e818
 TypeBound/gen_type_bound.rs 4198346113b075812f79858ccbd467339d6b8039a449bd58c4710dd0aba1c9c1 4198346113b075812f79858ccbd467339d6b8039a449bd58c4710dd0aba1c9c1
diff --git a/rust/ql/test/extractor-tests/generated/.gitattributes b/rust/ql/test/extractor-tests/generated/.gitattributes
index 8ea3a00a31f..229d34da5d3 100644
--- a/rust/ql/test/extractor-tests/generated/.gitattributes
+++ b/rust/ql/test/extractor-tests/generated/.gitattributes
@@ -2,8 +2,9 @@
 /.gitattributes linguist-generated
 /Abi/gen_abi.rs linguist-generated
 /ArgList/gen_arg_list.rs linguist-generated
-/ArrayExpr/gen_array_expr.rs linguist-generated
-/ArrayType/gen_array_type.rs linguist-generated
+/ArrayListExpr/gen_array_list_expr.rs linguist-generated
+/ArrayRepeatExpr/gen_array_repeat_expr.rs linguist-generated
+/ArrayTypeRepr/gen_array_type_repr.rs linguist-generated
 /AsmExpr/gen_asm_expr.rs linguist-generated
 /AssocTypeArg/gen_assoc_type_arg.rs linguist-generated
 /Attr/gen_attr.rs linguist-generated
@@ -23,27 +24,29 @@
 /ConstBlockPat/gen_const_block_pat.rs linguist-generated
 /ConstParam/gen_const_param.rs linguist-generated
 /ContinueExpr/gen_continue_expr.rs linguist-generated
-/DynTraitType/gen_dyn_trait_type.rs linguist-generated
+/DynTraitTypeRepr/gen_dyn_trait_type_repr.rs linguist-generated
 /Enum/gen_enum.rs linguist-generated
 /ExprStmt/gen_expr_stmt.rs linguist-generated
 /ExternBlock/gen_extern_block.rs linguist-generated
 /ExternCrate/gen_extern_crate.rs linguist-generated
 /ExternItemList/gen_extern_item_list.rs linguist-generated
 /FieldExpr/gen_field_expr.rs linguist-generated
-/FnPtrType/gen_fn_ptr_type.rs linguist-generated
+/FnPtrTypeRepr/gen_fn_ptr_type_repr.rs linguist-generated
 /ForExpr/gen_for_expr.rs linguist-generated
-/ForType/gen_for_type.rs linguist-generated
-/FormatArgsArg/gen_format_args_arg.rs linguist-generated
+/ForTypeRepr/gen_for_type_repr.rs linguist-generated
+/FormatArgsExpr/gen_format.rs linguist-generated
+/FormatArgsExpr/gen_format_args_arg.rs linguist-generated
 /FormatArgsExpr/gen_format_args_expr.rs linguist-generated
+/FormatArgsExpr/gen_format_argument.rs linguist-generated
 /Function/gen_function.rs linguist-generated
 /GenericArgList/gen_generic_arg_list.rs linguist-generated
 /GenericParamList/gen_generic_param_list.rs linguist-generated
 /IdentPat/gen_ident_pat.rs linguist-generated
 /IfExpr/gen_if_expr.rs linguist-generated
 /Impl/gen_impl.rs linguist-generated
-/ImplTraitType/gen_impl_trait_type.rs linguist-generated
+/ImplTraitTypeRepr/gen_impl_trait_type_repr.rs linguist-generated
 /IndexExpr/gen_index_expr.rs linguist-generated
-/InferType/gen_infer_type.rs linguist-generated
+/InferTypeRepr/gen_infer_type_repr.rs linguist-generated
 /ItemList/gen_item_list.rs linguist-generated
 /Label/gen_label.rs linguist-generated
 /LetElse/gen_let_else.rs linguist-generated
@@ -62,7 +65,7 @@
 /MacroPat/gen_macro_pat.rs linguist-generated
 /MacroRules/gen_macro_rules.rs linguist-generated
 /MacroStmts/gen_macro_stmts.rs linguist-generated
-/MacroType/gen_macro_type.rs linguist-generated
+/MacroTypeRepr/gen_macro_type_repr.rs linguist-generated
 /MatchArm/gen_match_arm.rs linguist-generated
 /MatchArmList/gen_match_arm_list.rs linguist-generated
 /MatchExpr/gen_match_expr.rs linguist-generated
@@ -72,21 +75,20 @@
 /Module/gen_module.rs linguist-generated
 /Name/gen_name.rs linguist-generated
 /NameRef/gen_name_ref.rs linguist-generated
-/NeverType/gen_never_type.rs linguist-generated
+/NeverTypeRepr/gen_never_type_repr.rs linguist-generated
 /OffsetOfExpr/gen_offset_of_expr.rs linguist-generated
 /OrPat/gen_or_pat.rs linguist-generated
 /Param/gen_param.rs linguist-generated
 /ParamList/gen_param_list.rs linguist-generated
 /ParenExpr/gen_paren_expr.rs linguist-generated
 /ParenPat/gen_paren_pat.rs linguist-generated
-/ParenType/gen_paren_type.rs linguist-generated
+/ParenTypeRepr/gen_paren_type_repr.rs linguist-generated
 /Path/gen_path.rs linguist-generated
-/PathExpr/gen_path_expr.rs linguist-generated
-/PathPat/gen_path_pat.rs linguist-generated
-/PathSegment/gen_path_segment.rs linguist-generated
-/PathType/gen_path_type.rs linguist-generated
+/Path/gen_path_expr.rs linguist-generated
+/Path/gen_path_pat.rs linguist-generated
+/Path/gen_path_type_repr.rs linguist-generated
 /PrefixExpr/gen_prefix_expr.rs linguist-generated
-/PtrType/gen_ptr_type.rs linguist-generated
+/PtrTypeRepr/gen_ptr_type_repr.rs linguist-generated
 /RangeExpr/gen_range_expr.rs linguist-generated
 /RangePat/gen_range_pat.rs linguist-generated
 /RecordExpr/gen_record_expr.rs linguist-generated
@@ -99,15 +101,15 @@
 /RecordPatFieldList/gen_record_pat_field_list.rs linguist-generated
 /RefExpr/gen_ref_expr.rs linguist-generated
 /RefPat/gen_ref_pat.rs linguist-generated
-/RefType/gen_ref_type.rs linguist-generated
+/RefTypeRepr/gen_ref_type_repr.rs linguist-generated
 /Rename/gen_rename.rs linguist-generated
 /RestPat/gen_rest_pat.rs linguist-generated
-/RetType/gen_ret_type.rs linguist-generated
+/RetTypeRepr/gen_ret_type_repr.rs linguist-generated
 /ReturnExpr/gen_return_expr.rs linguist-generated
 /ReturnTypeSyntax/gen_return_type_syntax.rs linguist-generated
 /SelfParam/gen_self_param.rs linguist-generated
 /SlicePat/gen_slice_pat.rs linguist-generated
-/SliceType/gen_slice_type.rs linguist-generated
+/SliceTypeRepr/gen_slice_type_repr.rs linguist-generated
 /SourceFile/gen_source_file.rs linguist-generated
 /Static/gen_static.rs linguist-generated
 /StmtList/gen_stmt_list.rs linguist-generated
@@ -121,7 +123,7 @@
 /TupleFieldList/gen_tuple_field_list.rs linguist-generated
 /TuplePat/gen_tuple_pat.rs linguist-generated
 /TupleStructPat/gen_tuple_struct_pat.rs linguist-generated
-/TupleType/gen_tuple_type.rs linguist-generated
+/TupleTypeRepr/gen_tuple_type_repr.rs linguist-generated
 /TypeAlias/gen_type_alias.rs linguist-generated
 /TypeArg/gen_type_arg.rs linguist-generated
 /TypeBound/gen_type_bound.rs linguist-generated
diff --git a/rust/ql/test/extractor-tests/generated/ArrayExpr/ArrayExpr.expected b/rust/ql/test/extractor-tests/generated/ArrayExpr/ArrayExpr.expected
deleted file mode 100644
index 549f43fc989..00000000000
--- a/rust/ql/test/extractor-tests/generated/ArrayExpr/ArrayExpr.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_array_expr.rs:5:5:5:13 | ArrayExpr | getNumberOfAttrs: | 0 | getNumberOfExprs: | 3 |
-| gen_array_expr.rs:6:5:6:11 | ArrayExpr | getNumberOfAttrs: | 0 | getNumberOfExprs: | 2 |
diff --git a/rust/ql/test/extractor-tests/generated/ArrayExpr/ArrayExpr.ql b/rust/ql/test/extractor-tests/generated/ArrayExpr/ArrayExpr.ql
deleted file mode 100644
index e0f2223f57b..00000000000
--- a/rust/ql/test/extractor-tests/generated/ArrayExpr/ArrayExpr.ql
+++ /dev/null
@@ -1,11 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from ArrayExpr x, int getNumberOfAttrs, int getNumberOfExprs
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  getNumberOfAttrs = x.getNumberOfAttrs() and
-  getNumberOfExprs = x.getNumberOfExprs()
-select x, "getNumberOfAttrs:", getNumberOfAttrs, "getNumberOfExprs:", getNumberOfExprs
diff --git a/rust/ql/test/extractor-tests/generated/ArrayExpr/ArrayExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/ArrayExpr/ArrayExpr_getExpr.expected
deleted file mode 100644
index 97da5ba1c2a..00000000000
--- a/rust/ql/test/extractor-tests/generated/ArrayExpr/ArrayExpr_getExpr.expected
+++ /dev/null
@@ -1,5 +0,0 @@
-| gen_array_expr.rs:5:5:5:13 | ArrayExpr | 0 | gen_array_expr.rs:5:6:5:6 | 1 |
-| gen_array_expr.rs:5:5:5:13 | ArrayExpr | 1 | gen_array_expr.rs:5:9:5:9 | 2 |
-| gen_array_expr.rs:5:5:5:13 | ArrayExpr | 2 | gen_array_expr.rs:5:12:5:12 | 3 |
-| gen_array_expr.rs:6:5:6:11 | ArrayExpr | 0 | gen_array_expr.rs:6:6:6:6 | 1 |
-| gen_array_expr.rs:6:5:6:11 | ArrayExpr | 1 | gen_array_expr.rs:6:9:6:10 | 10 |
diff --git a/rust/ql/test/extractor-tests/generated/ArrayExpr/gen_array_expr.rs b/rust/ql/test/extractor-tests/generated/ArrayExpr/gen_array_expr.rs
deleted file mode 100644
index 48252cde12f..00000000000
--- a/rust/ql/test/extractor-tests/generated/ArrayExpr/gen_array_expr.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_array_expr() -> () {
-    // An array expression. For example:
-    [1, 2, 3];
-    [1; 10];
-}
diff --git a/rust/ql/test/extractor-tests/generated/ArrayListExpr/ArrayListExpr.expected b/rust/ql/test/extractor-tests/generated/ArrayListExpr/ArrayListExpr.expected
new file mode 100644
index 00000000000..31fd8036aad
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ArrayListExpr/ArrayListExpr.expected
@@ -0,0 +1 @@
+| gen_array_list_expr.rs:5:5:5:13 | [...] | getNumberOfExprs: | 3 | getNumberOfAttrs: | 0 |
diff --git a/rust/ql/test/extractor-tests/generated/ArrayListExpr/ArrayListExpr.ql b/rust/ql/test/extractor-tests/generated/ArrayListExpr/ArrayListExpr.ql
new file mode 100644
index 00000000000..72f74d5ce34
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ArrayListExpr/ArrayListExpr.ql
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ArrayListExpr x, int getNumberOfExprs, int getNumberOfAttrs
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfExprs = x.getNumberOfExprs() and
+  getNumberOfAttrs = x.getNumberOfAttrs()
+select x, "getNumberOfExprs:", getNumberOfExprs, "getNumberOfAttrs:", getNumberOfAttrs
diff --git a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTy.expected b/rust/ql/test/extractor-tests/generated/ArrayListExpr/ArrayListExpr_getAttr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTy.expected
rename to rust/ql/test/extractor-tests/generated/ArrayListExpr/ArrayListExpr_getAttr.expected
diff --git a/rust/ql/test/extractor-tests/generated/ArrayExpr/ArrayExpr_getAttr.ql b/rust/ql/test/extractor-tests/generated/ArrayListExpr/ArrayListExpr_getAttr.ql
similarity index 83%
rename from rust/ql/test/extractor-tests/generated/ArrayExpr/ArrayExpr_getAttr.ql
rename to rust/ql/test/extractor-tests/generated/ArrayListExpr/ArrayListExpr_getAttr.ql
index 89113fe91f0..10a9b3d52b3 100644
--- a/rust/ql/test/extractor-tests/generated/ArrayExpr/ArrayExpr_getAttr.ql
+++ b/rust/ql/test/extractor-tests/generated/ArrayListExpr/ArrayListExpr_getAttr.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from ArrayExpr x, int index
+from ArrayListExpr x, int index
 where toBeTested(x) and not x.isUnknown()
 select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/ArrayListExpr/ArrayListExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/ArrayListExpr/ArrayListExpr_getExpr.expected
new file mode 100644
index 00000000000..ac836b145bd
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ArrayListExpr/ArrayListExpr_getExpr.expected
@@ -0,0 +1,3 @@
+| gen_array_list_expr.rs:5:5:5:13 | [...] | 0 | gen_array_list_expr.rs:5:6:5:6 | 1 |
+| gen_array_list_expr.rs:5:5:5:13 | [...] | 1 | gen_array_list_expr.rs:5:9:5:9 | 2 |
+| gen_array_list_expr.rs:5:5:5:13 | [...] | 2 | gen_array_list_expr.rs:5:12:5:12 | 3 |
diff --git a/rust/ql/test/extractor-tests/generated/ArrayExpr/ArrayExpr_getExpr.ql b/rust/ql/test/extractor-tests/generated/ArrayListExpr/ArrayListExpr_getExpr.ql
similarity index 83%
rename from rust/ql/test/extractor-tests/generated/ArrayExpr/ArrayExpr_getExpr.ql
rename to rust/ql/test/extractor-tests/generated/ArrayListExpr/ArrayListExpr_getExpr.ql
index f75aef4b1e1..96d635c3c17 100644
--- a/rust/ql/test/extractor-tests/generated/ArrayExpr/ArrayExpr_getExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/ArrayListExpr/ArrayListExpr_getExpr.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from ArrayExpr x, int index
+from ArrayListExpr x, int index
 where toBeTested(x) and not x.isUnknown()
 select x, index, x.getExpr(index)
diff --git a/rust/ql/test/extractor-tests/generated/ArrayListExpr/gen_array_list_expr.rs b/rust/ql/test/extractor-tests/generated/ArrayListExpr/gen_array_list_expr.rs
new file mode 100644
index 00000000000..41e569a67ae
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ArrayListExpr/gen_array_list_expr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_array_list_expr() -> () {
+    // An array expression with a list of elements. For example:
+    [1, 2, 3];
+}
diff --git a/rust/ql/test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr.expected b/rust/ql/test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr.expected
new file mode 100644
index 00000000000..e19394137d9
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr.expected
@@ -0,0 +1 @@
+| gen_array_repeat_expr.rs:5:5:5:11 | [1; 10] | getNumberOfExprs: | 2 | getNumberOfAttrs: | 0 | getRepeatOperand: | gen_array_repeat_expr.rs:5:6:5:6 | 1 | getRepeatLength: | gen_array_repeat_expr.rs:5:9:5:10 | 10 |
diff --git a/rust/ql/test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr.ql b/rust/ql/test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr.ql
new file mode 100644
index 00000000000..cda59a0d638
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr.ql
@@ -0,0 +1,16 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from
+  ArrayRepeatExpr x, int getNumberOfExprs, int getNumberOfAttrs, Expr getRepeatOperand,
+  Expr getRepeatLength
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getNumberOfExprs = x.getNumberOfExprs() and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  getRepeatOperand = x.getRepeatOperand() and
+  getRepeatLength = x.getRepeatLength()
+select x, "getNumberOfExprs:", getNumberOfExprs, "getNumberOfAttrs:", getNumberOfAttrs,
+  "getRepeatOperand:", getRepeatOperand, "getRepeatLength:", getRepeatLength
diff --git a/rust/ql/test/extractor-tests/generated/Const/Const_getTy.expected b/rust/ql/test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr_getAttr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/Const/Const_getTy.expected
rename to rust/ql/test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr_getAttr.expected
diff --git a/rust/ql/test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr_getAttr.ql b/rust/ql/test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr_getAttr.ql
new file mode 100644
index 00000000000..30c64104eee
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr_getAttr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ArrayRepeatExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getAttr(index)
diff --git a/rust/ql/test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr_getExpr.expected
new file mode 100644
index 00000000000..ccf6290172e
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr_getExpr.expected
@@ -0,0 +1,2 @@
+| gen_array_repeat_expr.rs:5:5:5:11 | [1; 10] | 0 | gen_array_repeat_expr.rs:5:6:5:6 | 1 |
+| gen_array_repeat_expr.rs:5:5:5:11 | [1; 10] | 1 | gen_array_repeat_expr.rs:5:9:5:10 | 10 |
diff --git a/rust/ql/test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr_getExpr.ql b/rust/ql/test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr_getExpr.ql
new file mode 100644
index 00000000000..63352ff7776
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ArrayRepeatExpr/ArrayRepeatExpr_getExpr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ArrayRepeatExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getExpr(index)
diff --git a/rust/ql/test/extractor-tests/generated/ArrayRepeatExpr/gen_array_repeat_expr.rs b/rust/ql/test/extractor-tests/generated/ArrayRepeatExpr/gen_array_repeat_expr.rs
new file mode 100644
index 00000000000..9c68fb96f86
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ArrayRepeatExpr/gen_array_repeat_expr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_array_repeat_expr() -> () {
+    // An array expression with a repeat operand and a repeat length. For example:
+    [1; 10];
+}
diff --git a/rust/ql/test/extractor-tests/generated/ArrayType/ArrayType.ql b/rust/ql/test/extractor-tests/generated/ArrayType/ArrayType.ql
deleted file mode 100644
index 1538043e292..00000000000
--- a/rust/ql/test/extractor-tests/generated/ArrayType/ArrayType.ql
+++ /dev/null
@@ -1,11 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from ArrayType x, string hasConstArg, string hasTy
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  (if x.hasConstArg() then hasConstArg = "yes" else hasConstArg = "no") and
-  if x.hasTy() then hasTy = "yes" else hasTy = "no"
-select x, "hasConstArg:", hasConstArg, "hasTy:", hasTy
diff --git a/rust/ql/test/extractor-tests/generated/ArrayType/gen_array_type.rs b/rust/ql/test/extractor-tests/generated/ArrayType/gen_array_type.rs
deleted file mode 100644
index 2449a205227..00000000000
--- a/rust/ql/test/extractor-tests/generated/ArrayType/gen_array_type.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_array_type() -> () {
-    // A ArrayType. For example:
-    todo!()
-}
diff --git a/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getTy.expected b/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getTy.expected
rename to rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr.ql b/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr.ql
new file mode 100644
index 00000000000..5ec3d499add
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr.ql
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ArrayTypeRepr x, string hasConstArg, string hasElementTypeRepr
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  (if x.hasConstArg() then hasConstArg = "yes" else hasConstArg = "no") and
+  if x.hasElementTypeRepr() then hasElementTypeRepr = "yes" else hasElementTypeRepr = "no"
+select x, "hasConstArg:", hasConstArg, "hasElementTypeRepr:", hasElementTypeRepr
diff --git a/rust/ql/test/extractor-tests/generated/DynTraitType/DynTraitType.expected b/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr_getConstArg.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/DynTraitType/DynTraitType.expected
rename to rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr_getConstArg.expected
diff --git a/rust/ql/test/extractor-tests/generated/ArrayType/ArrayType_getConstArg.ql b/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr_getConstArg.ql
similarity index 87%
rename from rust/ql/test/extractor-tests/generated/ArrayType/ArrayType_getConstArg.ql
rename to rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr_getConstArg.ql
index 55c3fc89475..f89dc93f5b8 100644
--- a/rust/ql/test/extractor-tests/generated/ArrayType/ArrayType_getConstArg.ql
+++ b/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr_getConstArg.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from ArrayType x
+from ArrayTypeRepr x
 where toBeTested(x) and not x.isUnknown()
 select x, x.getConstArg()
diff --git a/rust/ql/test/extractor-tests/generated/DynTraitType/DynTraitType_getTypeBoundList.expected b/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr_getElementTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/DynTraitType/DynTraitType_getTypeBoundList.expected
rename to rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr_getElementTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr_getElementTypeRepr.ql b/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr_getElementTypeRepr.ql
new file mode 100644
index 00000000000..f343cbd19c9
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr_getElementTypeRepr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ArrayTypeRepr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getElementTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/gen_array_type_repr.rs b/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/gen_array_type_repr.rs
new file mode 100644
index 00000000000..118b0286034
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ArrayTypeRepr/gen_array_type_repr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_array_type_repr() -> () {
+    // A ArrayTypeRepr. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr_getExpr.expected
index 7a4af543f31..07aec8f5fe0 100644
--- a/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr_getExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr_getExpr.expected
@@ -1 +1 @@
-| gen_asm_expr.rs:6:9:6:24 | AsmExpr | gen_asm_expr.rs:6:23:6:23 | UnderscoreExpr |
+| gen_asm_expr.rs:6:9:6:24 | AsmExpr | gen_asm_expr.rs:6:23:6:23 | _ |
diff --git a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.ql b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.ql
index b1cafa773f5..f1161ef7094 100644
--- a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.ql
+++ b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 from
   AssocTypeArg x, string hasConstArg, string hasGenericArgList, string hasNameRef,
-  string hasParamList, string hasRetType, string hasReturnTypeSyntax, string hasTy,
+  string hasParamList, string hasRetType, string hasReturnTypeSyntax, string hasTypeRepr,
   string hasTypeBoundList
 where
   toBeTested(x) and
@@ -15,8 +15,8 @@ where
   (if x.hasParamList() then hasParamList = "yes" else hasParamList = "no") and
   (if x.hasRetType() then hasRetType = "yes" else hasRetType = "no") and
   (if x.hasReturnTypeSyntax() then hasReturnTypeSyntax = "yes" else hasReturnTypeSyntax = "no") and
-  (if x.hasTy() then hasTy = "yes" else hasTy = "no") and
+  (if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and
   if x.hasTypeBoundList() then hasTypeBoundList = "yes" else hasTypeBoundList = "no"
 select x, "hasConstArg:", hasConstArg, "hasGenericArgList:", hasGenericArgList, "hasNameRef:",
   hasNameRef, "hasParamList:", hasParamList, "hasRetType:", hasRetType, "hasReturnTypeSyntax:",
-  hasReturnTypeSyntax, "hasTy:", hasTy, "hasTypeBoundList:", hasTypeBoundList
+  hasReturnTypeSyntax, "hasTypeRepr:", hasTypeRepr, "hasTypeBoundList:", hasTypeBoundList
diff --git a/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType.expected b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType.expected
rename to rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTy.ql b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTy.ql
rename to rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTypeRepr.ql
index 4b037c90ab2..0e4d81812ed 100644
--- a/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTy.ql
+++ b/rust/ql/test/extractor-tests/generated/AssocTypeArg/AssocTypeArg_getTypeRepr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from AssocTypeArg x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr.expected b/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr.expected
index 2ed01b9058e..9104ba77e5f 100644
--- a/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr.expected
@@ -1 +1 @@
-| gen_await_expr.rs:6:17:6:27 | AwaitExpr | getNumberOfAttrs: | 0 | hasExpr: | yes |
+| gen_await_expr.rs:6:17:6:27 | await ... | getNumberOfAttrs: | 0 | hasExpr: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr_getExpr.expected
index c34a6012f4c..a1ea7809bb0 100644
--- a/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr_getExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/AwaitExpr/AwaitExpr_getExpr.expected
@@ -1 +1 @@
-| gen_await_expr.rs:6:17:6:27 | AwaitExpr | gen_await_expr.rs:6:17:6:21 | CallExpr |
+| gen_await_expr.rs:6:17:6:27 | await ... | gen_await_expr.rs:6:17:6:21 | foo(...) |
diff --git a/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr.expected b/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr.expected
index 75840ec81fe..ce3e6a09690 100644
--- a/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr.expected
@@ -1 +1 @@
-| gen_become_expr.rs:8:10:8:36 | BecomeExpr | getNumberOfAttrs: | 0 | hasExpr: | yes |
+| gen_become_expr.rs:8:10:8:36 | become ... | getNumberOfAttrs: | 0 | hasExpr: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr_getExpr.expected
index 8992c4868ca..d0cb86a0303 100644
--- a/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr_getExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/BecomeExpr/BecomeExpr_getExpr.expected
@@ -1 +1 @@
-| gen_become_expr.rs:8:10:8:36 | BecomeExpr | gen_become_expr.rs:8:17:8:36 | CallExpr |
+| gen_become_expr.rs:8:10:8:36 | become ... | gen_become_expr.rs:8:17:8:36 | fact_a(...) |
diff --git a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.expected b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.expected
index 39ec1d6a7e1..b6be24d0bb7 100644
--- a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.expected
@@ -1,3 +1,3 @@
-| gen_block_expr.rs:3:28:12:1 | BlockExpr | getNumberOfAttrs: | 0 | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isTry: | no | isUnsafe: | no | hasLabel: | no | hasStmtList: | yes |
-| gen_block_expr.rs:5:5:7:5 | BlockExpr | getNumberOfAttrs: | 0 | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isTry: | no | isUnsafe: | no | hasLabel: | no | hasStmtList: | yes |
-| gen_block_expr.rs:8:5:11:5 | BlockExpr | getNumberOfAttrs: | 0 | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isTry: | no | isUnsafe: | no | hasLabel: | yes | hasStmtList: | yes |
+| gen_block_expr.rs:3:28:12:1 | { ... } | hasLabel: | no | getNumberOfAttrs: | 0 | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isTry: | no | isUnsafe: | no | hasStmtList: | yes |
+| gen_block_expr.rs:5:5:7:5 | { ... } | hasLabel: | no | getNumberOfAttrs: | 0 | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isTry: | no | isUnsafe: | no | hasStmtList: | yes |
+| gen_block_expr.rs:8:5:11:5 | 'label: { ... } | hasLabel: | yes | getNumberOfAttrs: | 0 | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isTry: | no | isUnsafe: | no | hasStmtList: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.ql b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.ql
index 58107054515..992c06a605b 100644
--- a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr.ql
@@ -3,11 +3,12 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  BlockExpr x, int getNumberOfAttrs, string isAsync, string isConst, string isGen, string isMove,
-  string isTry, string isUnsafe, string hasLabel, string hasStmtList
+  BlockExpr x, string hasLabel, int getNumberOfAttrs, string isAsync, string isConst, string isGen,
+  string isMove, string isTry, string isUnsafe, string hasStmtList
 where
   toBeTested(x) and
   not x.isUnknown() and
+  (if x.hasLabel() then hasLabel = "yes" else hasLabel = "no") and
   getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.isAsync() then isAsync = "yes" else isAsync = "no") and
   (if x.isConst() then isConst = "yes" else isConst = "no") and
@@ -15,8 +16,7 @@ where
   (if x.isMove() then isMove = "yes" else isMove = "no") and
   (if x.isTry() then isTry = "yes" else isTry = "no") and
   (if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no") and
-  (if x.hasLabel() then hasLabel = "yes" else hasLabel = "no") and
   if x.hasStmtList() then hasStmtList = "yes" else hasStmtList = "no"
-select x, "getNumberOfAttrs:", getNumberOfAttrs, "isAsync:", isAsync, "isConst:", isConst, "isGen:",
-  isGen, "isMove:", isMove, "isTry:", isTry, "isUnsafe:", isUnsafe, "hasLabel:", hasLabel,
+select x, "hasLabel:", hasLabel, "getNumberOfAttrs:", getNumberOfAttrs, "isAsync:", isAsync,
+  "isConst:", isConst, "isGen:", isGen, "isMove:", isMove, "isTry:", isTry, "isUnsafe:", isUnsafe,
   "hasStmtList:", hasStmtList
diff --git a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getLabel.expected b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getLabel.expected
index 3a935228e05..a6933d65b22 100644
--- a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getLabel.expected
+++ b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getLabel.expected
@@ -1 +1 @@
-| gen_block_expr.rs:8:5:11:5 | BlockExpr | gen_block_expr.rs:8:5:8:11 | Label |
+| gen_block_expr.rs:8:5:11:5 | 'label: { ... } | gen_block_expr.rs:8:5:8:11 | 'label |
diff --git a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getStmtList.expected b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getStmtList.expected
index 21eb195289a..4863264491b 100644
--- a/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getStmtList.expected
+++ b/rust/ql/test/extractor-tests/generated/BlockExpr/BlockExpr_getStmtList.expected
@@ -1,3 +1,3 @@
-| gen_block_expr.rs:3:28:12:1 | BlockExpr | gen_block_expr.rs:3:28:12:1 | StmtList |
-| gen_block_expr.rs:5:5:7:5 | BlockExpr | gen_block_expr.rs:5:5:7:5 | StmtList |
-| gen_block_expr.rs:8:5:11:5 | BlockExpr | gen_block_expr.rs:8:13:11:5 | StmtList |
+| gen_block_expr.rs:3:28:12:1 | { ... } | gen_block_expr.rs:3:28:12:1 | StmtList |
+| gen_block_expr.rs:5:5:7:5 | { ... } | gen_block_expr.rs:5:5:7:5 | StmtList |
+| gen_block_expr.rs:8:5:11:5 | 'label: { ... } | gen_block_expr.rs:8:13:11:5 | StmtList |
diff --git a/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat.expected b/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat.expected
index 95c8bdebd47..8ca2412e8ff 100644
--- a/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat.expected
+++ b/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat.expected
@@ -1,2 +1,2 @@
-| gen_box_pat.rs:6:9:6:27 | BoxPat | hasPat: | yes |
-| gen_box_pat.rs:7:9:7:24 | BoxPat | hasPat: | yes |
+| gen_box_pat.rs:6:9:6:27 | box ... | hasPat: | yes |
+| gen_box_pat.rs:7:9:7:24 | box ...::None | hasPat: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat_getPat.expected b/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat_getPat.expected
index cac8ee05d3c..a43975657a8 100644
--- a/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat_getPat.expected
+++ b/rust/ql/test/extractor-tests/generated/BoxPat/BoxPat_getPat.expected
@@ -1,2 +1,2 @@
-| gen_box_pat.rs:6:9:6:27 | BoxPat | gen_box_pat.rs:6:13:6:27 | TupleStructPat |
-| gen_box_pat.rs:7:9:7:24 | BoxPat | gen_box_pat.rs:7:13:7:24 | PathPat |
+| gen_box_pat.rs:6:9:6:27 | box ... | gen_box_pat.rs:6:13:6:27 | ...::Some(...) |
+| gen_box_pat.rs:7:9:7:24 | box ...::None | gen_box_pat.rs:7:13:7:24 | ...::None |
diff --git a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr.expected b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr.expected
index 763fae60866..30c734fd682 100644
--- a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr.expected
@@ -1,3 +1,3 @@
-| gen_break_expr.rs:7:13:7:17 | BreakExpr | getNumberOfAttrs: | 0 | hasExpr: | no | hasLifetime: | no |
-| gen_break_expr.rs:12:13:12:27 | BreakExpr | getNumberOfAttrs: | 0 | hasExpr: | yes | hasLifetime: | yes |
-| gen_break_expr.rs:17:13:17:27 | BreakExpr | getNumberOfAttrs: | 0 | hasExpr: | yes | hasLifetime: | yes |
+| gen_break_expr.rs:7:13:7:17 | break | getNumberOfAttrs: | 0 | hasExpr: | no | hasLifetime: | no |
+| gen_break_expr.rs:12:13:12:27 | break ''label 42 | getNumberOfAttrs: | 0 | hasExpr: | yes | hasLifetime: | yes |
+| gen_break_expr.rs:17:13:17:27 | break ''label 42 | getNumberOfAttrs: | 0 | hasExpr: | yes | hasLifetime: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getExpr.expected
index 0bd373a4bbc..20c5295354a 100644
--- a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getExpr.expected
@@ -1,2 +1,2 @@
-| gen_break_expr.rs:12:13:12:27 | BreakExpr | gen_break_expr.rs:12:26:12:27 | 42 |
-| gen_break_expr.rs:17:13:17:27 | BreakExpr | gen_break_expr.rs:17:26:17:27 | 42 |
+| gen_break_expr.rs:12:13:12:27 | break ''label 42 | gen_break_expr.rs:12:26:12:27 | 42 |
+| gen_break_expr.rs:17:13:17:27 | break ''label 42 | gen_break_expr.rs:17:26:17:27 | 42 |
diff --git a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getLifetime.expected b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getLifetime.expected
index b993a2eebf5..2e1a8801795 100644
--- a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getLifetime.expected
+++ b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getLifetime.expected
@@ -1,2 +1,2 @@
-| gen_break_expr.rs:12:13:12:27 | BreakExpr | gen_break_expr.rs:12:19:12:24 | Lifetime |
-| gen_break_expr.rs:17:13:17:27 | BreakExpr | gen_break_expr.rs:17:19:17:24 | Lifetime |
+| gen_break_expr.rs:12:13:12:27 | break ''label 42 | gen_break_expr.rs:12:19:12:24 | ''label |
+| gen_break_expr.rs:17:13:17:27 | break ''label 42 | gen_break_expr.rs:17:19:17:24 | ''label |
diff --git a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.expected b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.expected
index 5414108064c..ebe6eeda104 100644
--- a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.expected
@@ -1,4 +1,4 @@
-| gen_call_expr.rs:5:5:5:11 | CallExpr | hasArgList: | yes | getNumberOfAttrs: | 0 | hasExpr: | yes |
-| gen_call_expr.rs:6:5:6:23 | CallExpr | hasArgList: | yes | getNumberOfAttrs: | 0 | hasExpr: | yes |
-| gen_call_expr.rs:7:5:7:14 | CallExpr | hasArgList: | yes | getNumberOfAttrs: | 0 | hasExpr: | yes |
-| gen_call_expr.rs:8:5:8:10 | CallExpr | hasArgList: | yes | getNumberOfAttrs: | 0 | hasExpr: | yes |
+| gen_call_expr.rs:5:5:5:11 | foo(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | hasFunction: | yes |
+| gen_call_expr.rs:6:5:6:23 | foo::<...>(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | hasFunction: | yes |
+| gen_call_expr.rs:7:5:7:14 | ...(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | hasFunction: | yes |
+| gen_call_expr.rs:8:5:8:10 | foo(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | hasFunction: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.ql b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.ql
index b44136c4942..cd043e88d1d 100644
--- a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.ql
@@ -2,11 +2,12 @@
 import codeql.rust.elements
 import TestUtils
 
-from CallExpr x, string hasArgList, int getNumberOfAttrs, string hasExpr
+from CallExpr x, string hasArgList, int getNumberOfAttrs, string hasFunction
 where
   toBeTested(x) and
   not x.isUnknown() and
   (if x.hasArgList() then hasArgList = "yes" else hasArgList = "no") and
   getNumberOfAttrs = x.getNumberOfAttrs() and
-  if x.hasExpr() then hasExpr = "yes" else hasExpr = "no"
-select x, "hasArgList:", hasArgList, "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", hasExpr
+  if x.hasFunction() then hasFunction = "yes" else hasFunction = "no"
+select x, "hasArgList:", hasArgList, "getNumberOfAttrs:", getNumberOfAttrs, "hasFunction:",
+  hasFunction
diff --git a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getArgList.expected b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getArgList.expected
index a42cc13bf39..13c426db99d 100644
--- a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getArgList.expected
+++ b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getArgList.expected
@@ -1,4 +1,4 @@
-| gen_call_expr.rs:5:5:5:11 | CallExpr | gen_call_expr.rs:5:8:5:11 | ArgList |
-| gen_call_expr.rs:6:5:6:23 | CallExpr | gen_call_expr.rs:6:20:6:23 | ArgList |
-| gen_call_expr.rs:7:5:7:14 | CallExpr | gen_call_expr.rs:7:11:7:14 | ArgList |
-| gen_call_expr.rs:8:5:8:10 | CallExpr | gen_call_expr.rs:8:8:8:10 | ArgList |
+| gen_call_expr.rs:5:5:5:11 | foo(...) | gen_call_expr.rs:5:8:5:11 | ArgList |
+| gen_call_expr.rs:6:5:6:23 | foo::<...>(...) | gen_call_expr.rs:6:20:6:23 | ArgList |
+| gen_call_expr.rs:7:5:7:14 | ...(...) | gen_call_expr.rs:7:11:7:14 | ArgList |
+| gen_call_expr.rs:8:5:8:10 | foo(...) | gen_call_expr.rs:8:8:8:10 | ArgList |
diff --git a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getExpr.expected
index 544937866b7..ecaaf15cebb 100644
--- a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getExpr.expected
@@ -1,4 +1,4 @@
-| gen_call_expr.rs:5:5:5:11 | CallExpr | gen_call_expr.rs:5:5:5:7 | foo |
-| gen_call_expr.rs:6:5:6:23 | CallExpr | gen_call_expr.rs:6:5:6:19 | foo::<...> |
-| gen_call_expr.rs:7:5:7:14 | CallExpr | gen_call_expr.rs:7:5:7:10 | IndexExpr |
-| gen_call_expr.rs:8:5:8:10 | CallExpr | gen_call_expr.rs:8:5:8:7 | foo |
+| gen_call_expr.rs:5:5:5:11 | foo(...) | gen_call_expr.rs:5:5:5:7 | foo |
+| gen_call_expr.rs:6:5:6:23 | foo::<...>(...) | gen_call_expr.rs:6:5:6:19 | foo::<...> |
+| gen_call_expr.rs:7:5:7:14 | ...(...) | gen_call_expr.rs:7:5:7:10 | foo[0] |
+| gen_call_expr.rs:8:5:8:10 | foo(...) | gen_call_expr.rs:8:5:8:7 | foo |
diff --git a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getFunction.expected b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getFunction.expected
new file mode 100644
index 00000000000..ecaaf15cebb
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getFunction.expected
@@ -0,0 +1,4 @@
+| gen_call_expr.rs:5:5:5:11 | foo(...) | gen_call_expr.rs:5:5:5:7 | foo |
+| gen_call_expr.rs:6:5:6:23 | foo::<...>(...) | gen_call_expr.rs:6:5:6:19 | foo::<...> |
+| gen_call_expr.rs:7:5:7:14 | ...(...) | gen_call_expr.rs:7:5:7:10 | foo[0] |
+| gen_call_expr.rs:8:5:8:10 | foo(...) | gen_call_expr.rs:8:5:8:7 | foo |
diff --git a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getExpr.ql b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getFunction.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getExpr.ql
rename to rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getFunction.ql
index d09819fc1fd..61196bcd14d 100644
--- a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getFunction.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from CallExpr x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getExpr()
+select x, x.getFunction()
diff --git a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.expected b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.expected
index 6050eb02259..76e6f567b06 100644
--- a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.expected
@@ -1 +1 @@
-| gen_cast_expr.rs:5:5:5:16 | CastExpr | getNumberOfAttrs: | 0 | hasExpr: | yes | hasTy: | yes |
+| gen_cast_expr.rs:5:5:5:16 | value as u64 | getNumberOfAttrs: | 0 | hasExpr: | yes | hasTypeRepr: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.ql b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.ql
index d7db68cfdf2..0c60d9f8c4e 100644
--- a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr.ql
@@ -2,11 +2,11 @@
 import codeql.rust.elements
 import TestUtils
 
-from CastExpr x, int getNumberOfAttrs, string hasExpr, string hasTy
+from CastExpr x, int getNumberOfAttrs, string hasExpr, string hasTypeRepr
 where
   toBeTested(x) and
   not x.isUnknown() and
   getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and
-  if x.hasTy() then hasTy = "yes" else hasTy = "no"
-select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", hasExpr, "hasTy:", hasTy
+  if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", hasExpr, "hasTypeRepr:", hasTypeRepr
diff --git a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getExpr.expected
index f3e1d4c7ec9..01a710bfb53 100644
--- a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getExpr.expected
@@ -1 +1 @@
-| gen_cast_expr.rs:5:5:5:16 | CastExpr | gen_cast_expr.rs:5:5:5:9 | value |
+| gen_cast_expr.rs:5:5:5:16 | value as u64 | gen_cast_expr.rs:5:5:5:9 | value |
diff --git a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getTy.expected b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getTy.expected
deleted file mode 100644
index 29cc49cc3b9..00000000000
--- a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getTy.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_cast_expr.rs:5:5:5:16 | CastExpr | gen_cast_expr.rs:5:14:5:16 | PathType |
diff --git a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getTypeRepr.expected b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getTypeRepr.expected
new file mode 100644
index 00000000000..87c07babb02
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getTypeRepr.expected
@@ -0,0 +1 @@
+| gen_cast_expr.rs:5:5:5:16 | value as u64 | gen_cast_expr.rs:5:14:5:16 | u64 |
diff --git a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getTy.ql b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getTy.ql
rename to rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getTypeRepr.ql
index 68b6f5126f4..34ee4c5ef9d 100644
--- a/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getTy.ql
+++ b/rust/ql/test/extractor-tests/generated/CastExpr/CastExpr_getTypeRepr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from CastExpr x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.expected b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.expected
index fb665ca8f60..3ea9f463a00 100644
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.expected
@@ -1,5 +1,5 @@
-| gen_closure_expr.rs:5:5:5:13 | ClosureExpr | hasParamList: | yes | getNumberOfAttrs: | 0 | hasBody: | yes | hasClosureBinder: | no | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | no | hasRetType: | no |
-| gen_closure_expr.rs:6:5:6:34 | ClosureExpr | hasParamList: | yes | getNumberOfAttrs: | 0 | hasBody: | yes | hasClosureBinder: | no | isAsync: | no | isConst: | no | isGen: | no | isMove: | yes | isStatic: | no | hasRetType: | yes |
-| gen_closure_expr.rs:7:5:7:27 | ClosureExpr | hasParamList: | yes | getNumberOfAttrs: | 0 | hasBody: | yes | hasClosureBinder: | no | isAsync: | yes | isConst: | no | isGen: | no | isMove: | no | isStatic: | no | hasRetType: | no |
-| gen_closure_expr.rs:8:6:9:15 | ClosureExpr | hasParamList: | yes | getNumberOfAttrs: | 1 | hasBody: | yes | hasClosureBinder: | no | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | no | hasRetType: | no |
-| gen_closure_expr.rs:10:6:11:23 | ClosureExpr | hasParamList: | yes | getNumberOfAttrs: | 1 | hasBody: | yes | hasClosureBinder: | no | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | yes | hasRetType: | no |
+| gen_closure_expr.rs:5:5:5:13 | \|...\| ... | hasParamList: | yes | getNumberOfAttrs: | 0 | hasBody: | yes | hasClosureBinder: | no | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | no | hasRetType: | no |
+| gen_closure_expr.rs:6:5:6:34 | \|...\| ... | hasParamList: | yes | getNumberOfAttrs: | 0 | hasBody: | yes | hasClosureBinder: | no | isAsync: | no | isConst: | no | isGen: | no | isMove: | yes | isStatic: | no | hasRetType: | yes |
+| gen_closure_expr.rs:7:5:7:27 | \|...\| ... | hasParamList: | yes | getNumberOfAttrs: | 0 | hasBody: | yes | hasClosureBinder: | no | isAsync: | yes | isConst: | no | isGen: | no | isMove: | no | isStatic: | no | hasRetType: | no |
+| gen_closure_expr.rs:8:6:9:15 | \|...\| ... | hasParamList: | yes | getNumberOfAttrs: | 1 | hasBody: | yes | hasClosureBinder: | no | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | no | hasRetType: | no |
+| gen_closure_expr.rs:10:6:11:23 | \|...\| ... | hasParamList: | yes | getNumberOfAttrs: | 1 | hasBody: | yes | hasClosureBinder: | no | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | yes | hasRetType: | no |
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getAttr.expected
index f1859d594d1..4de6e17d785 100644
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getAttr.expected
+++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getAttr.expected
@@ -1,2 +1,2 @@
-| gen_closure_expr.rs:8:6:9:15 | ClosureExpr | 0 | gen_closure_expr.rs:8:6:8:17 | Attr |
-| gen_closure_expr.rs:10:6:11:23 | ClosureExpr | 0 | gen_closure_expr.rs:10:6:10:17 | Attr |
+| gen_closure_expr.rs:8:6:9:15 | \|...\| ... | 0 | gen_closure_expr.rs:8:6:8:17 | Attr |
+| gen_closure_expr.rs:10:6:11:23 | \|...\| ... | 0 | gen_closure_expr.rs:10:6:10:17 | Attr |
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getBody.expected b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getBody.expected
index 71bc3cccda3..d7b6180e63b 100644
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getBody.expected
+++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getBody.expected
@@ -1,5 +1,5 @@
-| gen_closure_expr.rs:5:5:5:13 | ClosureExpr | gen_closure_expr.rs:5:9:5:13 | ... + ... |
-| gen_closure_expr.rs:6:5:6:34 | ClosureExpr | gen_closure_expr.rs:6:26:6:34 | BlockExpr |
-| gen_closure_expr.rs:7:5:7:27 | ClosureExpr | gen_closure_expr.rs:7:23:7:27 | ... + ... |
-| gen_closure_expr.rs:8:6:9:15 | ClosureExpr | gen_closure_expr.rs:9:9:9:15 | YieldExpr |
-| gen_closure_expr.rs:10:6:11:23 | ClosureExpr | gen_closure_expr.rs:11:17:11:23 | YieldExpr |
+| gen_closure_expr.rs:5:5:5:13 | \|...\| ... | gen_closure_expr.rs:5:9:5:13 | ... + ... |
+| gen_closure_expr.rs:6:5:6:34 | \|...\| ... | gen_closure_expr.rs:6:26:6:34 | { ... } |
+| gen_closure_expr.rs:7:5:7:27 | \|...\| ... | gen_closure_expr.rs:7:23:7:27 | ... + ... |
+| gen_closure_expr.rs:8:6:9:15 | \|...\| ... | gen_closure_expr.rs:9:9:9:15 | YieldExpr |
+| gen_closure_expr.rs:10:6:11:23 | \|...\| ... | gen_closure_expr.rs:11:17:11:23 | YieldExpr |
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getParamList.expected b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getParamList.expected
index d0e6aaeac06..5945738433b 100644
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getParamList.expected
+++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getParamList.expected
@@ -1,5 +1,5 @@
-| gen_closure_expr.rs:5:5:5:13 | ClosureExpr | gen_closure_expr.rs:5:5:5:7 | ParamList |
-| gen_closure_expr.rs:6:5:6:34 | ClosureExpr | gen_closure_expr.rs:6:10:6:17 | ParamList |
-| gen_closure_expr.rs:7:5:7:27 | ClosureExpr | gen_closure_expr.rs:7:11:7:21 | ParamList |
-| gen_closure_expr.rs:8:6:9:15 | ClosureExpr | gen_closure_expr.rs:9:5:9:7 | ParamList |
-| gen_closure_expr.rs:10:6:11:23 | ClosureExpr | gen_closure_expr.rs:11:13:11:15 | ParamList |
+| gen_closure_expr.rs:5:5:5:13 | \|...\| ... | gen_closure_expr.rs:5:5:5:7 | ParamList |
+| gen_closure_expr.rs:6:5:6:34 | \|...\| ... | gen_closure_expr.rs:6:10:6:17 | ParamList |
+| gen_closure_expr.rs:7:5:7:27 | \|...\| ... | gen_closure_expr.rs:7:11:7:21 | ParamList |
+| gen_closure_expr.rs:8:6:9:15 | \|...\| ... | gen_closure_expr.rs:9:5:9:7 | ParamList |
+| gen_closure_expr.rs:10:6:11:23 | \|...\| ... | gen_closure_expr.rs:11:13:11:15 | ParamList |
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getRetType.expected b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getRetType.expected
index e018209cb53..d5b2095eacc 100644
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getRetType.expected
+++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getRetType.expected
@@ -1 +1 @@
-| gen_closure_expr.rs:6:5:6:34 | ClosureExpr | gen_closure_expr.rs:6:19:6:24 | RetType |
+| gen_closure_expr.rs:6:5:6:34 | \|...\| ... | gen_closure_expr.rs:6:19:6:24 | RetTypeRepr |
diff --git a/rust/ql/test/extractor-tests/generated/Comment/Comment.expected b/rust/ql/test/extractor-tests/generated/Comment/Comment.expected
index 21861bb40bf..24e95f123d8 100644
--- a/rust/ql/test/extractor-tests/generated/Comment/Comment.expected
+++ b/rust/ql/test/extractor-tests/generated/Comment/Comment.expected
@@ -1,7 +1,7 @@
-| comments.rs:1:1:3:2 | Comment | getParent: | comments.rs:1:1:9:1 | foo | getText: | /** \n* A doc comment\n*/ |
-| comments.rs:6:17:6:34 | Comment | getParent: | comments.rs:6:17:8:16 | nested | getText: | // print some text |
-| comments.rs:7:3:7:31 | Comment | getParent: | comments.rs:6:17:8:16 | nested | getText: | /// This is a nested function |
-| gen_comment.rs:1:1:1:36 | Comment | getParent: | gen_comment.rs:1:1:7:2 | SourceFile | getText: | // generated by codegen, do not edit |
-| gen_comment.rs:4:5:4:30 | Comment | getParent: | gen_comment.rs:3:25:7:1 | StmtList | getText: | // A comment. For example: |
-| gen_comment.rs:5:5:5:24 | Comment | getParent: | gen_comment.rs:3:25:7:1 | StmtList | getText: | // this is a comment |
-| gen_comment.rs:6:5:6:29 | Comment | getParent: | gen_comment.rs:3:25:7:1 | StmtList | getText: | /// This is a doc comment |
+| comments.rs:1:1:3:2 | /**...*/ | getParent: | comments.rs:1:1:9:1 | fn foo | getText: | /** \n* A doc comment\n*/ |
+| comments.rs:6:17:6:34 | //... | getParent: | comments.rs:6:17:8:16 | fn nested | getText: | // print some text |
+| comments.rs:7:3:7:31 | ///... | getParent: | comments.rs:6:17:8:16 | fn nested | getText: | /// This is a nested function |
+| gen_comment.rs:1:1:1:36 | //... | getParent: | gen_comment.rs:1:1:7:2 | SourceFile | getText: | // generated by codegen, do not edit |
+| gen_comment.rs:4:5:4:30 | //... | getParent: | gen_comment.rs:3:25:7:1 | StmtList | getText: | // A comment. For example: |
+| gen_comment.rs:5:5:5:24 | //... | getParent: | gen_comment.rs:3:25:7:1 | StmtList | getText: | // this is a comment |
+| gen_comment.rs:6:5:6:29 | ///... | getParent: | gen_comment.rs:3:25:7:1 | StmtList | getText: | /// This is a doc comment |
diff --git a/rust/ql/test/extractor-tests/generated/Const/Const.ql b/rust/ql/test/extractor-tests/generated/Const/Const.ql
index 125943f40a0..f1509aac368 100644
--- a/rust/ql/test/extractor-tests/generated/Const/Const.ql
+++ b/rust/ql/test/extractor-tests/generated/Const/Const.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 from
   Const x, string hasExtendedCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs,
-  string hasBody, string isConst, string isDefault, string hasName, string hasTy,
+  string hasBody, string isConst, string isDefault, string hasName, string hasTypeRepr,
   string hasVisibility
 where
   toBeTested(x) and
@@ -20,8 +20,8 @@ where
   (if x.isConst() then isConst = "yes" else isConst = "no") and
   (if x.isDefault() then isDefault = "yes" else isDefault = "no") and
   (if x.hasName() then hasName = "yes" else hasName = "no") and
-  (if x.hasTy() then hasTy = "yes" else hasTy = "no") and
+  (if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and
   if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no"
 select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
   "getNumberOfAttrs:", getNumberOfAttrs, "hasBody:", hasBody, "isConst:", isConst, "isDefault:",
-  isDefault, "hasName:", hasName, "hasTy:", hasTy, "hasVisibility:", hasVisibility
+  isDefault, "hasName:", hasName, "hasTypeRepr:", hasTypeRepr, "hasVisibility:", hasVisibility
diff --git a/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getAbi.expected b/rust/ql/test/extractor-tests/generated/Const/Const_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getAbi.expected
rename to rust/ql/test/extractor-tests/generated/Const/Const_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/Const/Const_getTy.ql b/rust/ql/test/extractor-tests/generated/Const/Const_getTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/Const/Const_getTy.ql
rename to rust/ql/test/extractor-tests/generated/Const/Const_getTypeRepr.ql
index d133dcb5d38..4185581df19 100644
--- a/rust/ql/test/extractor-tests/generated/Const/Const_getTy.ql
+++ b/rust/ql/test/extractor-tests/generated/Const/Const_getTypeRepr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from Const x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat_getBlockExpr.expected b/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat_getBlockExpr.expected
index 58a885a4857..42cdb5ef4c3 100644
--- a/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat_getBlockExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/ConstBlockPat/ConstBlockPat_getBlockExpr.expected
@@ -1 +1 @@
-| gen_const_block_pat.rs:6:9:6:27 | ConstBlockPat | gen_const_block_pat.rs:6:15:6:27 | BlockExpr |
+| gen_const_block_pat.rs:6:9:6:27 | ConstBlockPat | gen_const_block_pat.rs:6:15:6:27 | { ... } |
diff --git a/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam.ql b/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam.ql
index 5988a54b4d1..4f7fbab909e 100644
--- a/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam.ql
+++ b/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 from
   ConstParam x, int getNumberOfAttrs, string hasDefaultVal, string isConst, string hasName,
-  string hasTy
+  string hasTypeRepr
 where
   toBeTested(x) and
   not x.isUnknown() and
@@ -12,6 +12,6 @@ where
   (if x.hasDefaultVal() then hasDefaultVal = "yes" else hasDefaultVal = "no") and
   (if x.isConst() then isConst = "yes" else isConst = "no") and
   (if x.hasName() then hasName = "yes" else hasName = "no") and
-  if x.hasTy() then hasTy = "yes" else hasTy = "no"
+  if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no"
 select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasDefaultVal:", hasDefaultVal, "isConst:",
-  isConst, "hasName:", hasName, "hasTy:", hasTy
+  isConst, "hasName:", hasName, "hasTypeRepr:", hasTypeRepr
diff --git a/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getParamList.expected b/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getParamList.expected
rename to rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getTy.ql b/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getTy.ql
rename to rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getTypeRepr.ql
index 9f9aa53542b..d789f9eb144 100644
--- a/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getTy.ql
+++ b/rust/ql/test/extractor-tests/generated/ConstParam/ConstParam_getTypeRepr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from ConstParam x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr.expected b/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr.expected
index ab921873d62..a09556b9a3f 100644
--- a/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr.expected
@@ -1,2 +1,2 @@
-| gen_continue_expr.rs:7:13:7:20 | ContinueExpr | getNumberOfAttrs: | 0 | hasLifetime: | no |
-| gen_continue_expr.rs:12:13:12:27 | ContinueExpr | getNumberOfAttrs: | 0 | hasLifetime: | yes |
+| gen_continue_expr.rs:7:13:7:20 | continue | getNumberOfAttrs: | 0 | hasLifetime: | no |
+| gen_continue_expr.rs:12:13:12:27 | continue 'label | getNumberOfAttrs: | 0 | hasLifetime: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLifetime.expected b/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLifetime.expected
index 525d2bb55a8..d81d276ce0a 100644
--- a/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLifetime.expected
+++ b/rust/ql/test/extractor-tests/generated/ContinueExpr/ContinueExpr_getLifetime.expected
@@ -1 +1 @@
-| gen_continue_expr.rs:12:13:12:27 | ContinueExpr | gen_continue_expr.rs:12:22:12:27 | Lifetime |
+| gen_continue_expr.rs:12:13:12:27 | continue 'label | gen_continue_expr.rs:12:22:12:27 | ''label |
diff --git a/rust/ql/test/extractor-tests/generated/DynTraitType/gen_dyn_trait_type.rs b/rust/ql/test/extractor-tests/generated/DynTraitType/gen_dyn_trait_type.rs
deleted file mode 100644
index 511d9b782c0..00000000000
--- a/rust/ql/test/extractor-tests/generated/DynTraitType/gen_dyn_trait_type.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_dyn_trait_type() -> () {
-    // A DynTraitType. For example:
-    todo!()
-}
diff --git a/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getRetType.expected b/rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getRetType.expected
rename to rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/DynTraitType/DynTraitType.ql b/rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/DynTraitType/DynTraitType.ql
rename to rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.ql
index ad7a7e7101e..c67812dec36 100644
--- a/rust/ql/test/extractor-tests/generated/DynTraitType/DynTraitType.ql
+++ b/rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.ql
@@ -2,7 +2,7 @@
 import codeql.rust.elements
 import TestUtils
 
-from DynTraitType x, string hasTypeBoundList
+from DynTraitTypeRepr x, string hasTypeBoundList
 where
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/ForType/ForType.expected b/rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr_getTypeBoundList.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/ForType/ForType.expected
rename to rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr_getTypeBoundList.expected
diff --git a/rust/ql/test/extractor-tests/generated/DynTraitType/DynTraitType_getTypeBoundList.ql b/rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr_getTypeBoundList.ql
similarity index 86%
rename from rust/ql/test/extractor-tests/generated/DynTraitType/DynTraitType_getTypeBoundList.ql
rename to rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr_getTypeBoundList.ql
index bd63c4c6e3b..f9c215991a3 100644
--- a/rust/ql/test/extractor-tests/generated/DynTraitType/DynTraitType_getTypeBoundList.ql
+++ b/rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr_getTypeBoundList.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from DynTraitType x
+from DynTraitTypeRepr x
 where toBeTested(x) and not x.isUnknown()
 select x, x.getTypeBoundList()
diff --git a/rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/gen_dyn_trait_type_repr.rs b/rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/gen_dyn_trait_type_repr.rs
new file mode 100644
index 00000000000..24d4fec81e4
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/DynTraitTypeRepr/gen_dyn_trait_type_repr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_dyn_trait_type_repr() -> () {
+    // A DynTraitTypeRepr. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/ExprStmt/ExprStmt_getExpr.expected b/rust/ql/test/extractor-tests/generated/ExprStmt/ExprStmt_getExpr.expected
index f29a7f83d7d..1cacf1e8424 100644
--- a/rust/ql/test/extractor-tests/generated/ExprStmt/ExprStmt_getExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/ExprStmt/ExprStmt_getExpr.expected
@@ -1,2 +1,2 @@
-| gen_expr_stmt.rs:5:5:5:12 | ExprStmt | gen_expr_stmt.rs:5:5:5:11 | CallExpr |
-| gen_expr_stmt.rs:6:5:6:13 | ExprStmt | gen_expr_stmt.rs:6:5:6:12 | CallExpr |
+| gen_expr_stmt.rs:5:5:5:12 | ExprStmt | gen_expr_stmt.rs:5:5:5:11 | start(...) |
+| gen_expr_stmt.rs:6:5:6:13 | ExprStmt | gen_expr_stmt.rs:6:5:6:12 | finish(...) |
diff --git a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.expected b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.expected
index 22dcb3c92e1..c25a0633e40 100644
--- a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr.expected
@@ -1 +1 @@
-| gen_field_expr.rs:5:5:5:9 | FieldExpr | getNumberOfAttrs: | 0 | hasExpr: | yes | hasNameRef: | yes |
+| gen_field_expr.rs:5:5:5:9 | x.foo | getNumberOfAttrs: | 0 | hasExpr: | yes | hasNameRef: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getExpr.expected
index 32b13c1cb2b..7d21f7f7af8 100644
--- a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getExpr.expected
@@ -1 +1 @@
-| gen_field_expr.rs:5:5:5:9 | FieldExpr | gen_field_expr.rs:5:5:5:5 | x |
+| gen_field_expr.rs:5:5:5:9 | x.foo | gen_field_expr.rs:5:5:5:5 | x |
diff --git a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getNameRef.expected b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getNameRef.expected
index 667f3130968..0722ca1aaf2 100644
--- a/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getNameRef.expected
+++ b/rust/ql/test/extractor-tests/generated/FieldExpr/FieldExpr_getNameRef.expected
@@ -1 +1 @@
-| gen_field_expr.rs:5:5:5:9 | FieldExpr | gen_field_expr.rs:5:7:5:9 | foo |
+| gen_field_expr.rs:5:5:5:9 | x.foo | gen_field_expr.rs:5:7:5:9 | foo |
diff --git a/rust/ql/test/extractor-tests/generated/FnPtrType/gen_fn_ptr_type.rs b/rust/ql/test/extractor-tests/generated/FnPtrType/gen_fn_ptr_type.rs
deleted file mode 100644
index 6f58b0cc520..00000000000
--- a/rust/ql/test/extractor-tests/generated/FnPtrType/gen_fn_ptr_type.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_fn_ptr_type() -> () {
-    // A FnPtrType. For example:
-    todo!()
-}
diff --git a/rust/ql/test/extractor-tests/generated/ForType/ForType_getGenericParamList.expected b/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/ForType/ForType_getGenericParamList.expected
rename to rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType.ql b/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType.ql
rename to rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr.ql
index 83cf90dec0a..a3f3b81fcde 100644
--- a/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType.ql
+++ b/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr.ql
@@ -3,8 +3,8 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  FnPtrType x, string hasAbi, string isAsync, string isConst, string isUnsafe, string hasParamList,
-  string hasRetType
+  FnPtrTypeRepr x, string hasAbi, string isAsync, string isConst, string isUnsafe,
+  string hasParamList, string hasRetType
 where
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/ForType/ForType_getTy.expected b/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getAbi.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/ForType/ForType_getTy.expected
rename to rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getAbi.expected
diff --git a/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getAbi.ql b/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getAbi.ql
similarity index 87%
rename from rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getAbi.ql
rename to rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getAbi.ql
index cfe7f4ba6fc..738031ddf22 100644
--- a/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getAbi.ql
+++ b/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getAbi.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from FnPtrType x
+from FnPtrTypeRepr x
 where toBeTested(x) and not x.isUnknown()
 select x, x.getAbi()
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsArg/FormatArgsArg.expected b/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getParamList.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/FormatArgsArg/FormatArgsArg.expected
rename to rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getParamList.expected
diff --git a/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getParamList.ql b/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getParamList.ql
similarity index 87%
rename from rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getParamList.ql
rename to rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getParamList.ql
index 718885c3be0..bc5b5d935ca 100644
--- a/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getParamList.ql
+++ b/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getParamList.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from FnPtrType x
+from FnPtrTypeRepr x
 where toBeTested(x) and not x.isUnknown()
 select x, x.getParamList()
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsArg/FormatArgsArg_getExpr.expected b/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getRetType.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/FormatArgsArg/FormatArgsArg_getExpr.expected
rename to rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getRetType.expected
diff --git a/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getRetType.ql b/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getRetType.ql
similarity index 87%
rename from rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getRetType.ql
rename to rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getRetType.ql
index 39bece0dbeb..a0bd1df08d9 100644
--- a/rust/ql/test/extractor-tests/generated/FnPtrType/FnPtrType_getRetType.ql
+++ b/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr_getRetType.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from FnPtrType x
+from FnPtrTypeRepr x
 where toBeTested(x) and not x.isUnknown()
 select x, x.getRetType()
diff --git a/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/gen_fn_ptr_type_repr.rs b/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/gen_fn_ptr_type_repr.rs
new file mode 100644
index 00000000000..d8c07124d10
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FnPtrTypeRepr/gen_fn_ptr_type_repr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_fn_ptr_type_repr() -> () {
+    // A FnPtrTypeRepr. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr.ql b/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr.ql
index ef1999ff4a9..60f5ab1e080 100644
--- a/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/ForExpr/ForExpr.ql
@@ -3,15 +3,15 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  ForExpr x, int getNumberOfAttrs, string hasIterable, string hasLabel, string hasLoopBody,
+  ForExpr x, string hasLabel, string hasLoopBody, int getNumberOfAttrs, string hasIterable,
   string hasPat
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getNumberOfAttrs = x.getNumberOfAttrs() and
-  (if x.hasIterable() then hasIterable = "yes" else hasIterable = "no") and
   (if x.hasLabel() then hasLabel = "yes" else hasLabel = "no") and
   (if x.hasLoopBody() then hasLoopBody = "yes" else hasLoopBody = "no") and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasIterable() then hasIterable = "yes" else hasIterable = "no") and
   if x.hasPat() then hasPat = "yes" else hasPat = "no"
-select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasIterable:", hasIterable, "hasLabel:", hasLabel,
-  "hasLoopBody:", hasLoopBody, "hasPat:", hasPat
+select x, "hasLabel:", hasLabel, "hasLoopBody:", hasLoopBody, "getNumberOfAttrs:", getNumberOfAttrs,
+  "hasIterable:", hasIterable, "hasPat:", hasPat
diff --git a/rust/ql/test/extractor-tests/generated/ForType/ForType_getTy.ql b/rust/ql/test/extractor-tests/generated/ForType/ForType_getTy.ql
deleted file mode 100644
index 4ed564967a1..00000000000
--- a/rust/ql/test/extractor-tests/generated/ForType/ForType_getTy.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from ForType x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
diff --git a/rust/ql/test/extractor-tests/generated/ForType/gen_for_type.rs b/rust/ql/test/extractor-tests/generated/ForType/gen_for_type.rs
deleted file mode 100644
index f44e4411a04..00000000000
--- a/rust/ql/test/extractor-tests/generated/ForType/gen_for_type.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_for_type() -> () {
-    // A ForType. For example:
-    todo!()
-}
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsArg/FormatArgsArg_getName.expected b/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/FormatArgsArg/FormatArgsArg_getName.expected
rename to rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/ForType/ForType.ql b/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.ql
similarity index 51%
rename from rust/ql/test/extractor-tests/generated/ForType/ForType.ql
rename to rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.ql
index fd98b365bfc..5cb8aeecde1 100644
--- a/rust/ql/test/extractor-tests/generated/ForType/ForType.ql
+++ b/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.ql
@@ -2,10 +2,10 @@
 import codeql.rust.elements
 import TestUtils
 
-from ForType x, string hasGenericParamList, string hasTy
+from ForTypeRepr x, string hasGenericParamList, string hasTypeRepr
 where
   toBeTested(x) and
   not x.isUnknown() and
   (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and
-  if x.hasTy() then hasTy = "yes" else hasTy = "no"
-select x, "hasGenericParamList:", hasGenericParamList, "hasTy:", hasTy
+  if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no"
+select x, "hasGenericParamList:", hasGenericParamList, "hasTypeRepr:", hasTypeRepr
diff --git a/rust/ql/test/extractor-tests/generated/ImplTraitType/ImplTraitType.expected b/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr_getGenericParamList.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/ImplTraitType/ImplTraitType.expected
rename to rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr_getGenericParamList.expected
diff --git a/rust/ql/test/extractor-tests/generated/ForType/ForType_getGenericParamList.ql b/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr_getGenericParamList.ql
similarity index 89%
rename from rust/ql/test/extractor-tests/generated/ForType/ForType_getGenericParamList.ql
rename to rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr_getGenericParamList.ql
index 7a2c53aba83..3ee936fca2a 100644
--- a/rust/ql/test/extractor-tests/generated/ForType/ForType_getGenericParamList.ql
+++ b/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr_getGenericParamList.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from ForType x
+from ForTypeRepr x
 where toBeTested(x) and not x.isUnknown()
 select x, x.getGenericParamList()
diff --git a/rust/ql/test/extractor-tests/generated/ImplTraitType/ImplTraitType_getTypeBoundList.expected b/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/ImplTraitType/ImplTraitType_getTypeBoundList.expected
rename to rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr_getTypeRepr.ql b/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr_getTypeRepr.ql
new file mode 100644
index 00000000000..677f61b023d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr_getTypeRepr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ForTypeRepr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/ForTypeRepr/gen_for_type_repr.rs b/rust/ql/test/extractor-tests/generated/ForTypeRepr/gen_for_type_repr.rs
new file mode 100644
index 00000000000..5e1c39e49c3
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ForTypeRepr/gen_for_type_repr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_for_type_repr() -> () {
+    // A ForTypeRepr. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/Format.expected b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/Format.expected
new file mode 100644
index 00000000000..312f5a3b071
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/Format.expected
@@ -0,0 +1,9 @@
+| gen_format.rs:5:21:5:22 | {} | getParent: | gen_format.rs:5:14:5:32 | FormatArgsExpr | getIndex: | 1 | hasArgument: | no |
+| gen_format_args_expr.rs:6:19:6:20 | {} | getParent: | gen_format_args_expr.rs:6:17:6:37 | FormatArgsExpr | getIndex: | 1 | hasArgument: | no |
+| gen_format_args_expr.rs:6:26:6:29 | {:?} | getParent: | gen_format_args_expr.rs:6:17:6:37 | FormatArgsExpr | getIndex: | 3 | hasArgument: | no |
+| gen_format_args_expr.rs:7:19:7:21 | {b} | getParent: | gen_format_args_expr.rs:7:17:7:43 | FormatArgsExpr | getIndex: | 1 | hasArgument: | yes |
+| gen_format_args_expr.rs:7:27:7:31 | {a:?} | getParent: | gen_format_args_expr.rs:7:17:7:43 | FormatArgsExpr | getIndex: | 3 | hasArgument: | yes |
+| gen_format_args_expr.rs:9:19:9:21 | {x} | getParent: | gen_format_args_expr.rs:9:17:9:28 | FormatArgsExpr | getIndex: | 1 | hasArgument: | yes |
+| gen_format_args_expr.rs:9:24:9:26 | {y} | getParent: | gen_format_args_expr.rs:9:17:9:28 | FormatArgsExpr | getIndex: | 3 | hasArgument: | yes |
+| gen_format_argument.rs:5:21:5:46 | {value:#width$.precision$} | getParent: | gen_format_argument.rs:5:14:5:47 | FormatArgsExpr | getIndex: | 1 | hasArgument: | yes |
+| gen_format_argument.rs:7:21:7:30 | {0:#1$.2$} | getParent: | gen_format_argument.rs:7:14:7:56 | FormatArgsExpr | getIndex: | 1 | hasArgument: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/Format.ql b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/Format.ql
new file mode 100644
index 00000000000..fa17b4294f7
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/Format.ql
@@ -0,0 +1,12 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Format x, FormatArgsExpr getParent, int getIndex, string hasArgument
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getParent = x.getParent() and
+  getIndex = x.getIndex() and
+  if x.hasArgument() then hasArgument = "yes" else hasArgument = "no"
+select x, "getParent:", getParent, "getIndex:", getIndex, "hasArgument:", hasArgument
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg.expected b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg.expected
new file mode 100644
index 00000000000..8e704471e02
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg.expected
@@ -0,0 +1,8 @@
+| gen_format.rs:5:26:5:32 | FormatArgsArg | hasExpr: | yes | hasName: | no |
+| gen_format_args_expr.rs:6:33:6:33 | FormatArgsArg | hasExpr: | yes | hasName: | no |
+| gen_format_args_expr.rs:6:36:6:36 | FormatArgsArg | hasExpr: | yes | hasName: | no |
+| gen_format_args_expr.rs:7:35:7:37 | FormatArgsArg | hasExpr: | yes | hasName: | yes |
+| gen_format_args_expr.rs:7:40:7:42 | FormatArgsArg | hasExpr: | yes | hasName: | yes |
+| gen_format_argument.rs:7:34:7:38 | FormatArgsArg | hasExpr: | yes | hasName: | no |
+| gen_format_argument.rs:7:41:7:45 | FormatArgsArg | hasExpr: | yes | hasName: | no |
+| gen_format_argument.rs:7:48:7:56 | FormatArgsArg | hasExpr: | yes | hasName: | no |
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsArg/FormatArgsArg.ql b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg.ql
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/FormatArgsArg/FormatArgsArg.ql
rename to rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg.ql
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg_getExpr.expected b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg_getExpr.expected
new file mode 100644
index 00000000000..90cf2cae221
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg_getExpr.expected
@@ -0,0 +1,8 @@
+| gen_format.rs:5:26:5:32 | FormatArgsArg | gen_format.rs:5:26:5:32 | "world" |
+| gen_format_args_expr.rs:6:33:6:33 | FormatArgsArg | gen_format_args_expr.rs:6:33:6:33 | 1 |
+| gen_format_args_expr.rs:6:36:6:36 | FormatArgsArg | gen_format_args_expr.rs:6:36:6:36 | 2 |
+| gen_format_args_expr.rs:7:35:7:37 | FormatArgsArg | gen_format_args_expr.rs:7:37:7:37 | 1 |
+| gen_format_args_expr.rs:7:40:7:42 | FormatArgsArg | gen_format_args_expr.rs:7:42:7:42 | 2 |
+| gen_format_argument.rs:7:34:7:38 | FormatArgsArg | gen_format_argument.rs:7:34:7:38 | value |
+| gen_format_argument.rs:7:41:7:45 | FormatArgsArg | gen_format_argument.rs:7:41:7:45 | width |
+| gen_format_argument.rs:7:48:7:56 | FormatArgsArg | gen_format_argument.rs:7:48:7:56 | precision |
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsArg/FormatArgsArg_getExpr.ql b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg_getExpr.ql
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/FormatArgsArg/FormatArgsArg_getExpr.ql
rename to rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg_getExpr.ql
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg_getName.expected b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg_getName.expected
new file mode 100644
index 00000000000..ad5d7ab4ab2
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg_getName.expected
@@ -0,0 +1,2 @@
+| gen_format_args_expr.rs:7:35:7:37 | FormatArgsArg | gen_format_args_expr.rs:7:35:7:35 | a |
+| gen_format_args_expr.rs:7:40:7:42 | FormatArgsArg | gen_format_args_expr.rs:7:40:7:40 | b |
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsArg/FormatArgsArg_getName.ql b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg_getName.ql
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/FormatArgsArg/FormatArgsArg_getName.ql
rename to rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg_getName.ql
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.expected b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.expected
index e69de29bb2d..bed19ed26d4 100644
--- a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.expected
@@ -0,0 +1,7 @@
+| gen_format.rs:5:14:5:32 | FormatArgsExpr | getNumberOfArgs: | 1 | getNumberOfAttrs: | 0 | hasTemplate: | yes | getNumberOfFormats: | 1 |
+| gen_format_args_expr.rs:5:17:5:27 | FormatArgsExpr | getNumberOfArgs: | 0 | getNumberOfAttrs: | 0 | hasTemplate: | yes | getNumberOfFormats: | 0 |
+| gen_format_args_expr.rs:6:17:6:37 | FormatArgsExpr | getNumberOfArgs: | 2 | getNumberOfAttrs: | 0 | hasTemplate: | yes | getNumberOfFormats: | 2 |
+| gen_format_args_expr.rs:7:17:7:43 | FormatArgsExpr | getNumberOfArgs: | 2 | getNumberOfAttrs: | 0 | hasTemplate: | yes | getNumberOfFormats: | 2 |
+| gen_format_args_expr.rs:9:17:9:28 | FormatArgsExpr | getNumberOfArgs: | 0 | getNumberOfAttrs: | 0 | hasTemplate: | yes | getNumberOfFormats: | 2 |
+| gen_format_argument.rs:5:14:5:47 | FormatArgsExpr | getNumberOfArgs: | 0 | getNumberOfAttrs: | 0 | hasTemplate: | yes | getNumberOfFormats: | 1 |
+| gen_format_argument.rs:7:14:7:56 | FormatArgsExpr | getNumberOfArgs: | 3 | getNumberOfAttrs: | 0 | hasTemplate: | yes | getNumberOfFormats: | 1 |
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.ql b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.ql
index 4d5bcf05173..6a43bc1ea0a 100644
--- a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.ql
@@ -2,12 +2,15 @@
 import codeql.rust.elements
 import TestUtils
 
-from FormatArgsExpr x, int getNumberOfArgs, int getNumberOfAttrs, string hasTemplate
+from
+  FormatArgsExpr x, int getNumberOfArgs, int getNumberOfAttrs, string hasTemplate,
+  int getNumberOfFormats
 where
   toBeTested(x) and
   not x.isUnknown() and
   getNumberOfArgs = x.getNumberOfArgs() and
   getNumberOfAttrs = x.getNumberOfAttrs() and
-  if x.hasTemplate() then hasTemplate = "yes" else hasTemplate = "no"
+  (if x.hasTemplate() then hasTemplate = "yes" else hasTemplate = "no") and
+  getNumberOfFormats = x.getNumberOfFormats()
 select x, "getNumberOfArgs:", getNumberOfArgs, "getNumberOfAttrs:", getNumberOfAttrs,
-  "hasTemplate:", hasTemplate
+  "hasTemplate:", hasTemplate, "getNumberOfFormats:", getNumberOfFormats
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getArg.expected b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getArg.expected
index e69de29bb2d..89fce13908f 100644
--- a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getArg.expected
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getArg.expected
@@ -0,0 +1,8 @@
+| gen_format.rs:5:14:5:32 | FormatArgsExpr | 0 | gen_format.rs:5:26:5:32 | FormatArgsArg |
+| gen_format_args_expr.rs:6:17:6:37 | FormatArgsExpr | 0 | gen_format_args_expr.rs:6:33:6:33 | FormatArgsArg |
+| gen_format_args_expr.rs:6:17:6:37 | FormatArgsExpr | 1 | gen_format_args_expr.rs:6:36:6:36 | FormatArgsArg |
+| gen_format_args_expr.rs:7:17:7:43 | FormatArgsExpr | 0 | gen_format_args_expr.rs:7:35:7:37 | FormatArgsArg |
+| gen_format_args_expr.rs:7:17:7:43 | FormatArgsExpr | 1 | gen_format_args_expr.rs:7:40:7:42 | FormatArgsArg |
+| gen_format_argument.rs:7:14:7:56 | FormatArgsExpr | 0 | gen_format_argument.rs:7:34:7:38 | FormatArgsArg |
+| gen_format_argument.rs:7:14:7:56 | FormatArgsExpr | 1 | gen_format_argument.rs:7:41:7:45 | FormatArgsArg |
+| gen_format_argument.rs:7:14:7:56 | FormatArgsExpr | 2 | gen_format_argument.rs:7:48:7:56 | FormatArgsArg |
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getFormat.expected b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getFormat.expected
new file mode 100644
index 00000000000..f0061b8dba4
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getFormat.expected
@@ -0,0 +1,9 @@
+| gen_format.rs:5:14:5:32 | FormatArgsExpr | 0 | gen_format.rs:5:21:5:22 | {} |
+| gen_format_args_expr.rs:6:17:6:37 | FormatArgsExpr | 0 | gen_format_args_expr.rs:6:19:6:20 | {} |
+| gen_format_args_expr.rs:6:17:6:37 | FormatArgsExpr | 1 | gen_format_args_expr.rs:6:26:6:29 | {:?} |
+| gen_format_args_expr.rs:7:17:7:43 | FormatArgsExpr | 0 | gen_format_args_expr.rs:7:19:7:21 | {b} |
+| gen_format_args_expr.rs:7:17:7:43 | FormatArgsExpr | 1 | gen_format_args_expr.rs:7:27:7:31 | {a:?} |
+| gen_format_args_expr.rs:9:17:9:28 | FormatArgsExpr | 0 | gen_format_args_expr.rs:9:19:9:21 | {x} |
+| gen_format_args_expr.rs:9:17:9:28 | FormatArgsExpr | 1 | gen_format_args_expr.rs:9:24:9:26 | {y} |
+| gen_format_argument.rs:5:14:5:47 | FormatArgsExpr | 0 | gen_format_argument.rs:5:21:5:46 | {value:#width$.precision$} |
+| gen_format_argument.rs:7:14:7:56 | FormatArgsExpr | 0 | gen_format_argument.rs:7:21:7:30 | {0:#1$.2$} |
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getFormat.ql b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getFormat.ql
new file mode 100644
index 00000000000..ca61ca2bebd
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getFormat.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from FormatArgsExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getFormat(index)
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getTemplate.expected b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getTemplate.expected
index e69de29bb2d..1b201bbf36f 100644
--- a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getTemplate.expected
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getTemplate.expected
@@ -0,0 +1,7 @@
+| gen_format.rs:5:14:5:32 | FormatArgsExpr | gen_format.rs:5:14:5:23 | "Hello {}\\n" |
+| gen_format_args_expr.rs:5:17:5:27 | FormatArgsExpr | gen_format_args_expr.rs:5:18:5:26 | "no args" |
+| gen_format_args_expr.rs:6:17:6:37 | FormatArgsExpr | gen_format_args_expr.rs:6:18:6:30 | "{} foo {:?}" |
+| gen_format_args_expr.rs:7:17:7:43 | FormatArgsExpr | gen_format_args_expr.rs:7:18:7:32 | "{b} foo {a:?}" |
+| gen_format_args_expr.rs:9:17:9:28 | FormatArgsExpr | gen_format_args_expr.rs:9:18:9:27 | "{x}, {y}" |
+| gen_format_argument.rs:5:14:5:47 | FormatArgsExpr | gen_format_argument.rs:5:14:5:47 | "Value {value:#width$.precisio... |
+| gen_format_argument.rs:7:14:7:56 | FormatArgsExpr | gen_format_argument.rs:7:14:7:31 | "Value {0:#1$.2$}\\n" |
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getVariable.expected b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getVariable.expected
new file mode 100644
index 00000000000..dca240710f7
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getVariable.expected
@@ -0,0 +1,5 @@
+| gen_format_args_expr.rs:9:17:9:28 | FormatArgsExpr | 1 | gen_format_args_expr.rs:9:20:9:20 | x |
+| gen_format_args_expr.rs:9:17:9:28 | FormatArgsExpr | 3 | gen_format_args_expr.rs:9:25:9:25 | y |
+| gen_format_argument.rs:5:14:5:47 | FormatArgsExpr | 1 | gen_format_argument.rs:5:22:5:26 | value |
+| gen_format_argument.rs:5:14:5:47 | FormatArgsExpr | 1 | gen_format_argument.rs:5:29:5:33 | width |
+| gen_format_argument.rs:5:14:5:47 | FormatArgsExpr | 1 | gen_format_argument.rs:5:36:5:44 | precision |
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgument.expected b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgument.expected
new file mode 100644
index 00000000000..e63b4b6558f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgument.expected
@@ -0,0 +1,10 @@
+| gen_format_args_expr.rs:7:20:7:20 | b | getParent: | gen_format_args_expr.rs:7:19:7:21 | {b} | hasVariable: | no |
+| gen_format_args_expr.rs:7:28:7:28 | a | getParent: | gen_format_args_expr.rs:7:27:7:31 | {a:?} | hasVariable: | no |
+| gen_format_args_expr.rs:9:20:9:20 | x | getParent: | gen_format_args_expr.rs:9:19:9:21 | {x} | hasVariable: | yes |
+| gen_format_args_expr.rs:9:25:9:25 | y | getParent: | gen_format_args_expr.rs:9:24:9:26 | {y} | hasVariable: | yes |
+| gen_format_argument.rs:5:22:5:26 | value | getParent: | gen_format_argument.rs:5:21:5:46 | {value:#width$.precision$} | hasVariable: | yes |
+| gen_format_argument.rs:5:29:5:33 | width | getParent: | gen_format_argument.rs:5:21:5:46 | {value:#width$.precision$} | hasVariable: | yes |
+| gen_format_argument.rs:5:36:5:44 | precision | getParent: | gen_format_argument.rs:5:21:5:46 | {value:#width$.precision$} | hasVariable: | yes |
+| gen_format_argument.rs:7:22:7:22 | 0 | getParent: | gen_format_argument.rs:7:21:7:30 | {0:#1$.2$} | hasVariable: | no |
+| gen_format_argument.rs:7:25:7:25 | 1 | getParent: | gen_format_argument.rs:7:21:7:30 | {0:#1$.2$} | hasVariable: | no |
+| gen_format_argument.rs:7:28:7:28 | 2 | getParent: | gen_format_argument.rs:7:21:7:30 | {0:#1$.2$} | hasVariable: | no |
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgument.ql b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgument.ql
new file mode 100644
index 00000000000..ed57154f7e8
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgument.ql
@@ -0,0 +1,11 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from FormatArgument x, Format getParent, string hasVariable
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  getParent = x.getParent() and
+  if x.hasVariable() then hasVariable = "yes" else hasVariable = "no"
+select x, "getParent:", getParent, "hasVariable:", hasVariable
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgument_getVariable.expected b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgument_getVariable.expected
new file mode 100644
index 00000000000..11db93ec06d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgument_getVariable.expected
@@ -0,0 +1,5 @@
+| gen_format_args_expr.rs:9:20:9:20 | x | gen_format_args_expr.rs:9:20:9:20 | x |
+| gen_format_args_expr.rs:9:25:9:25 | y | gen_format_args_expr.rs:9:25:9:25 | y |
+| gen_format_argument.rs:5:22:5:26 | value | gen_format_argument.rs:5:22:5:26 | value |
+| gen_format_argument.rs:5:29:5:33 | width | gen_format_argument.rs:5:29:5:33 | width |
+| gen_format_argument.rs:5:36:5:44 | precision | gen_format_argument.rs:5:36:5:44 | precision |
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgument_getVariable.ql b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgument_getVariable.ql
new file mode 100644
index 00000000000..5d303bc4b6c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgument_getVariable.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from FormatArgument x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getVariable()
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatTemplateVariableAccess.expected b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatTemplateVariableAccess.expected
new file mode 100644
index 00000000000..df4fdad5c91
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatTemplateVariableAccess.expected
@@ -0,0 +1,5 @@
+| gen_format_args_expr.rs:9:20:9:20 | x |
+| gen_format_args_expr.rs:9:25:9:25 | y |
+| gen_format_argument.rs:5:22:5:26 | value |
+| gen_format_argument.rs:5:29:5:33 | width |
+| gen_format_argument.rs:5:36:5:44 | precision |
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatTemplateVariableAccess.ql b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatTemplateVariableAccess.ql
new file mode 100644
index 00000000000..4f43ca11870
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatTemplateVariableAccess.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from FormatTemplateVariableAccess x
+where toBeTested(x) and not x.isUnknown()
+select x
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/Format_getArgument.expected b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/Format_getArgument.expected
new file mode 100644
index 00000000000..af9dd77578c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/Format_getArgument.expected
@@ -0,0 +1,10 @@
+| gen_format_args_expr.rs:7:19:7:21 | {b} | gen_format_args_expr.rs:7:20:7:20 | b |
+| gen_format_args_expr.rs:7:27:7:31 | {a:?} | gen_format_args_expr.rs:7:28:7:28 | a |
+| gen_format_args_expr.rs:9:19:9:21 | {x} | gen_format_args_expr.rs:9:20:9:20 | x |
+| gen_format_args_expr.rs:9:24:9:26 | {y} | gen_format_args_expr.rs:9:25:9:25 | y |
+| gen_format_argument.rs:5:21:5:46 | {value:#width$.precision$} | gen_format_argument.rs:5:22:5:26 | value |
+| gen_format_argument.rs:5:21:5:46 | {value:#width$.precision$} | gen_format_argument.rs:5:29:5:33 | width |
+| gen_format_argument.rs:5:21:5:46 | {value:#width$.precision$} | gen_format_argument.rs:5:36:5:44 | precision |
+| gen_format_argument.rs:7:21:7:30 | {0:#1$.2$} | gen_format_argument.rs:7:22:7:22 | 0 |
+| gen_format_argument.rs:7:21:7:30 | {0:#1$.2$} | gen_format_argument.rs:7:25:7:25 | 1 |
+| gen_format_argument.rs:7:21:7:30 | {0:#1$.2$} | gen_format_argument.rs:7:28:7:28 | 2 |
diff --git a/rust/ql/test/extractor-tests/generated/ArrayType/ArrayType_getTy.ql b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/Format_getArgument.ql
similarity index 75%
rename from rust/ql/test/extractor-tests/generated/ArrayType/ArrayType_getTy.ql
rename to rust/ql/test/extractor-tests/generated/FormatArgsExpr/Format_getArgument.ql
index d274baf857f..e131365770b 100644
--- a/rust/ql/test/extractor-tests/generated/ArrayType/ArrayType_getTy.ql
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/Format_getArgument.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from ArrayType x
+from Format x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
+select x, x.getArgument()
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/gen_format.rs b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/gen_format.rs
new file mode 100644
index 00000000000..86b78256d40
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/gen_format.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_format() -> () {
+    // A format element in a formatting template. For example the `{}` in:
+    println!("Hello {}", "world");
+}
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsArg/gen_format_args_arg.rs b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/gen_format_args_arg.rs
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/FormatArgsArg/gen_format_args_arg.rs
rename to rust/ql/test/extractor-tests/generated/FormatArgsExpr/gen_format_args_arg.rs
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/gen_format_args_expr.rs b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/gen_format_args_expr.rs
index 7345a633ba5..3c2acb387fc 100644
--- a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/gen_format_args_expr.rs
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/gen_format_args_expr.rs
@@ -2,5 +2,9 @@
 
 fn test_format_args_expr() -> () {
     // A FormatArgsExpr. For example:
-    todo!()
+    format_args!("no args");
+    format_args!("{} foo {:?}", 1, 2);
+    format_args!("{b} foo {a:?}", a=1, b=2);
+    let (x, y) = (1, 42);
+    format_args!("{x}, {y}");
 }
diff --git a/rust/ql/test/extractor-tests/generated/FormatArgsExpr/gen_format_argument.rs b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/gen_format_argument.rs
new file mode 100644
index 00000000000..32cb123f51d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/FormatArgsExpr/gen_format_argument.rs
@@ -0,0 +1,8 @@
+// generated by codegen, do not edit
+
+fn test_format_argument() -> () {
+    // An argument in a format element in a formatting template. For example the `width`, `precision`, and `value` in:
+    println!("Value {value:#width$.precision$}");
+    // or the `0`, `1` and `2` in:
+    println!("Value {0:#1$.2$}", value, width, precision);
+}
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function.expected b/rust/ql/test/extractor-tests/generated/Function/Function.expected
index f93eb58b2ae..b96996beef9 100644
--- a/rust/ql/test/extractor-tests/generated/Function/Function.expected
+++ b/rust/ql/test/extractor-tests/generated/Function/Function.expected
@@ -1,2 +1,2 @@
-| gen_function.rs:3:1:4:38 | foo | hasParamList: | yes | getNumberOfAttrs: | 0 | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasAbi: | no | hasBody: | yes | hasGenericParamList: | no | isAsync: | no | isConst: | no | isDefault: | no | isGen: | no | isUnsafe: | no | hasName: | yes | hasRetType: | yes | hasVisibility: | no | hasWhereClause: | no |
-| gen_function.rs:7:5:7:13 | bar | hasParamList: | yes | getNumberOfAttrs: | 0 | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasAbi: | no | hasBody: | no | hasGenericParamList: | no | isAsync: | no | isConst: | no | isDefault: | no | isGen: | no | isUnsafe: | no | hasName: | yes | hasRetType: | no | hasVisibility: | no | hasWhereClause: | no |
+| gen_function.rs:3:1:4:38 | fn foo | hasParamList: | yes | getNumberOfAttrs: | 0 | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasAbi: | no | hasBody: | yes | hasGenericParamList: | no | isAsync: | no | isConst: | no | isDefault: | no | isGen: | no | isUnsafe: | no | hasName: | yes | hasRetType: | yes | hasVisibility: | no | hasWhereClause: | no |
+| gen_function.rs:7:5:7:13 | fn bar | hasParamList: | yes | getNumberOfAttrs: | 0 | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasAbi: | no | hasBody: | no | hasGenericParamList: | no | isAsync: | no | isConst: | no | isDefault: | no | isGen: | no | isUnsafe: | no | hasName: | yes | hasRetType: | no | hasVisibility: | no | hasWhereClause: | no |
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function_getBody.expected b/rust/ql/test/extractor-tests/generated/Function/Function_getBody.expected
index 996e8c1a27c..894900b3eaa 100644
--- a/rust/ql/test/extractor-tests/generated/Function/Function_getBody.expected
+++ b/rust/ql/test/extractor-tests/generated/Function/Function_getBody.expected
@@ -1 +1 @@
-| gen_function.rs:3:1:4:38 | foo | gen_function.rs:4:23:4:38 | BlockExpr |
+| gen_function.rs:3:1:4:38 | fn foo | gen_function.rs:4:23:4:38 | { ... } |
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function_getCrateOrigin.expected b/rust/ql/test/extractor-tests/generated/Function/Function_getCrateOrigin.expected
index 7c376ffaf1e..eabc941bd5b 100644
--- a/rust/ql/test/extractor-tests/generated/Function/Function_getCrateOrigin.expected
+++ b/rust/ql/test/extractor-tests/generated/Function/Function_getCrateOrigin.expected
@@ -1,2 +1,2 @@
-| gen_function.rs:3:1:4:38 | foo | repo::test |
-| gen_function.rs:7:5:7:13 | bar | repo::test |
+| gen_function.rs:3:1:4:38 | fn foo | repo::test |
+| gen_function.rs:7:5:7:13 | fn bar | repo::test |
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function_getExtendedCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/Function/Function_getExtendedCanonicalPath.expected
index d9b6255918f..2c0059ebc2a 100644
--- a/rust/ql/test/extractor-tests/generated/Function/Function_getExtendedCanonicalPath.expected
+++ b/rust/ql/test/extractor-tests/generated/Function/Function_getExtendedCanonicalPath.expected
@@ -1,2 +1,2 @@
-| gen_function.rs:3:1:4:38 | foo | crate::gen_function::foo |
-| gen_function.rs:7:5:7:13 | bar | crate::gen_function::Trait::bar |
+| gen_function.rs:3:1:4:38 | fn foo | crate::gen_function::foo |
+| gen_function.rs:7:5:7:13 | fn bar | crate::gen_function::Trait::bar |
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function_getName.expected b/rust/ql/test/extractor-tests/generated/Function/Function_getName.expected
index 62676019818..7e889e82d28 100644
--- a/rust/ql/test/extractor-tests/generated/Function/Function_getName.expected
+++ b/rust/ql/test/extractor-tests/generated/Function/Function_getName.expected
@@ -1,2 +1,2 @@
-| gen_function.rs:3:1:4:38 | foo | gen_function.rs:4:4:4:6 | foo |
-| gen_function.rs:7:5:7:13 | bar | gen_function.rs:7:8:7:10 | bar |
+| gen_function.rs:3:1:4:38 | fn foo | gen_function.rs:4:4:4:6 | foo |
+| gen_function.rs:7:5:7:13 | fn bar | gen_function.rs:7:8:7:10 | bar |
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function_getParamList.expected b/rust/ql/test/extractor-tests/generated/Function/Function_getParamList.expected
index baa2734e86a..df581061919 100644
--- a/rust/ql/test/extractor-tests/generated/Function/Function_getParamList.expected
+++ b/rust/ql/test/extractor-tests/generated/Function/Function_getParamList.expected
@@ -1,2 +1,2 @@
-| gen_function.rs:3:1:4:38 | foo | gen_function.rs:4:7:4:14 | ParamList |
-| gen_function.rs:7:5:7:13 | bar | gen_function.rs:7:11:7:12 | ParamList |
+| gen_function.rs:3:1:4:38 | fn foo | gen_function.rs:4:7:4:14 | ParamList |
+| gen_function.rs:7:5:7:13 | fn bar | gen_function.rs:7:11:7:12 | ParamList |
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function_getRetType.expected b/rust/ql/test/extractor-tests/generated/Function/Function_getRetType.expected
index 7a533870560..f9778c63c7e 100644
--- a/rust/ql/test/extractor-tests/generated/Function/Function_getRetType.expected
+++ b/rust/ql/test/extractor-tests/generated/Function/Function_getRetType.expected
@@ -1 +1 @@
-| gen_function.rs:3:1:4:38 | foo | gen_function.rs:4:16:4:21 | RetType |
+| gen_function.rs:3:1:4:38 | fn foo | gen_function.rs:4:16:4:21 | RetTypeRepr |
diff --git a/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList.expected b/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList.expected
index 370ee8ce4d6..d2a5b7bcd8f 100644
--- a/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList.expected
+++ b/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList.expected
@@ -1 +1 @@
-| gen_generic_arg_list.rs:5:10:5:21 | GenericArgList | getNumberOfGenericArgs: | 2 |
+| gen_generic_arg_list.rs:5:10:5:21 | <...> | getNumberOfGenericArgs: | 2 |
diff --git a/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList_getGenericArg.expected b/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList_getGenericArg.expected
index b72d3035ed1..69e416a57ad 100644
--- a/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList_getGenericArg.expected
+++ b/rust/ql/test/extractor-tests/generated/GenericArgList/GenericArgList_getGenericArg.expected
@@ -1,2 +1,2 @@
-| gen_generic_arg_list.rs:5:10:5:21 | GenericArgList | 0 | gen_generic_arg_list.rs:5:13:5:15 | TypeArg |
-| gen_generic_arg_list.rs:5:10:5:21 | GenericArgList | 1 | gen_generic_arg_list.rs:5:18:5:20 | TypeArg |
+| gen_generic_arg_list.rs:5:10:5:21 | <...> | 0 | gen_generic_arg_list.rs:5:13:5:15 | TypeArg |
+| gen_generic_arg_list.rs:5:10:5:21 | <...> | 1 | gen_generic_arg_list.rs:5:18:5:20 | TypeArg |
diff --git a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getPat.expected b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getPat.expected
index 2e2f0d9228e..3c2fd2dc379 100644
--- a/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getPat.expected
+++ b/rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getPat.expected
@@ -1 +1 @@
-| gen_ident_pat.rs:10:9:10:25 | y | gen_ident_pat.rs:10:11:10:25 | TupleStructPat |
+| gen_ident_pat.rs:10:9:10:25 | y | gen_ident_pat.rs:10:11:10:25 | ...::Some(...) |
diff --git a/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr.expected b/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr.expected
index a0e0ea15594..d9a33ad74f7 100644
--- a/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr.expected
@@ -1,2 +1,2 @@
-| gen_if_expr.rs:5:5:7:5 | IfExpr | getNumberOfAttrs: | 0 | hasCondition: | yes | hasElse: | no | hasThen: | yes |
-| gen_if_expr.rs:8:13:12:5 | IfExpr | getNumberOfAttrs: | 0 | hasCondition: | yes | hasElse: | yes | hasThen: | yes |
+| gen_if_expr.rs:5:5:7:5 | if ... {...} | getNumberOfAttrs: | 0 | hasCondition: | yes | hasElse: | no | hasThen: | yes |
+| gen_if_expr.rs:8:13:12:5 | if ... {...} else {...} | getNumberOfAttrs: | 0 | hasCondition: | yes | hasElse: | yes | hasThen: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr_getCondition.expected b/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr_getCondition.expected
index 7bdb262dd32..4990a47bc96 100644
--- a/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr_getCondition.expected
+++ b/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr_getCondition.expected
@@ -1,2 +1,2 @@
-| gen_if_expr.rs:5:5:7:5 | IfExpr | gen_if_expr.rs:5:8:5:14 | ... == ... |
-| gen_if_expr.rs:8:13:12:5 | IfExpr | gen_if_expr.rs:8:16:8:20 | ... > ... |
+| gen_if_expr.rs:5:5:7:5 | if ... {...} | gen_if_expr.rs:5:8:5:14 | ... == ... |
+| gen_if_expr.rs:8:13:12:5 | if ... {...} else {...} | gen_if_expr.rs:8:16:8:20 | ... > ... |
diff --git a/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr_getElse.expected b/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr_getElse.expected
index a857dbe2099..a03626f5e5d 100644
--- a/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr_getElse.expected
+++ b/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr_getElse.expected
@@ -1 +1 @@
-| gen_if_expr.rs:8:13:12:5 | IfExpr | gen_if_expr.rs:10:12:12:5 | BlockExpr |
+| gen_if_expr.rs:8:13:12:5 | if ... {...} else {...} | gen_if_expr.rs:10:12:12:5 | { ... } |
diff --git a/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr_getThen.expected b/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr_getThen.expected
index 0916c3f3391..6080b004f38 100644
--- a/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr_getThen.expected
+++ b/rust/ql/test/extractor-tests/generated/IfExpr/IfExpr_getThen.expected
@@ -1,2 +1,2 @@
-| gen_if_expr.rs:5:5:7:5 | IfExpr | gen_if_expr.rs:5:16:7:5 | BlockExpr |
-| gen_if_expr.rs:8:13:12:5 | IfExpr | gen_if_expr.rs:8:22:10:5 | BlockExpr |
+| gen_if_expr.rs:5:5:7:5 | if ... {...} | gen_if_expr.rs:5:16:7:5 | { ... } |
+| gen_if_expr.rs:8:13:12:5 | if ... {...} else {...} | gen_if_expr.rs:8:22:10:5 | { ... } |
diff --git a/rust/ql/test/extractor-tests/generated/ImplTraitType/gen_impl_trait_type.rs b/rust/ql/test/extractor-tests/generated/ImplTraitType/gen_impl_trait_type.rs
deleted file mode 100644
index 3f50d59edbd..00000000000
--- a/rust/ql/test/extractor-tests/generated/ImplTraitType/gen_impl_trait_type.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_impl_trait_type() -> () {
-    // A ImplTraitType. For example:
-    todo!()
-}
diff --git a/rust/ql/test/extractor-tests/generated/InferType/InferType.expected b/rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/InferType/InferType.expected
rename to rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/ImplTraitType/ImplTraitType.ql b/rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/ImplTraitType/ImplTraitType.ql
rename to rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr.ql
index d4cfdef4778..8ff70bd976d 100644
--- a/rust/ql/test/extractor-tests/generated/ImplTraitType/ImplTraitType.ql
+++ b/rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr.ql
@@ -2,7 +2,7 @@
 import codeql.rust.elements
 import TestUtils
 
-from ImplTraitType x, string hasTypeBoundList
+from ImplTraitTypeRepr x, string hasTypeBoundList
 where
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/MacroType/MacroType.expected b/rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr_getTypeBoundList.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/MacroType/MacroType.expected
rename to rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr_getTypeBoundList.expected
diff --git a/rust/ql/test/extractor-tests/generated/ImplTraitType/ImplTraitType_getTypeBoundList.ql b/rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr_getTypeBoundList.ql
similarity index 86%
rename from rust/ql/test/extractor-tests/generated/ImplTraitType/ImplTraitType_getTypeBoundList.ql
rename to rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr_getTypeBoundList.ql
index 132a6001355..32c100f1907 100644
--- a/rust/ql/test/extractor-tests/generated/ImplTraitType/ImplTraitType_getTypeBoundList.ql
+++ b/rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr_getTypeBoundList.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from ImplTraitType x
+from ImplTraitTypeRepr x
 where toBeTested(x) and not x.isUnknown()
 select x, x.getTypeBoundList()
diff --git a/rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/gen_impl_trait_type_repr.rs b/rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/gen_impl_trait_type_repr.rs
new file mode 100644
index 00000000000..36404a83f84
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ImplTraitTypeRepr/gen_impl_trait_type_repr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_impl_trait_type_repr() -> () {
+    // A ImplTraitTypeRepr. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr.expected b/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr.expected
index c113934115d..614afc3040f 100644
--- a/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr.expected
@@ -1,2 +1,2 @@
-| gen_index_expr.rs:5:5:5:12 | IndexExpr | getNumberOfAttrs: | 0 | hasBase: | yes | hasIndex: | yes |
-| gen_index_expr.rs:6:5:6:12 | IndexExpr | getNumberOfAttrs: | 0 | hasBase: | yes | hasIndex: | yes |
+| gen_index_expr.rs:5:5:5:12 | list[42] | getNumberOfAttrs: | 0 | hasBase: | yes | hasIndex: | yes |
+| gen_index_expr.rs:6:5:6:12 | list[42] | getNumberOfAttrs: | 0 | hasBase: | yes | hasIndex: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr_getBase.expected b/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr_getBase.expected
index c149597172b..13fb9a2c6a6 100644
--- a/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr_getBase.expected
+++ b/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr_getBase.expected
@@ -1,2 +1,2 @@
-| gen_index_expr.rs:5:5:5:12 | IndexExpr | gen_index_expr.rs:5:5:5:8 | list |
-| gen_index_expr.rs:6:5:6:12 | IndexExpr | gen_index_expr.rs:6:5:6:8 | list |
+| gen_index_expr.rs:5:5:5:12 | list[42] | gen_index_expr.rs:5:5:5:8 | list |
+| gen_index_expr.rs:6:5:6:12 | list[42] | gen_index_expr.rs:6:5:6:8 | list |
diff --git a/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr_getIndex.expected b/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr_getIndex.expected
index 433afd85eb9..dfca8204088 100644
--- a/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr_getIndex.expected
+++ b/rust/ql/test/extractor-tests/generated/IndexExpr/IndexExpr_getIndex.expected
@@ -1,2 +1,2 @@
-| gen_index_expr.rs:5:5:5:12 | IndexExpr | gen_index_expr.rs:5:10:5:11 | 42 |
-| gen_index_expr.rs:6:5:6:12 | IndexExpr | gen_index_expr.rs:6:10:6:11 | 42 |
+| gen_index_expr.rs:5:5:5:12 | list[42] | gen_index_expr.rs:5:10:5:11 | 42 |
+| gen_index_expr.rs:6:5:6:12 | list[42] | gen_index_expr.rs:6:10:6:11 | 42 |
diff --git a/rust/ql/test/extractor-tests/generated/InferType/gen_infer_type.rs b/rust/ql/test/extractor-tests/generated/InferType/gen_infer_type.rs
deleted file mode 100644
index c65f65c2230..00000000000
--- a/rust/ql/test/extractor-tests/generated/InferType/gen_infer_type.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_infer_type() -> () {
-    // A InferType. For example:
-    todo!()
-}
diff --git a/rust/ql/test/extractor-tests/generated/MacroType/MacroType_getMacroCall.expected b/rust/ql/test/extractor-tests/generated/InferTypeRepr/InferTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/MacroType/MacroType_getMacroCall.expected
rename to rust/ql/test/extractor-tests/generated/InferTypeRepr/InferTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/NeverType/NeverType.ql b/rust/ql/test/extractor-tests/generated/InferTypeRepr/InferTypeRepr.ql
similarity index 86%
rename from rust/ql/test/extractor-tests/generated/NeverType/NeverType.ql
rename to rust/ql/test/extractor-tests/generated/InferTypeRepr/InferTypeRepr.ql
index b093d5f1ee5..97f91c3307e 100644
--- a/rust/ql/test/extractor-tests/generated/NeverType/NeverType.ql
+++ b/rust/ql/test/extractor-tests/generated/InferTypeRepr/InferTypeRepr.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from NeverType x
+from InferTypeRepr x
 where toBeTested(x) and not x.isUnknown()
 select x
diff --git a/rust/ql/test/extractor-tests/generated/InferTypeRepr/gen_infer_type_repr.rs b/rust/ql/test/extractor-tests/generated/InferTypeRepr/gen_infer_type_repr.rs
new file mode 100644
index 00000000000..a1be7a78f21
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/InferTypeRepr/gen_infer_type_repr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_infer_type_repr() -> () {
+    // A InferTypeRepr. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/Label/Label.expected b/rust/ql/test/extractor-tests/generated/Label/Label.expected
index 5cea4ef7222..7525044aaa2 100644
--- a/rust/ql/test/extractor-tests/generated/Label/Label.expected
+++ b/rust/ql/test/extractor-tests/generated/Label/Label.expected
@@ -1 +1 @@
-| gen_label.rs:5:5:5:11 | Label | hasLifetime: | yes |
+| gen_label.rs:5:5:5:11 | 'label | hasLifetime: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/Label/Label_getLifetime.expected b/rust/ql/test/extractor-tests/generated/Label/Label_getLifetime.expected
index 9c78f23307d..73ebbe963e8 100644
--- a/rust/ql/test/extractor-tests/generated/Label/Label_getLifetime.expected
+++ b/rust/ql/test/extractor-tests/generated/Label/Label_getLifetime.expected
@@ -1 +1 @@
-| gen_label.rs:5:5:5:11 | Label | gen_label.rs:5:5:5:10 | Lifetime |
+| gen_label.rs:5:5:5:11 | 'label | gen_label.rs:5:5:5:10 | ''label |
diff --git a/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr.expected b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr.expected
index 26a968ef35b..115493214ea 100644
--- a/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr.expected
@@ -1 +1 @@
-| gen_let_expr.rs:5:8:5:31 | LetExpr | getNumberOfAttrs: | 0 | hasExpr: | yes | hasPat: | yes |
+| gen_let_expr.rs:5:8:5:31 | let ... = maybe_some | getNumberOfAttrs: | 0 | hasScrutinee: | yes | hasPat: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr.ql b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr.ql
index 1b7648a5668..60aa8b90892 100644
--- a/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr.ql
@@ -2,11 +2,11 @@
 import codeql.rust.elements
 import TestUtils
 
-from LetExpr x, int getNumberOfAttrs, string hasExpr, string hasPat
+from LetExpr x, int getNumberOfAttrs, string hasScrutinee, string hasPat
 where
   toBeTested(x) and
   not x.isUnknown() and
   getNumberOfAttrs = x.getNumberOfAttrs() and
-  (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and
+  (if x.hasScrutinee() then hasScrutinee = "yes" else hasScrutinee = "no") and
   if x.hasPat() then hasPat = "yes" else hasPat = "no"
-select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", hasExpr, "hasPat:", hasPat
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasScrutinee:", hasScrutinee, "hasPat:", hasPat
diff --git a/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getExpr.expected
index f90fa586229..0080ab4ee6e 100644
--- a/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getExpr.expected
@@ -1 +1 @@
-| gen_let_expr.rs:5:8:5:31 | LetExpr | gen_let_expr.rs:5:22:5:31 | maybe_some |
+| gen_let_expr.rs:5:8:5:31 | let ... = maybe_some | gen_let_expr.rs:5:22:5:31 | maybe_some |
diff --git a/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getPat.expected b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getPat.expected
index 287200e610f..b935bd98013 100644
--- a/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getPat.expected
+++ b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getPat.expected
@@ -1 +1 @@
-| gen_let_expr.rs:5:8:5:31 | LetExpr | gen_let_expr.rs:5:12:5:18 | TupleStructPat |
+| gen_let_expr.rs:5:8:5:31 | let ... = maybe_some | gen_let_expr.rs:5:12:5:18 | Some(...) |
diff --git a/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getScrutinee.expected b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getScrutinee.expected
new file mode 100644
index 00000000000..0080ab4ee6e
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getScrutinee.expected
@@ -0,0 +1 @@
+| gen_let_expr.rs:5:8:5:31 | let ... = maybe_some | gen_let_expr.rs:5:22:5:31 | maybe_some |
diff --git a/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getExpr.ql b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getScrutinee.ql
similarity index 83%
rename from rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getExpr.ql
rename to rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getScrutinee.ql
index 0f9e8088b46..2c144c2ac3c 100644
--- a/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/LetExpr/LetExpr_getScrutinee.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from LetExpr x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getExpr()
+select x, x.getScrutinee()
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.expected b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.expected
index 7c05e07e2f3..8f01e57d3e9 100644
--- a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.expected
+++ b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.expected
@@ -1,6 +1,6 @@
-| gen_let_stmt.rs:5:5:5:15 | LetStmt | getNumberOfAttrs: | 0 | hasInitializer: | yes | hasLetElse: | no | hasPat: | yes | hasTy: | no |
-| gen_let_stmt.rs:6:5:6:20 | LetStmt | getNumberOfAttrs: | 0 | hasInitializer: | yes | hasLetElse: | no | hasPat: | yes | hasTy: | yes |
-| gen_let_stmt.rs:7:5:7:15 | LetStmt | getNumberOfAttrs: | 0 | hasInitializer: | no | hasLetElse: | no | hasPat: | yes | hasTy: | yes |
-| gen_let_stmt.rs:8:5:8:10 | LetStmt | getNumberOfAttrs: | 0 | hasInitializer: | no | hasLetElse: | no | hasPat: | yes | hasTy: | no |
-| gen_let_stmt.rs:9:5:9:24 | LetStmt | getNumberOfAttrs: | 0 | hasInitializer: | yes | hasLetElse: | no | hasPat: | yes | hasTy: | no |
-| gen_let_stmt.rs:10:5:12:6 | LetStmt | getNumberOfAttrs: | 0 | hasInitializer: | yes | hasLetElse: | yes | hasPat: | yes | hasTy: | no |
+| gen_let_stmt.rs:5:5:5:15 | let ... = 42 | getNumberOfAttrs: | 0 | hasInitializer: | yes | hasLetElse: | no | hasPat: | yes | hasTypeRepr: | no |
+| gen_let_stmt.rs:6:5:6:20 | let ... = 42 | getNumberOfAttrs: | 0 | hasInitializer: | yes | hasLetElse: | no | hasPat: | yes | hasTypeRepr: | yes |
+| gen_let_stmt.rs:7:5:7:15 | let ... | getNumberOfAttrs: | 0 | hasInitializer: | no | hasLetElse: | no | hasPat: | yes | hasTypeRepr: | yes |
+| gen_let_stmt.rs:8:5:8:10 | let ... | getNumberOfAttrs: | 0 | hasInitializer: | no | hasLetElse: | no | hasPat: | yes | hasTypeRepr: | no |
+| gen_let_stmt.rs:9:5:9:24 | let ... = ... | getNumberOfAttrs: | 0 | hasInitializer: | yes | hasLetElse: | no | hasPat: | yes | hasTypeRepr: | no |
+| gen_let_stmt.rs:10:5:12:6 | let ... = ... else {...} | getNumberOfAttrs: | 0 | hasInitializer: | yes | hasLetElse: | yes | hasPat: | yes | hasTypeRepr: | no |
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.ql b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.ql
index bd7ce9ad958..0501354dfa1 100644
--- a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.ql
+++ b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 from
   LetStmt x, int getNumberOfAttrs, string hasInitializer, string hasLetElse, string hasPat,
-  string hasTy
+  string hasTypeRepr
 where
   toBeTested(x) and
   not x.isUnknown() and
@@ -12,6 +12,6 @@ where
   (if x.hasInitializer() then hasInitializer = "yes" else hasInitializer = "no") and
   (if x.hasLetElse() then hasLetElse = "yes" else hasLetElse = "no") and
   (if x.hasPat() then hasPat = "yes" else hasPat = "no") and
-  if x.hasTy() then hasTy = "yes" else hasTy = "no"
+  if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no"
 select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasInitializer:", hasInitializer, "hasLetElse:",
-  hasLetElse, "hasPat:", hasPat, "hasTy:", hasTy
+  hasLetElse, "hasPat:", hasPat, "hasTypeRepr:", hasTypeRepr
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getInitializer.expected b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getInitializer.expected
index 5e79b98f827..bd8368e351f 100644
--- a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getInitializer.expected
+++ b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getInitializer.expected
@@ -1,4 +1,4 @@
-| gen_let_stmt.rs:5:5:5:15 | LetStmt | gen_let_stmt.rs:5:13:5:14 | 42 |
-| gen_let_stmt.rs:6:5:6:20 | LetStmt | gen_let_stmt.rs:6:18:6:19 | 42 |
-| gen_let_stmt.rs:9:5:9:24 | LetStmt | gen_let_stmt.rs:9:18:9:23 | TupleExpr |
-| gen_let_stmt.rs:10:5:12:6 | LetStmt | gen_let_stmt.rs:10:19:10:38 | CallExpr |
+| gen_let_stmt.rs:5:5:5:15 | let ... = 42 | gen_let_stmt.rs:5:13:5:14 | 42 |
+| gen_let_stmt.rs:6:5:6:20 | let ... = 42 | gen_let_stmt.rs:6:18:6:19 | 42 |
+| gen_let_stmt.rs:9:5:9:24 | let ... = ... | gen_let_stmt.rs:9:18:9:23 | TupleExpr |
+| gen_let_stmt.rs:10:5:12:6 | let ... = ... else {...} | gen_let_stmt.rs:10:19:10:38 | ...::var(...) |
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getLetElse.expected b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getLetElse.expected
index 8078ec66966..5e8090859af 100644
--- a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getLetElse.expected
+++ b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getLetElse.expected
@@ -1 +1 @@
-| gen_let_stmt.rs:10:5:12:6 | LetStmt | gen_let_stmt.rs:10:40:12:5 | LetElse |
+| gen_let_stmt.rs:10:5:12:6 | let ... = ... else {...} | gen_let_stmt.rs:10:40:12:5 | else {...} |
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getPat.expected b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getPat.expected
index 93810df10e3..cd4c3f8cc64 100644
--- a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getPat.expected
+++ b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getPat.expected
@@ -1,6 +1,6 @@
-| gen_let_stmt.rs:5:5:5:15 | LetStmt | gen_let_stmt.rs:5:9:5:9 | x |
-| gen_let_stmt.rs:6:5:6:20 | LetStmt | gen_let_stmt.rs:6:9:6:9 | x |
-| gen_let_stmt.rs:7:5:7:15 | LetStmt | gen_let_stmt.rs:7:9:7:9 | x |
-| gen_let_stmt.rs:8:5:8:10 | LetStmt | gen_let_stmt.rs:8:9:8:9 | x |
-| gen_let_stmt.rs:9:5:9:24 | LetStmt | gen_let_stmt.rs:9:9:9:14 | TuplePat |
-| gen_let_stmt.rs:10:5:12:6 | LetStmt | gen_let_stmt.rs:10:9:10:15 | TupleStructPat |
+| gen_let_stmt.rs:5:5:5:15 | let ... = 42 | gen_let_stmt.rs:5:9:5:9 | x |
+| gen_let_stmt.rs:6:5:6:20 | let ... = 42 | gen_let_stmt.rs:6:9:6:9 | x |
+| gen_let_stmt.rs:7:5:7:15 | let ... | gen_let_stmt.rs:7:9:7:9 | x |
+| gen_let_stmt.rs:8:5:8:10 | let ... | gen_let_stmt.rs:8:9:8:9 | x |
+| gen_let_stmt.rs:9:5:9:24 | let ... = ... | gen_let_stmt.rs:9:9:9:14 | TuplePat |
+| gen_let_stmt.rs:10:5:12:6 | let ... = ... else {...} | gen_let_stmt.rs:10:9:10:15 | Some(...) |
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getTy.expected b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getTy.expected
deleted file mode 100644
index 1cf6d1d2a51..00000000000
--- a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getTy.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| gen_let_stmt.rs:6:5:6:20 | LetStmt | gen_let_stmt.rs:6:12:6:14 | PathType |
-| gen_let_stmt.rs:7:5:7:15 | LetStmt | gen_let_stmt.rs:7:12:7:14 | PathType |
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getTypeRepr.expected b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getTypeRepr.expected
new file mode 100644
index 00000000000..489647f4793
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getTypeRepr.expected
@@ -0,0 +1,2 @@
+| gen_let_stmt.rs:6:5:6:20 | let ... = 42 | gen_let_stmt.rs:6:12:6:14 | i32 |
+| gen_let_stmt.rs:7:5:7:15 | let ... | gen_let_stmt.rs:7:12:7:14 | i32 |
diff --git a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getTy.ql b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getTy.ql
rename to rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getTypeRepr.ql
index 507c43a5619..7c5a8872bc3 100644
--- a/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getTy.ql
+++ b/rust/ql/test/extractor-tests/generated/LetStmt/LetStmt_getTypeRepr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from LetStmt x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat.expected b/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat.expected
index b7ac2ced75f..d4734ef3dac 100644
--- a/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat.expected
+++ b/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat.expected
@@ -1 +1 @@
-| gen_literal_pat.rs:6:9:6:10 | LiteralPat | hasLiteral: | yes |
+| gen_literal_pat.rs:6:9:6:10 | 42 | hasLiteral: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat_getLiteral.expected b/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat_getLiteral.expected
index ce74da0fb3a..487f239737b 100644
--- a/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat_getLiteral.expected
+++ b/rust/ql/test/extractor-tests/generated/LiteralPat/LiteralPat_getLiteral.expected
@@ -1 +1 @@
-| gen_literal_pat.rs:6:9:6:10 | LiteralPat | gen_literal_pat.rs:6:9:6:10 | 42 |
+| gen_literal_pat.rs:6:9:6:10 | 42 | gen_literal_pat.rs:6:9:6:10 | 42 |
diff --git a/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.expected b/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.expected
index aae22652d64..b0adbe40897 100644
--- a/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.expected
@@ -1,3 +1,3 @@
-| gen_loop_expr.rs:5:5:7:5 | LoopExpr | getNumberOfAttrs: | 0 | hasLabel: | no | hasLoopBody: | yes |
-| gen_loop_expr.rs:8:5:11:5 | LoopExpr | getNumberOfAttrs: | 0 | hasLabel: | yes | hasLoopBody: | yes |
-| gen_loop_expr.rs:13:5:19:5 | LoopExpr | getNumberOfAttrs: | 0 | hasLabel: | no | hasLoopBody: | yes |
+| gen_loop_expr.rs:5:5:7:5 | loop { ... } | hasLabel: | no | hasLoopBody: | yes | getNumberOfAttrs: | 0 |
+| gen_loop_expr.rs:8:5:11:5 | 'label: loop { ... } | hasLabel: | yes | hasLoopBody: | yes | getNumberOfAttrs: | 0 |
+| gen_loop_expr.rs:13:5:19:5 | loop { ... } | hasLabel: | no | hasLoopBody: | yes | getNumberOfAttrs: | 0 |
diff --git a/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.ql b/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.ql
index c627fb16771..92248ab5ec0 100644
--- a/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr.ql
@@ -2,11 +2,11 @@
 import codeql.rust.elements
 import TestUtils
 
-from LoopExpr x, int getNumberOfAttrs, string hasLabel, string hasLoopBody
+from LoopExpr x, string hasLabel, string hasLoopBody, int getNumberOfAttrs
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.hasLabel() then hasLabel = "yes" else hasLabel = "no") and
-  if x.hasLoopBody() then hasLoopBody = "yes" else hasLoopBody = "no"
-select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasLabel:", hasLabel, "hasLoopBody:", hasLoopBody
+  (if x.hasLoopBody() then hasLoopBody = "yes" else hasLoopBody = "no") and
+  getNumberOfAttrs = x.getNumberOfAttrs()
+select x, "hasLabel:", hasLabel, "hasLoopBody:", hasLoopBody, "getNumberOfAttrs:", getNumberOfAttrs
diff --git a/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr_getLabel.expected b/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr_getLabel.expected
index 98a657f0983..e2dc2fdf895 100644
--- a/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr_getLabel.expected
+++ b/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr_getLabel.expected
@@ -1 +1 @@
-| gen_loop_expr.rs:8:5:11:5 | LoopExpr | gen_loop_expr.rs:8:5:8:11 | Label |
+| gen_loop_expr.rs:8:5:11:5 | 'label: loop { ... } | gen_loop_expr.rs:8:5:8:11 | 'label |
diff --git a/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr_getLoopBody.expected b/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr_getLoopBody.expected
index 358fd7625b5..9cf0c64dd0b 100644
--- a/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr_getLoopBody.expected
+++ b/rust/ql/test/extractor-tests/generated/LoopExpr/LoopExpr_getLoopBody.expected
@@ -1,3 +1,3 @@
-| gen_loop_expr.rs:5:5:7:5 | LoopExpr | gen_loop_expr.rs:5:10:7:5 | BlockExpr |
-| gen_loop_expr.rs:8:5:11:5 | LoopExpr | gen_loop_expr.rs:8:18:11:5 | BlockExpr |
-| gen_loop_expr.rs:13:5:19:5 | LoopExpr | gen_loop_expr.rs:13:10:19:5 | BlockExpr |
+| gen_loop_expr.rs:5:5:7:5 | loop { ... } | gen_loop_expr.rs:5:10:7:5 | { ... } |
+| gen_loop_expr.rs:8:5:11:5 | 'label: loop { ... } | gen_loop_expr.rs:8:18:11:5 | { ... } |
+| gen_loop_expr.rs:13:5:19:5 | loop { ... } | gen_loop_expr.rs:13:10:19:5 | { ... } |
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected
index 03bcc247a9d..db69c4e068a 100644
--- a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected
+++ b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected
@@ -1 +1 @@
-| gen_macro_call.rs:5:5:5:11 | MacroCall | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | getNumberOfAttrs: | 0 | hasPath: | yes | hasTokenTree: | yes | hasExpanded: | yes |
+| gen_macro_call.rs:5:5:5:11 | todo!... | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | getNumberOfAttrs: | 0 | hasPath: | yes | hasTokenTree: | yes | hasExpanded: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getExpanded.expected b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getExpanded.expected
index 7bdb564985f..1b60df41f79 100644
--- a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getExpanded.expected
+++ b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getExpanded.expected
@@ -1 +1 @@
-| gen_macro_call.rs:5:5:5:11 | MacroCall | gen_macro_call.rs:5:5:5:11 | MacroStmts |
+| gen_macro_call.rs:5:5:5:11 | todo!... | gen_macro_call.rs:5:5:5:11 | MacroStmts |
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getPath.expected b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getPath.expected
index 33685ad0aad..23762715c9a 100644
--- a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getPath.expected
+++ b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getPath.expected
@@ -1 +1 @@
-| gen_macro_call.rs:5:5:5:11 | MacroCall | gen_macro_call.rs:5:5:5:8 | todo |
+| gen_macro_call.rs:5:5:5:11 | todo!... | gen_macro_call.rs:5:5:5:8 | todo |
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getTokenTree.expected b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getTokenTree.expected
index 5f92a68536c..d2ed004ecc4 100644
--- a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getTokenTree.expected
+++ b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall_getTokenTree.expected
@@ -1 +1 @@
-| gen_macro_call.rs:5:5:5:11 | MacroCall | gen_macro_call.rs:5:10:5:11 | TokenTree |
+| gen_macro_call.rs:5:5:5:11 | todo!... | gen_macro_call.rs:5:10:5:11 | TokenTree |
diff --git a/rust/ql/test/extractor-tests/generated/MacroExpr/MacroExpr_getMacroCall.expected b/rust/ql/test/extractor-tests/generated/MacroExpr/MacroExpr_getMacroCall.expected
index 5a635cabcbe..c1815adac09 100644
--- a/rust/ql/test/extractor-tests/generated/MacroExpr/MacroExpr_getMacroCall.expected
+++ b/rust/ql/test/extractor-tests/generated/MacroExpr/MacroExpr_getMacroCall.expected
@@ -1 +1 @@
-| gen_macro_expr.rs:5:5:5:11 | MacroExpr | gen_macro_expr.rs:5:5:5:11 | MacroCall |
+| gen_macro_expr.rs:5:5:5:11 | MacroExpr | gen_macro_expr.rs:5:5:5:11 | todo!... |
diff --git a/rust/ql/test/extractor-tests/generated/MacroItems/CONSISTENCY/AstConsistency.expected b/rust/ql/test/extractor-tests/generated/MacroItems/CONSISTENCY/AstConsistency.expected
new file mode 100644
index 00000000000..d977579474b
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroItems/CONSISTENCY/AstConsistency.expected
@@ -0,0 +1,42 @@
+noLocation
+| file://:0:0:0:0 | ... .parent(...) |
+| file://:0:0:0:0 | ... .unwrap(...) |
+| file://:0:0:0:0 | ...: ... |
+| file://:0:0:0:0 | ...::Path |
+| file://:0:0:0:0 | ...::path |
+| file://:0:0:0:0 | ArgList |
+| file://:0:0:0:0 | ArgList |
+| file://:0:0:0:0 | MacroItems |
+| file://:0:0:0:0 | ParamList |
+| file://:0:0:0:0 | Path |
+| file://:0:0:0:0 | Path |
+| file://:0:0:0:0 | Path |
+| file://:0:0:0:0 | Path |
+| file://:0:0:0:0 | Path |
+| file://:0:0:0:0 | Path |
+| file://:0:0:0:0 | Path |
+| file://:0:0:0:0 | Path |
+| file://:0:0:0:0 | Path |
+| file://:0:0:0:0 | Path |
+| file://:0:0:0:0 | RefTypeRepr |
+| file://:0:0:0:0 | RefTypeRepr |
+| file://:0:0:0:0 | RetTypeRepr |
+| file://:0:0:0:0 | StmtList |
+| file://:0:0:0:0 | Use |
+| file://:0:0:0:0 | UseTree |
+| file://:0:0:0:0 | fn get_parent |
+| file://:0:0:0:0 | get_parent |
+| file://:0:0:0:0 | parent |
+| file://:0:0:0:0 | path |
+| file://:0:0:0:0 | path |
+| file://:0:0:0:0 | path |
+| file://:0:0:0:0 | path |
+| file://:0:0:0:0 | path |
+| file://:0:0:0:0 | path |
+| file://:0:0:0:0 | path |
+| file://:0:0:0:0 | path |
+| file://:0:0:0:0 | std |
+| file://:0:0:0:0 | std |
+| file://:0:0:0:0 | std |
+| file://:0:0:0:0 | unwrap |
+| file://:0:0:0:0 | { ... } |
diff --git a/rust/ql/test/extractor-tests/generated/MacroItems/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/MacroItems/CONSISTENCY/DataFlowConsistency.expected
deleted file mode 100644
index 02210855a69..00000000000
--- a/rust/ql/test/extractor-tests/generated/MacroItems/CONSISTENCY/DataFlowConsistency.expected
+++ /dev/null
@@ -1,9 +0,0 @@
-uniqueNodeLocation
-| file://:0:0:0:0 | ... .parent(...) | Node should have one location but has 0. |
-| file://:0:0:0:0 | ... .unwrap(...) | Node should have one location but has 0. |
-| file://:0:0:0:0 | BlockExpr | Node should have one location but has 0. |
-| file://:0:0:0:0 | Param | Node should have one location but has 0. |
-| file://:0:0:0:0 | path | Node should have one location but has 0. |
-| file://:0:0:0:0 | path | Node should have one location but has 0. |
-missingLocation
-| Nodes without location: 6 |
diff --git a/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems_getItem.expected b/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems_getItem.expected
index a66e6bcca5e..5940fb61696 100644
--- a/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems_getItem.expected
+++ b/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems_getItem.expected
@@ -1,2 +1,2 @@
 | file://:0:0:0:0 | MacroItems | 0 | file://:0:0:0:0 | Use |
-| file://:0:0:0:0 | MacroItems | 1 | file://:0:0:0:0 | get_parent |
+| file://:0:0:0:0 | MacroItems | 1 | file://:0:0:0:0 | fn get_parent |
diff --git a/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts_getExpr.expected b/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts_getExpr.expected
index 7d30926c152..d1390595304 100644
--- a/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts_getExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/MacroStmts/MacroStmts_getExpr.expected
@@ -1 +1 @@
-| gen_macro_stmts.rs:5:14:5:28 | MacroStmts | gen_macro_stmts.rs:5:14:5:28 | BlockExpr |
+| gen_macro_stmts.rs:5:14:5:28 | MacroStmts | gen_macro_stmts.rs:5:14:5:28 | { ... } |
diff --git a/rust/ql/test/extractor-tests/generated/MacroType/gen_macro_type.rs b/rust/ql/test/extractor-tests/generated/MacroType/gen_macro_type.rs
deleted file mode 100644
index 31f93e580a2..00000000000
--- a/rust/ql/test/extractor-tests/generated/MacroType/gen_macro_type.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_macro_type() -> () {
-    // A MacroType. For example:
-    todo!()
-}
diff --git a/rust/ql/test/extractor-tests/generated/NeverType/NeverType.expected b/rust/ql/test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/NeverType/NeverType.expected
rename to rust/ql/test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/MacroType/MacroType.ql b/rust/ql/test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr.ql
similarity index 85%
rename from rust/ql/test/extractor-tests/generated/MacroType/MacroType.ql
rename to rust/ql/test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr.ql
index 6fcbdc8617a..466d4cf0405 100644
--- a/rust/ql/test/extractor-tests/generated/MacroType/MacroType.ql
+++ b/rust/ql/test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr.ql
@@ -2,7 +2,7 @@
 import codeql.rust.elements
 import TestUtils
 
-from MacroType x, string hasMacroCall
+from MacroTypeRepr x, string hasMacroCall
 where
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/Param/Param_getTy.expected b/rust/ql/test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr_getMacroCall.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/Param/Param_getTy.expected
rename to rust/ql/test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr_getMacroCall.expected
diff --git a/rust/ql/test/extractor-tests/generated/MacroType/MacroType_getMacroCall.ql b/rust/ql/test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr_getMacroCall.ql
similarity index 87%
rename from rust/ql/test/extractor-tests/generated/MacroType/MacroType_getMacroCall.ql
rename to rust/ql/test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr_getMacroCall.ql
index d7c5035f79b..22aa72d039b 100644
--- a/rust/ql/test/extractor-tests/generated/MacroType/MacroType_getMacroCall.ql
+++ b/rust/ql/test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr_getMacroCall.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from MacroType x
+from MacroTypeRepr x
 where toBeTested(x) and not x.isUnknown()
 select x, x.getMacroCall()
diff --git a/rust/ql/test/extractor-tests/generated/MacroTypeRepr/gen_macro_type_repr.rs b/rust/ql/test/extractor-tests/generated/MacroTypeRepr/gen_macro_type_repr.rs
new file mode 100644
index 00000000000..60b382ca878
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MacroTypeRepr/gen_macro_type_repr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_macro_type_repr() -> () {
+    // A MacroTypeRepr. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm.expected b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm.expected
index b685f882362..b3eb4c178b2 100644
--- a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm.expected
+++ b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm.expected
@@ -1,4 +1,4 @@
-| gen_match_arm.rs:6:9:6:29 | MatchArm | getNumberOfAttrs: | 0 | hasExpr: | yes | hasGuard: | no | hasPat: | yes |
-| gen_match_arm.rs:7:9:7:26 | MatchArm | getNumberOfAttrs: | 0 | hasExpr: | yes | hasGuard: | no | hasPat: | yes |
-| gen_match_arm.rs:10:9:10:35 | MatchArm | getNumberOfAttrs: | 0 | hasExpr: | yes | hasGuard: | yes | hasPat: | yes |
-| gen_match_arm.rs:11:9:11:15 | MatchArm | getNumberOfAttrs: | 0 | hasExpr: | yes | hasGuard: | no | hasPat: | yes |
+| gen_match_arm.rs:6:9:6:29 | ... => y | getNumberOfAttrs: | 0 | hasExpr: | yes | hasGuard: | no | hasPat: | yes |
+| gen_match_arm.rs:7:9:7:26 | ...::None => 0 | getNumberOfAttrs: | 0 | hasExpr: | yes | hasGuard: | no | hasPat: | yes |
+| gen_match_arm.rs:10:9:10:35 | ... if ... => ... | getNumberOfAttrs: | 0 | hasExpr: | yes | hasGuard: | yes | hasPat: | yes |
+| gen_match_arm.rs:11:9:11:15 | _ => 0 | getNumberOfAttrs: | 0 | hasExpr: | yes | hasGuard: | no | hasPat: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getExpr.expected b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getExpr.expected
index 493ea8d9bb0..95d4a7fc2f2 100644
--- a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getExpr.expected
@@ -1,4 +1,4 @@
-| gen_match_arm.rs:6:9:6:29 | MatchArm | gen_match_arm.rs:6:28:6:28 | y |
-| gen_match_arm.rs:7:9:7:26 | MatchArm | gen_match_arm.rs:7:25:7:25 | 0 |
-| gen_match_arm.rs:10:9:10:35 | MatchArm | gen_match_arm.rs:10:30:10:34 | ... / ... |
-| gen_match_arm.rs:11:9:11:15 | MatchArm | gen_match_arm.rs:11:14:11:14 | 0 |
+| gen_match_arm.rs:6:9:6:29 | ... => y | gen_match_arm.rs:6:28:6:28 | y |
+| gen_match_arm.rs:7:9:7:26 | ...::None => 0 | gen_match_arm.rs:7:25:7:25 | 0 |
+| gen_match_arm.rs:10:9:10:35 | ... if ... => ... | gen_match_arm.rs:10:30:10:34 | ... / ... |
+| gen_match_arm.rs:11:9:11:15 | _ => 0 | gen_match_arm.rs:11:14:11:14 | 0 |
diff --git a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getGuard.expected b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getGuard.expected
index 4e5da987474..00291745547 100644
--- a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getGuard.expected
+++ b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getGuard.expected
@@ -1 +1 @@
-| gen_match_arm.rs:10:9:10:35 | MatchArm | gen_match_arm.rs:10:17:10:25 | MatchGuard |
+| gen_match_arm.rs:10:9:10:35 | ... if ... => ... | gen_match_arm.rs:10:17:10:25 | MatchGuard |
diff --git a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getPat.expected b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getPat.expected
index 41f79ed16c9..d4adba7f838 100644
--- a/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getPat.expected
+++ b/rust/ql/test/extractor-tests/generated/MatchArm/MatchArm_getPat.expected
@@ -1,4 +1,4 @@
-| gen_match_arm.rs:6:9:6:29 | MatchArm | gen_match_arm.rs:6:9:6:23 | TupleStructPat |
-| gen_match_arm.rs:7:9:7:26 | MatchArm | gen_match_arm.rs:7:9:7:20 | PathPat |
-| gen_match_arm.rs:10:9:10:35 | MatchArm | gen_match_arm.rs:10:9:10:15 | TupleStructPat |
-| gen_match_arm.rs:11:9:11:15 | MatchArm | gen_match_arm.rs:11:9:11:9 | WildcardPat |
+| gen_match_arm.rs:6:9:6:29 | ... => y | gen_match_arm.rs:6:9:6:23 | ...::Some(...) |
+| gen_match_arm.rs:7:9:7:26 | ...::None => 0 | gen_match_arm.rs:7:9:7:20 | ...::None |
+| gen_match_arm.rs:10:9:10:35 | ... if ... => ... | gen_match_arm.rs:10:9:10:15 | Some(...) |
+| gen_match_arm.rs:11:9:11:15 | _ => 0 | gen_match_arm.rs:11:9:11:9 | _ |
diff --git a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr.expected b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr.expected
index 4591d8a57c3..8c5b0a32a8f 100644
--- a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr.expected
@@ -1,2 +1,2 @@
-| gen_match_expr.rs:5:5:8:5 | MatchExpr | getNumberOfAttrs: | 0 | hasExpr: | yes | hasMatchArmList: | yes |
-| gen_match_expr.rs:9:5:12:5 | MatchExpr | getNumberOfAttrs: | 0 | hasExpr: | yes | hasMatchArmList: | yes |
+| gen_match_expr.rs:5:5:8:5 | match x { ... } | getNumberOfAttrs: | 0 | hasScrutinee: | yes | hasMatchArmList: | yes |
+| gen_match_expr.rs:9:5:12:5 | match x { ... } | getNumberOfAttrs: | 0 | hasScrutinee: | yes | hasMatchArmList: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr.ql b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr.ql
index b29e333d330..0847933e937 100644
--- a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr.ql
@@ -2,12 +2,12 @@
 import codeql.rust.elements
 import TestUtils
 
-from MatchExpr x, int getNumberOfAttrs, string hasExpr, string hasMatchArmList
+from MatchExpr x, int getNumberOfAttrs, string hasScrutinee, string hasMatchArmList
 where
   toBeTested(x) and
   not x.isUnknown() and
   getNumberOfAttrs = x.getNumberOfAttrs() and
-  (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and
+  (if x.hasScrutinee() then hasScrutinee = "yes" else hasScrutinee = "no") and
   if x.hasMatchArmList() then hasMatchArmList = "yes" else hasMatchArmList = "no"
-select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", hasExpr, "hasMatchArmList:",
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasScrutinee:", hasScrutinee, "hasMatchArmList:",
   hasMatchArmList
diff --git a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getExpr.expected
index 924eb3f807f..427af7c6ed0 100644
--- a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getExpr.expected
@@ -1,2 +1,2 @@
-| gen_match_expr.rs:5:5:8:5 | MatchExpr | gen_match_expr.rs:5:11:5:11 | x |
-| gen_match_expr.rs:9:5:12:5 | MatchExpr | gen_match_expr.rs:9:11:9:11 | x |
+| gen_match_expr.rs:5:5:8:5 | match x { ... } | gen_match_expr.rs:5:11:5:11 | x |
+| gen_match_expr.rs:9:5:12:5 | match x { ... } | gen_match_expr.rs:9:11:9:11 | x |
diff --git a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getMatchArmList.expected b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getMatchArmList.expected
index db83ecb1c53..f5e25db5b39 100644
--- a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getMatchArmList.expected
+++ b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getMatchArmList.expected
@@ -1,2 +1,2 @@
-| gen_match_expr.rs:5:5:8:5 | MatchExpr | gen_match_expr.rs:5:13:8:5 | MatchArmList |
-| gen_match_expr.rs:9:5:12:5 | MatchExpr | gen_match_expr.rs:9:13:12:5 | MatchArmList |
+| gen_match_expr.rs:5:5:8:5 | match x { ... } | gen_match_expr.rs:5:13:8:5 | MatchArmList |
+| gen_match_expr.rs:9:5:12:5 | match x { ... } | gen_match_expr.rs:9:13:12:5 | MatchArmList |
diff --git a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getScrutinee.expected b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getScrutinee.expected
new file mode 100644
index 00000000000..427af7c6ed0
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getScrutinee.expected
@@ -0,0 +1,2 @@
+| gen_match_expr.rs:5:5:8:5 | match x { ... } | gen_match_expr.rs:5:11:5:11 | x |
+| gen_match_expr.rs:9:5:12:5 | match x { ... } | gen_match_expr.rs:9:11:9:11 | x |
diff --git a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getExpr.ql b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getScrutinee.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getExpr.ql
rename to rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getScrutinee.ql
index 40dd65afcbc..4d29f21fbfb 100644
--- a/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/MatchExpr/MatchExpr_getScrutinee.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from MatchExpr x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getExpr()
+select x, x.getScrutinee()
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgList.expected b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgList.expected
index 8b2622f09ab..dd1ed8c0304 100644
--- a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgList.expected
+++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgList.expected
@@ -1 +1 @@
-| gen_method_call_expr.rs:6:5:6:25 | ... .foo(...) | gen_method_call_expr.rs:6:10:6:21 | GenericArgList |
+| gen_method_call_expr.rs:6:5:6:25 | ... .foo(...) | gen_method_call_expr.rs:6:10:6:21 | <...> |
diff --git a/rust/ql/test/extractor-tests/generated/Module/Module.expected b/rust/ql/test/extractor-tests/generated/Module/Module.expected
index d7c04f7c118..11b6d9e1e9b 100644
--- a/rust/ql/test/extractor-tests/generated/Module/Module.expected
+++ b/rust/ql/test/extractor-tests/generated/Module/Module.expected
@@ -1,3 +1,3 @@
-| gen_module.rs:3:1:4:8 | Module | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | getNumberOfAttrs: | 0 | hasItemList: | no | hasName: | yes | hasVisibility: | no |
-| gen_module.rs:5:1:7:1 | Module | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | getNumberOfAttrs: | 0 | hasItemList: | yes | hasName: | yes | hasVisibility: | no |
-| lib.rs:1:1:1:15 | Module | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | getNumberOfAttrs: | 0 | hasItemList: | no | hasName: | yes | hasVisibility: | no |
+| gen_module.rs:3:1:4:8 | mod foo | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | getNumberOfAttrs: | 0 | hasItemList: | no | hasName: | yes | hasVisibility: | no |
+| gen_module.rs:5:1:7:1 | mod bar | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | getNumberOfAttrs: | 0 | hasItemList: | yes | hasName: | yes | hasVisibility: | no |
+| lib.rs:1:1:1:15 | mod gen_module | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | getNumberOfAttrs: | 0 | hasItemList: | no | hasName: | yes | hasVisibility: | no |
diff --git a/rust/ql/test/extractor-tests/generated/Module/Module_getCrateOrigin.expected b/rust/ql/test/extractor-tests/generated/Module/Module_getCrateOrigin.expected
index e2e58c030ef..0164fbb8e29 100644
--- a/rust/ql/test/extractor-tests/generated/Module/Module_getCrateOrigin.expected
+++ b/rust/ql/test/extractor-tests/generated/Module/Module_getCrateOrigin.expected
@@ -1,3 +1,3 @@
-| gen_module.rs:3:1:4:8 | Module | repo::test |
-| gen_module.rs:5:1:7:1 | Module | repo::test |
-| lib.rs:1:1:1:15 | Module | repo::test |
+| gen_module.rs:3:1:4:8 | mod foo | repo::test |
+| gen_module.rs:5:1:7:1 | mod bar | repo::test |
+| lib.rs:1:1:1:15 | mod gen_module | repo::test |
diff --git a/rust/ql/test/extractor-tests/generated/Module/Module_getExtendedCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/Module/Module_getExtendedCanonicalPath.expected
index 19eadfdafd5..c573ef164eb 100644
--- a/rust/ql/test/extractor-tests/generated/Module/Module_getExtendedCanonicalPath.expected
+++ b/rust/ql/test/extractor-tests/generated/Module/Module_getExtendedCanonicalPath.expected
@@ -1,3 +1,3 @@
-| gen_module.rs:3:1:4:8 | Module | crate::gen_module::foo |
-| gen_module.rs:5:1:7:1 | Module | crate::gen_module::bar |
-| lib.rs:1:1:1:15 | Module | crate::gen_module |
+| gen_module.rs:3:1:4:8 | mod foo | crate::gen_module::foo |
+| gen_module.rs:5:1:7:1 | mod bar | crate::gen_module::bar |
+| lib.rs:1:1:1:15 | mod gen_module | crate::gen_module |
diff --git a/rust/ql/test/extractor-tests/generated/Module/Module_getItemList.expected b/rust/ql/test/extractor-tests/generated/Module/Module_getItemList.expected
index 04fd8d4a81a..8edc36efa73 100644
--- a/rust/ql/test/extractor-tests/generated/Module/Module_getItemList.expected
+++ b/rust/ql/test/extractor-tests/generated/Module/Module_getItemList.expected
@@ -1 +1 @@
-| gen_module.rs:5:1:7:1 | Module | gen_module.rs:5:9:7:1 | ItemList |
+| gen_module.rs:5:1:7:1 | mod bar | gen_module.rs:5:9:7:1 | ItemList |
diff --git a/rust/ql/test/extractor-tests/generated/Module/Module_getName.expected b/rust/ql/test/extractor-tests/generated/Module/Module_getName.expected
index cc295b1da89..1874862befe 100644
--- a/rust/ql/test/extractor-tests/generated/Module/Module_getName.expected
+++ b/rust/ql/test/extractor-tests/generated/Module/Module_getName.expected
@@ -1,3 +1,3 @@
-| gen_module.rs:3:1:4:8 | Module | gen_module.rs:4:5:4:7 | foo |
-| gen_module.rs:5:1:7:1 | Module | gen_module.rs:5:5:5:7 | bar |
-| lib.rs:1:1:1:15 | Module | lib.rs:1:5:1:14 | gen_module |
+| gen_module.rs:3:1:4:8 | mod foo | gen_module.rs:4:5:4:7 | foo |
+| gen_module.rs:5:1:7:1 | mod bar | gen_module.rs:5:5:5:7 | bar |
+| lib.rs:1:1:1:15 | mod gen_module | lib.rs:1:5:1:14 | gen_module |
diff --git a/rust/ql/test/extractor-tests/generated/NeverType/gen_never_type.rs b/rust/ql/test/extractor-tests/generated/NeverType/gen_never_type.rs
deleted file mode 100644
index f84b6dc6c0a..00000000000
--- a/rust/ql/test/extractor-tests/generated/NeverType/gen_never_type.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_never_type() -> () {
-    // A NeverType. For example:
-    todo!()
-}
diff --git a/rust/ql/test/extractor-tests/generated/ParenType/ParenType.expected b/rust/ql/test/extractor-tests/generated/NeverTypeRepr/NeverTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/ParenType/ParenType.expected
rename to rust/ql/test/extractor-tests/generated/NeverTypeRepr/NeverTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/InferType/InferType.ql b/rust/ql/test/extractor-tests/generated/NeverTypeRepr/NeverTypeRepr.ql
similarity index 86%
rename from rust/ql/test/extractor-tests/generated/InferType/InferType.ql
rename to rust/ql/test/extractor-tests/generated/NeverTypeRepr/NeverTypeRepr.ql
index 88b42a4d53f..71ab05928df 100644
--- a/rust/ql/test/extractor-tests/generated/InferType/InferType.ql
+++ b/rust/ql/test/extractor-tests/generated/NeverTypeRepr/NeverTypeRepr.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from InferType x
+from NeverTypeRepr x
 where toBeTested(x) and not x.isUnknown()
 select x
diff --git a/rust/ql/test/extractor-tests/generated/NeverTypeRepr/gen_never_type_repr.rs b/rust/ql/test/extractor-tests/generated/NeverTypeRepr/gen_never_type_repr.rs
new file mode 100644
index 00000000000..203a3b749dc
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/NeverTypeRepr/gen_never_type_repr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_never_type_repr() -> () {
+    // A NeverTypeRepr. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.expected b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.expected
index 1e53040c6cb..4f8705ab0da 100644
--- a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.expected
@@ -1 +1 @@
-| gen_offset_of_expr.rs:5:5:5:38 | OffsetOfExpr | getNumberOfAttrs: | 0 | getNumberOfFields: | 1 | hasTy: | yes |
+| gen_offset_of_expr.rs:5:5:5:38 | OffsetOfExpr | getNumberOfAttrs: | 0 | getNumberOfFields: | 1 | hasTypeRepr: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql
index 9161ff35a93..afcd0de84df 100644
--- a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr.ql
@@ -2,12 +2,12 @@
 import codeql.rust.elements
 import TestUtils
 
-from OffsetOfExpr x, int getNumberOfAttrs, int getNumberOfFields, string hasTy
+from OffsetOfExpr x, int getNumberOfAttrs, int getNumberOfFields, string hasTypeRepr
 where
   toBeTested(x) and
   not x.isUnknown() and
   getNumberOfAttrs = x.getNumberOfAttrs() and
   getNumberOfFields = x.getNumberOfFields() and
-  if x.hasTy() then hasTy = "yes" else hasTy = "no"
-select x, "getNumberOfAttrs:", getNumberOfAttrs, "getNumberOfFields:", getNumberOfFields, "hasTy:",
-  hasTy
+  if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "getNumberOfFields:", getNumberOfFields,
+  "hasTypeRepr:", hasTypeRepr
diff --git a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTy.expected b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTypeRepr.expected
similarity index 67%
rename from rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTy.expected
rename to rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTypeRepr.expected
index c7d0f2ee6af..e2e11abb6a0 100644
--- a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTy.expected
+++ b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTypeRepr.expected
@@ -1 +1 @@
-| gen_offset_of_expr.rs:5:5:5:38 | OffsetOfExpr | gen_offset_of_expr.rs:5:25:5:30 | PathType |
+| gen_offset_of_expr.rs:5:5:5:38 | OffsetOfExpr | gen_offset_of_expr.rs:5:25:5:30 | Struct |
diff --git a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTy.ql b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTy.ql
rename to rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTypeRepr.ql
index 4ab524b18c7..5f2a647d807 100644
--- a/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTy.ql
+++ b/rust/ql/test/extractor-tests/generated/OffsetOfExpr/OffsetOfExpr_getTypeRepr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from OffsetOfExpr x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/OrPat/OrPat.expected b/rust/ql/test/extractor-tests/generated/OrPat/OrPat.expected
index 786a0018093..1d67a8509b9 100644
--- a/rust/ql/test/extractor-tests/generated/OrPat/OrPat.expected
+++ b/rust/ql/test/extractor-tests/generated/OrPat/OrPat.expected
@@ -1 +1 @@
-| gen_or_pat.rs:6:9:6:38 | OrPat | getNumberOfPats: | 2 |
+| gen_or_pat.rs:6:9:6:38 | ... \| ...::None | getNumberOfPats: | 2 |
diff --git a/rust/ql/test/extractor-tests/generated/OrPat/OrPat_getPat.expected b/rust/ql/test/extractor-tests/generated/OrPat/OrPat_getPat.expected
index a701548b234..9e50c27e035 100644
--- a/rust/ql/test/extractor-tests/generated/OrPat/OrPat_getPat.expected
+++ b/rust/ql/test/extractor-tests/generated/OrPat/OrPat_getPat.expected
@@ -1,2 +1,2 @@
-| gen_or_pat.rs:6:9:6:38 | OrPat | 0 | gen_or_pat.rs:6:9:6:23 | TupleStructPat |
-| gen_or_pat.rs:6:9:6:38 | OrPat | 1 | gen_or_pat.rs:6:27:6:38 | PathPat |
+| gen_or_pat.rs:6:9:6:38 | ... \| ...::None | 0 | gen_or_pat.rs:6:9:6:23 | ...::Some(...) |
+| gen_or_pat.rs:6:9:6:38 | ... \| ...::None | 1 | gen_or_pat.rs:6:27:6:38 | ...::None |
diff --git a/rust/ql/test/extractor-tests/generated/Param/Param.expected b/rust/ql/test/extractor-tests/generated/Param/Param.expected
index e69de29bb2d..c8218bdaec5 100644
--- a/rust/ql/test/extractor-tests/generated/Param/Param.expected
+++ b/rust/ql/test/extractor-tests/generated/Param/Param.expected
@@ -0,0 +1 @@
+| gen_param.rs:5:12:5:15 | ...: T | getNumberOfAttrs: | 0 | hasTypeRepr: | yes | hasPat: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/Param/Param.ql b/rust/ql/test/extractor-tests/generated/Param/Param.ql
index 6e022c29db9..c471f2aeb39 100644
--- a/rust/ql/test/extractor-tests/generated/Param/Param.ql
+++ b/rust/ql/test/extractor-tests/generated/Param/Param.ql
@@ -2,11 +2,11 @@
 import codeql.rust.elements
 import TestUtils
 
-from Param x, int getNumberOfAttrs, string hasPat, string hasTy
+from Param x, int getNumberOfAttrs, string hasTypeRepr, string hasPat
 where
   toBeTested(x) and
   not x.isUnknown() and
   getNumberOfAttrs = x.getNumberOfAttrs() and
-  (if x.hasPat() then hasPat = "yes" else hasPat = "no") and
-  if x.hasTy() then hasTy = "yes" else hasTy = "no"
-select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasPat:", hasPat, "hasTy:", hasTy
+  (if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and
+  if x.hasPat() then hasPat = "yes" else hasPat = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasTypeRepr:", hasTypeRepr, "hasPat:", hasPat
diff --git a/rust/ql/test/extractor-tests/generated/Param/Param_getPat.expected b/rust/ql/test/extractor-tests/generated/Param/Param_getPat.expected
index e69de29bb2d..c42d7ce0b9f 100644
--- a/rust/ql/test/extractor-tests/generated/Param/Param_getPat.expected
+++ b/rust/ql/test/extractor-tests/generated/Param/Param_getPat.expected
@@ -0,0 +1 @@
+| gen_param.rs:5:12:5:15 | ...: T | gen_param.rs:5:12:5:12 | x |
diff --git a/rust/ql/test/extractor-tests/generated/Param/Param_getTypeRepr.expected b/rust/ql/test/extractor-tests/generated/Param/Param_getTypeRepr.expected
new file mode 100644
index 00000000000..10bf906af5d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Param/Param_getTypeRepr.expected
@@ -0,0 +1 @@
+| gen_param.rs:5:12:5:15 | ...: T | gen_param.rs:5:15:5:15 | T |
diff --git a/rust/ql/test/extractor-tests/generated/Param/Param_getTy.ql b/rust/ql/test/extractor-tests/generated/Param/Param_getTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/Param/Param_getTy.ql
rename to rust/ql/test/extractor-tests/generated/Param/Param_getTypeRepr.ql
index 360f8b65bd7..0e03e4b5118 100644
--- a/rust/ql/test/extractor-tests/generated/Param/Param_getTy.ql
+++ b/rust/ql/test/extractor-tests/generated/Param/Param_getTypeRepr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from Param x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/Param/gen_param.rs b/rust/ql/test/extractor-tests/generated/Param/gen_param.rs
index 5bc96d63219..679943f8aa7 100644
--- a/rust/ql/test/extractor-tests/generated/Param/gen_param.rs
+++ b/rust/ql/test/extractor-tests/generated/Param/gen_param.rs
@@ -1,6 +1,8 @@
 // generated by codegen, do not edit
 
 fn test_param() -> () {
-    // A Param. For example:
-    todo!()
+    // A parameter in a function or method. For example `x` in:
+    fn new(x: T) -> Foo<T> {
+      // ...
+    }
 }
diff --git a/rust/ql/test/extractor-tests/generated/ParenType/ParenType.ql b/rust/ql/test/extractor-tests/generated/ParenType/ParenType.ql
deleted file mode 100644
index e704767d631..00000000000
--- a/rust/ql/test/extractor-tests/generated/ParenType/ParenType.ql
+++ /dev/null
@@ -1,10 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from ParenType x, string hasTy
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  if x.hasTy() then hasTy = "yes" else hasTy = "no"
-select x, "hasTy:", hasTy
diff --git a/rust/ql/test/extractor-tests/generated/ParenType/ParenType_getTy.ql b/rust/ql/test/extractor-tests/generated/ParenType/ParenType_getTy.ql
deleted file mode 100644
index b472d03f718..00000000000
--- a/rust/ql/test/extractor-tests/generated/ParenType/ParenType_getTy.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from ParenType x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
diff --git a/rust/ql/test/extractor-tests/generated/ParenType/gen_paren_type.rs b/rust/ql/test/extractor-tests/generated/ParenType/gen_paren_type.rs
deleted file mode 100644
index ad07406451b..00000000000
--- a/rust/ql/test/extractor-tests/generated/ParenType/gen_paren_type.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_paren_type() -> () {
-    // A ParenType. For example:
-    todo!()
-}
diff --git a/rust/ql/test/extractor-tests/generated/ParenType/ParenType_getTy.expected b/rust/ql/test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/ParenType/ParenType_getTy.expected
rename to rust/ql/test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr.ql b/rust/ql/test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr.ql
new file mode 100644
index 00000000000..83a4f846add
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ParenTypeRepr x, string hasTypeRepr
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no"
+select x, "hasTypeRepr:", hasTypeRepr
diff --git a/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr_getAttr.expected b/rust/ql/test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/PathExpr/PathExpr_getAttr.expected
rename to rust/ql/test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr_getTypeRepr.ql b/rust/ql/test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr_getTypeRepr.ql
new file mode 100644
index 00000000000..2b3a274fc08
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr_getTypeRepr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ParenTypeRepr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/ParenTypeRepr/gen_paren_type_repr.rs b/rust/ql/test/extractor-tests/generated/ParenTypeRepr/gen_paren_type_repr.rs
new file mode 100644
index 00000000000..9e2577009da
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ParenTypeRepr/gen_paren_type_repr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_paren_type_repr() -> () {
+    // A ParenTypeRepr. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/Path/Path.expected b/rust/ql/test/extractor-tests/generated/Path/Path.expected
index db093224b76..7159a6d1f4e 100644
--- a/rust/ql/test/extractor-tests/generated/Path/Path.expected
+++ b/rust/ql/test/extractor-tests/generated/Path/Path.expected
@@ -1,2 +1,26 @@
-| gen_path.rs:5:5:5:7 | foo | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
-| gen_path.rs:5:5:5:12 | foo::bar | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | yes | hasPart: | yes |
+| gen_path.rs:5:9:5:18 | some_crate | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
+| gen_path.rs:5:9:5:31 | ...::some_module | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | yes | hasPart: | yes |
+| gen_path.rs:5:9:5:42 | ...::some_item | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | yes | hasPart: | yes |
+| gen_path.rs:6:5:6:7 | foo | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
+| gen_path.rs:6:5:6:12 | ...::bar | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | yes | hasPart: | yes |
+| gen_path_expr.rs:5:13:5:20 | variable | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
+| gen_path_expr.rs:6:13:6:15 | foo | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
+| gen_path_expr.rs:6:13:6:20 | ...::bar | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | yes | hasPart: | yes |
+| gen_path_expr.rs:7:13:7:15 | <...> | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
+| gen_path_expr.rs:7:13:7:20 | ...::foo | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | yes | hasPart: | yes |
+| gen_path_expr.rs:7:14:7:14 | T | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
+| gen_path_expr.rs:7:14:7:14 | T | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
+| gen_path_expr.rs:8:13:8:31 | <...> | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
+| gen_path_expr.rs:8:13:8:36 | ...::foo | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | yes | hasPart: | yes |
+| gen_path_expr.rs:8:14:8:21 | TypeRepr | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
+| gen_path_expr.rs:8:14:8:21 | TypeRepr | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
+| gen_path_pat.rs:5:11:5:11 | x | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
+| gen_path_pat.rs:6:9:6:11 | Foo | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
+| gen_path_pat.rs:6:9:6:16 | ...::Bar | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | yes | hasPart: | yes |
+| gen_path_type_repr.rs:5:14:5:16 | std | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
+| gen_path_type_repr.rs:5:14:5:29 | ...::collections | hasResolvedPath: | yes | hasResolvedCrateOrigin: | yes | hasQualifier: | yes | hasPart: | yes |
+| gen_path_type_repr.rs:5:14:5:48 | ...::HashMap::<...> | hasResolvedPath: | yes | hasResolvedCrateOrigin: | yes | hasQualifier: | yes | hasPart: | yes |
+| gen_path_type_repr.rs:5:40:5:42 | i32 | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
+| gen_path_type_repr.rs:5:45:5:47 | i32 | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
+| gen_path_type_repr.rs:6:14:6:14 | X | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | no | hasPart: | yes |
+| gen_path_type_repr.rs:6:14:6:20 | ...::Item | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasQualifier: | yes | hasPart: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathExpr.expected b/rust/ql/test/extractor-tests/generated/Path/PathExpr.expected
new file mode 100644
index 00000000000..4cfbc41c3c2
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Path/PathExpr.expected
@@ -0,0 +1,6 @@
+| gen_path.rs:6:5:6:12 | ...::bar | getNumberOfAttrs: | 0 | hasPath: | yes |
+| gen_path_expr.rs:5:13:5:20 | variable | getNumberOfAttrs: | 0 | hasPath: | yes |
+| gen_path_expr.rs:6:13:6:20 | ...::bar | getNumberOfAttrs: | 0 | hasPath: | yes |
+| gen_path_expr.rs:7:13:7:20 | ...::foo | getNumberOfAttrs: | 0 | hasPath: | yes |
+| gen_path_expr.rs:8:13:8:36 | ...::foo | getNumberOfAttrs: | 0 | hasPath: | yes |
+| gen_path_pat.rs:5:11:5:11 | x | getNumberOfAttrs: | 0 | hasPath: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr.ql b/rust/ql/test/extractor-tests/generated/Path/PathExpr.ql
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/PathExpr/PathExpr.ql
rename to rust/ql/test/extractor-tests/generated/Path/PathExpr.ql
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getGenericArgList.expected b/rust/ql/test/extractor-tests/generated/Path/PathExpr_getAttr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getGenericArgList.expected
rename to rust/ql/test/extractor-tests/generated/Path/PathExpr_getAttr.expected
diff --git a/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr_getAttr.ql b/rust/ql/test/extractor-tests/generated/Path/PathExpr_getAttr.ql
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/PathExpr/PathExpr_getAttr.ql
rename to rust/ql/test/extractor-tests/generated/Path/PathExpr_getAttr.ql
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathExpr_getPath.expected b/rust/ql/test/extractor-tests/generated/Path/PathExpr_getPath.expected
new file mode 100644
index 00000000000..e9680024dc1
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Path/PathExpr_getPath.expected
@@ -0,0 +1,6 @@
+| gen_path.rs:6:5:6:12 | ...::bar | gen_path.rs:6:5:6:12 | ...::bar |
+| gen_path_expr.rs:5:13:5:20 | variable | gen_path_expr.rs:5:13:5:20 | variable |
+| gen_path_expr.rs:6:13:6:20 | ...::bar | gen_path_expr.rs:6:13:6:20 | ...::bar |
+| gen_path_expr.rs:7:13:7:20 | ...::foo | gen_path_expr.rs:7:13:7:20 | ...::foo |
+| gen_path_expr.rs:8:13:8:36 | ...::foo | gen_path_expr.rs:8:13:8:36 | ...::foo |
+| gen_path_pat.rs:5:11:5:11 | x | gen_path_pat.rs:5:11:5:11 | x |
diff --git a/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr_getPath.ql b/rust/ql/test/extractor-tests/generated/Path/PathExpr_getPath.ql
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/PathExpr/PathExpr_getPath.ql
rename to rust/ql/test/extractor-tests/generated/Path/PathExpr_getPath.ql
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathPat.expected b/rust/ql/test/extractor-tests/generated/Path/PathPat.expected
new file mode 100644
index 00000000000..159f006eecb
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Path/PathPat.expected
@@ -0,0 +1 @@
+| gen_path_pat.rs:6:9:6:16 | ...::Bar | hasPath: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/PathPat/PathPat.ql b/rust/ql/test/extractor-tests/generated/Path/PathPat.ql
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/PathPat/PathPat.ql
rename to rust/ql/test/extractor-tests/generated/Path/PathPat.ql
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathPat_getPath.expected b/rust/ql/test/extractor-tests/generated/Path/PathPat_getPath.expected
new file mode 100644
index 00000000000..3a601023f3f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Path/PathPat_getPath.expected
@@ -0,0 +1 @@
+| gen_path_pat.rs:6:9:6:16 | ...::Bar | gen_path_pat.rs:6:9:6:16 | ...::Bar |
diff --git a/rust/ql/test/extractor-tests/generated/PathPat/PathPat_getPath.ql b/rust/ql/test/extractor-tests/generated/Path/PathPat_getPath.ql
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/PathPat/PathPat_getPath.ql
rename to rust/ql/test/extractor-tests/generated/Path/PathPat_getPath.ql
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathSegment.expected b/rust/ql/test/extractor-tests/generated/Path/PathSegment.expected
new file mode 100644
index 00000000000..1180aa8dd65
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Path/PathSegment.expected
@@ -0,0 +1,26 @@
+| gen_path.rs:5:9:5:18 | some_crate | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path.rs:5:21:5:31 | some_module | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path.rs:5:34:5:42 | some_item | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path.rs:6:5:6:7 | foo | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path.rs:6:10:6:12 | bar | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_expr.rs:5:13:5:20 | variable | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_expr.rs:6:13:6:15 | foo | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_expr.rs:6:18:6:20 | bar | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_expr.rs:7:13:7:15 | <...> | hasGenericArgList: | no | hasNameRef: | no | hasParamList: | no | hasPathType: | yes | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | yes |
+| gen_path_expr.rs:7:14:7:14 | T | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_expr.rs:7:14:7:14 | T | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_expr.rs:7:18:7:20 | foo | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_expr.rs:8:13:8:31 | <...> | hasGenericArgList: | no | hasNameRef: | no | hasParamList: | no | hasPathType: | yes | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | yes |
+| gen_path_expr.rs:8:14:8:21 | TypeRepr | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_expr.rs:8:14:8:21 | TypeRepr | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_expr.rs:8:34:8:36 | foo | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_pat.rs:5:11:5:11 | x | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_pat.rs:6:9:6:11 | Foo | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_pat.rs:6:14:6:16 | Bar | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_type_repr.rs:5:14:5:16 | std | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_type_repr.rs:5:19:5:29 | collections | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_type_repr.rs:5:32:5:48 | HashMap::<...> | hasGenericArgList: | yes | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_type_repr.rs:5:40:5:42 | i32 | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_type_repr.rs:5:45:5:47 | i32 | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_type_repr.rs:6:14:6:14 | X | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
+| gen_path_type_repr.rs:6:17:6:20 | Item | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTypeRepr: | no |
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment.ql b/rust/ql/test/extractor-tests/generated/Path/PathSegment.ql
similarity index 87%
rename from rust/ql/test/extractor-tests/generated/PathSegment/PathSegment.ql
rename to rust/ql/test/extractor-tests/generated/Path/PathSegment.ql
index cf18bedaced..3ac8218cf0b 100644
--- a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment.ql
+++ b/rust/ql/test/extractor-tests/generated/Path/PathSegment.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 from
   PathSegment x, string hasGenericArgList, string hasNameRef, string hasParamList,
-  string hasPathType, string hasRetType, string hasReturnTypeSyntax, string hasTy
+  string hasPathType, string hasRetType, string hasReturnTypeSyntax, string hasTypeRepr
 where
   toBeTested(x) and
   not x.isUnknown() and
@@ -14,7 +14,7 @@ where
   (if x.hasPathType() then hasPathType = "yes" else hasPathType = "no") and
   (if x.hasRetType() then hasRetType = "yes" else hasRetType = "no") and
   (if x.hasReturnTypeSyntax() then hasReturnTypeSyntax = "yes" else hasReturnTypeSyntax = "no") and
-  if x.hasTy() then hasTy = "yes" else hasTy = "no"
+  if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no"
 select x, "hasGenericArgList:", hasGenericArgList, "hasNameRef:", hasNameRef, "hasParamList:",
   hasParamList, "hasPathType:", hasPathType, "hasRetType:", hasRetType, "hasReturnTypeSyntax:",
-  hasReturnTypeSyntax, "hasTy:", hasTy
+  hasReturnTypeSyntax, "hasTypeRepr:", hasTypeRepr
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathSegment_getGenericArgList.expected b/rust/ql/test/extractor-tests/generated/Path/PathSegment_getGenericArgList.expected
new file mode 100644
index 00000000000..ff0110440ae
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Path/PathSegment_getGenericArgList.expected
@@ -0,0 +1 @@
+| gen_path_type_repr.rs:5:32:5:48 | HashMap::<...> | gen_path_type_repr.rs:5:39:5:48 | <...> |
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getGenericArgList.ql b/rust/ql/test/extractor-tests/generated/Path/PathSegment_getGenericArgList.ql
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getGenericArgList.ql
rename to rust/ql/test/extractor-tests/generated/Path/PathSegment_getGenericArgList.ql
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathSegment_getNameRef.expected b/rust/ql/test/extractor-tests/generated/Path/PathSegment_getNameRef.expected
new file mode 100644
index 00000000000..483cf12a378
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Path/PathSegment_getNameRef.expected
@@ -0,0 +1,24 @@
+| gen_path.rs:5:9:5:18 | some_crate | gen_path.rs:5:9:5:18 | some_crate |
+| gen_path.rs:5:21:5:31 | some_module | gen_path.rs:5:21:5:31 | some_module |
+| gen_path.rs:5:34:5:42 | some_item | gen_path.rs:5:34:5:42 | some_item |
+| gen_path.rs:6:5:6:7 | foo | gen_path.rs:6:5:6:7 | foo |
+| gen_path.rs:6:10:6:12 | bar | gen_path.rs:6:10:6:12 | bar |
+| gen_path_expr.rs:5:13:5:20 | variable | gen_path_expr.rs:5:13:5:20 | variable |
+| gen_path_expr.rs:6:13:6:15 | foo | gen_path_expr.rs:6:13:6:15 | foo |
+| gen_path_expr.rs:6:18:6:20 | bar | gen_path_expr.rs:6:18:6:20 | bar |
+| gen_path_expr.rs:7:14:7:14 | T | gen_path_expr.rs:7:14:7:14 | T |
+| gen_path_expr.rs:7:14:7:14 | T | gen_path_expr.rs:7:14:7:14 | T |
+| gen_path_expr.rs:7:18:7:20 | foo | gen_path_expr.rs:7:18:7:20 | foo |
+| gen_path_expr.rs:8:14:8:21 | TypeRepr | gen_path_expr.rs:8:14:8:21 | TypeRepr |
+| gen_path_expr.rs:8:14:8:21 | TypeRepr | gen_path_expr.rs:8:14:8:21 | TypeRepr |
+| gen_path_expr.rs:8:34:8:36 | foo | gen_path_expr.rs:8:34:8:36 | foo |
+| gen_path_pat.rs:5:11:5:11 | x | gen_path_pat.rs:5:11:5:11 | x |
+| gen_path_pat.rs:6:9:6:11 | Foo | gen_path_pat.rs:6:9:6:11 | Foo |
+| gen_path_pat.rs:6:14:6:16 | Bar | gen_path_pat.rs:6:14:6:16 | Bar |
+| gen_path_type_repr.rs:5:14:5:16 | std | gen_path_type_repr.rs:5:14:5:16 | std |
+| gen_path_type_repr.rs:5:19:5:29 | collections | gen_path_type_repr.rs:5:19:5:29 | collections |
+| gen_path_type_repr.rs:5:32:5:48 | HashMap::<...> | gen_path_type_repr.rs:5:32:5:38 | HashMap |
+| gen_path_type_repr.rs:5:40:5:42 | i32 | gen_path_type_repr.rs:5:40:5:42 | i32 |
+| gen_path_type_repr.rs:5:45:5:47 | i32 | gen_path_type_repr.rs:5:45:5:47 | i32 |
+| gen_path_type_repr.rs:6:14:6:14 | X | gen_path_type_repr.rs:6:14:6:14 | X |
+| gen_path_type_repr.rs:6:17:6:20 | Item | gen_path_type_repr.rs:6:17:6:20 | Item |
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getNameRef.ql b/rust/ql/test/extractor-tests/generated/Path/PathSegment_getNameRef.ql
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getNameRef.ql
rename to rust/ql/test/extractor-tests/generated/Path/PathSegment_getNameRef.ql
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getParamList.expected b/rust/ql/test/extractor-tests/generated/Path/PathSegment_getParamList.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getParamList.expected
rename to rust/ql/test/extractor-tests/generated/Path/PathSegment_getParamList.expected
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getParamList.ql b/rust/ql/test/extractor-tests/generated/Path/PathSegment_getParamList.ql
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getParamList.ql
rename to rust/ql/test/extractor-tests/generated/Path/PathSegment_getParamList.ql
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathSegment_getPathType.expected b/rust/ql/test/extractor-tests/generated/Path/PathSegment_getPathType.expected
new file mode 100644
index 00000000000..99ac97381b3
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Path/PathSegment_getPathType.expected
@@ -0,0 +1,2 @@
+| gen_path_expr.rs:7:13:7:15 | <...> | gen_path_expr.rs:7:14:7:14 | T |
+| gen_path_expr.rs:8:13:8:31 | <...> | gen_path_expr.rs:8:14:8:21 | TypeRepr |
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getPathType.ql b/rust/ql/test/extractor-tests/generated/Path/PathSegment_getPathType.ql
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getPathType.ql
rename to rust/ql/test/extractor-tests/generated/Path/PathSegment_getPathType.ql
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getRetType.expected b/rust/ql/test/extractor-tests/generated/Path/PathSegment_getRetType.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getRetType.expected
rename to rust/ql/test/extractor-tests/generated/Path/PathSegment_getRetType.expected
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getRetType.ql b/rust/ql/test/extractor-tests/generated/Path/PathSegment_getRetType.ql
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getRetType.ql
rename to rust/ql/test/extractor-tests/generated/Path/PathSegment_getRetType.ql
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getReturnTypeSyntax.expected b/rust/ql/test/extractor-tests/generated/Path/PathSegment_getReturnTypeSyntax.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getReturnTypeSyntax.expected
rename to rust/ql/test/extractor-tests/generated/Path/PathSegment_getReturnTypeSyntax.expected
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getReturnTypeSyntax.ql b/rust/ql/test/extractor-tests/generated/Path/PathSegment_getReturnTypeSyntax.ql
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getReturnTypeSyntax.ql
rename to rust/ql/test/extractor-tests/generated/Path/PathSegment_getReturnTypeSyntax.ql
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathSegment_getTypeRepr.expected b/rust/ql/test/extractor-tests/generated/Path/PathSegment_getTypeRepr.expected
new file mode 100644
index 00000000000..99ac97381b3
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Path/PathSegment_getTypeRepr.expected
@@ -0,0 +1,2 @@
+| gen_path_expr.rs:7:13:7:15 | <...> | gen_path_expr.rs:7:14:7:14 | T |
+| gen_path_expr.rs:8:13:8:31 | <...> | gen_path_expr.rs:8:14:8:21 | TypeRepr |
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getTy.ql b/rust/ql/test/extractor-tests/generated/Path/PathSegment_getTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getTy.ql
rename to rust/ql/test/extractor-tests/generated/Path/PathSegment_getTypeRepr.ql
index 6445000c2a4..98303f7f0fb 100644
--- a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getTy.ql
+++ b/rust/ql/test/extractor-tests/generated/Path/PathSegment_getTypeRepr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from PathSegment x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathTypeRef.expected b/rust/ql/test/extractor-tests/generated/Path/PathTypeRef.expected
new file mode 100644
index 00000000000..08c6bcb966d
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Path/PathTypeRef.expected
@@ -0,0 +1,8 @@
+| gen_path_expr.rs:7:14:7:14 | T | hasPath: | yes |
+| gen_path_expr.rs:7:14:7:14 | T | hasPath: | yes |
+| gen_path_expr.rs:8:14:8:20 | TypeRepr | hasPath: | yes |
+| gen_path_expr.rs:8:14:8:20 | TypeRepr | hasPath: | yes |
+| gen_path_type_ref.rs:5:14:5:48 | ...::HashMap::<...> | hasPath: | yes |
+| gen_path_type_ref.rs:5:40:5:42 | i32 | hasPath: | yes |
+| gen_path_type_ref.rs:5:45:5:47 | i32 | hasPath: | yes |
+| gen_path_type_ref.rs:6:14:6:20 | ...::Item | hasPath: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathTypeRef_getPath.expected b/rust/ql/test/extractor-tests/generated/Path/PathTypeRef_getPath.expected
new file mode 100644
index 00000000000..1c4f84c6a60
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Path/PathTypeRef_getPath.expected
@@ -0,0 +1,8 @@
+| gen_path_expr.rs:7:14:7:14 | T | gen_path_expr.rs:7:14:7:14 | T |
+| gen_path_expr.rs:7:14:7:14 | T | gen_path_expr.rs:7:14:7:14 | T |
+| gen_path_expr.rs:8:14:8:20 | TypeRepr | gen_path_expr.rs:8:14:8:20 | TypeRepr |
+| gen_path_expr.rs:8:14:8:20 | TypeRepr | gen_path_expr.rs:8:14:8:20 | TypeRepr |
+| gen_path_type_ref.rs:5:14:5:48 | ...::HashMap::<...> | gen_path_type_ref.rs:5:14:5:48 | ...::HashMap::<...> |
+| gen_path_type_ref.rs:5:40:5:42 | i32 | gen_path_type_ref.rs:5:40:5:42 | i32 |
+| gen_path_type_ref.rs:5:45:5:47 | i32 | gen_path_type_ref.rs:5:45:5:47 | i32 |
+| gen_path_type_ref.rs:6:14:6:20 | ...::Item | gen_path_type_ref.rs:6:14:6:20 | ...::Item |
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathTypeRepr.expected b/rust/ql/test/extractor-tests/generated/Path/PathTypeRepr.expected
new file mode 100644
index 00000000000..0cb1fa81a14
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Path/PathTypeRepr.expected
@@ -0,0 +1,8 @@
+| gen_path_expr.rs:7:14:7:14 | T | hasPath: | yes |
+| gen_path_expr.rs:7:14:7:14 | T | hasPath: | yes |
+| gen_path_expr.rs:8:14:8:21 | TypeRepr | hasPath: | yes |
+| gen_path_expr.rs:8:14:8:21 | TypeRepr | hasPath: | yes |
+| gen_path_type_repr.rs:5:14:5:48 | ...::HashMap::<...> | hasPath: | yes |
+| gen_path_type_repr.rs:5:40:5:42 | i32 | hasPath: | yes |
+| gen_path_type_repr.rs:5:45:5:47 | i32 | hasPath: | yes |
+| gen_path_type_repr.rs:6:14:6:20 | ...::Item | hasPath: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/PathType/PathType.ql b/rust/ql/test/extractor-tests/generated/Path/PathTypeRepr.ql
similarity index 85%
rename from rust/ql/test/extractor-tests/generated/PathType/PathType.ql
rename to rust/ql/test/extractor-tests/generated/Path/PathTypeRepr.ql
index a064955c56f..0be55070a1b 100644
--- a/rust/ql/test/extractor-tests/generated/PathType/PathType.ql
+++ b/rust/ql/test/extractor-tests/generated/Path/PathTypeRepr.ql
@@ -2,7 +2,7 @@
 import codeql.rust.elements
 import TestUtils
 
-from PathType x, string hasPath
+from PathTypeRepr x, string hasPath
 where
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathTypeRepr_getPath.expected b/rust/ql/test/extractor-tests/generated/Path/PathTypeRepr_getPath.expected
new file mode 100644
index 00000000000..ab0145486a9
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Path/PathTypeRepr_getPath.expected
@@ -0,0 +1,8 @@
+| gen_path_expr.rs:7:14:7:14 | T | gen_path_expr.rs:7:14:7:14 | T |
+| gen_path_expr.rs:7:14:7:14 | T | gen_path_expr.rs:7:14:7:14 | T |
+| gen_path_expr.rs:8:14:8:21 | TypeRepr | gen_path_expr.rs:8:14:8:21 | TypeRepr |
+| gen_path_expr.rs:8:14:8:21 | TypeRepr | gen_path_expr.rs:8:14:8:21 | TypeRepr |
+| gen_path_type_repr.rs:5:14:5:48 | ...::HashMap::<...> | gen_path_type_repr.rs:5:14:5:48 | ...::HashMap::<...> |
+| gen_path_type_repr.rs:5:40:5:42 | i32 | gen_path_type_repr.rs:5:40:5:42 | i32 |
+| gen_path_type_repr.rs:5:45:5:47 | i32 | gen_path_type_repr.rs:5:45:5:47 | i32 |
+| gen_path_type_repr.rs:6:14:6:20 | ...::Item | gen_path_type_repr.rs:6:14:6:20 | ...::Item |
diff --git a/rust/ql/test/extractor-tests/generated/PathType/PathType_getPath.ql b/rust/ql/test/extractor-tests/generated/Path/PathTypeRepr_getPath.ql
similarity index 88%
rename from rust/ql/test/extractor-tests/generated/PathType/PathType_getPath.ql
rename to rust/ql/test/extractor-tests/generated/Path/PathTypeRepr_getPath.ql
index 991efc31037..b90c858b4cf 100644
--- a/rust/ql/test/extractor-tests/generated/PathType/PathType_getPath.ql
+++ b/rust/ql/test/extractor-tests/generated/Path/PathTypeRepr_getPath.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from PathType x
+from PathTypeRepr x
 where toBeTested(x) and not x.isUnknown()
 select x, x.getPath()
diff --git a/rust/ql/test/extractor-tests/generated/Path/Path_getPart.expected b/rust/ql/test/extractor-tests/generated/Path/Path_getPart.expected
index 0e05956ea89..790050bbf51 100644
--- a/rust/ql/test/extractor-tests/generated/Path/Path_getPart.expected
+++ b/rust/ql/test/extractor-tests/generated/Path/Path_getPart.expected
@@ -1,2 +1,26 @@
-| gen_path.rs:5:5:5:7 | foo | gen_path.rs:5:5:5:7 | foo |
-| gen_path.rs:5:5:5:12 | foo::bar | gen_path.rs:5:10:5:12 | bar |
+| gen_path.rs:5:9:5:18 | some_crate | gen_path.rs:5:9:5:18 | some_crate |
+| gen_path.rs:5:9:5:31 | ...::some_module | gen_path.rs:5:21:5:31 | some_module |
+| gen_path.rs:5:9:5:42 | ...::some_item | gen_path.rs:5:34:5:42 | some_item |
+| gen_path.rs:6:5:6:7 | foo | gen_path.rs:6:5:6:7 | foo |
+| gen_path.rs:6:5:6:12 | ...::bar | gen_path.rs:6:10:6:12 | bar |
+| gen_path_expr.rs:5:13:5:20 | variable | gen_path_expr.rs:5:13:5:20 | variable |
+| gen_path_expr.rs:6:13:6:15 | foo | gen_path_expr.rs:6:13:6:15 | foo |
+| gen_path_expr.rs:6:13:6:20 | ...::bar | gen_path_expr.rs:6:18:6:20 | bar |
+| gen_path_expr.rs:7:13:7:15 | <...> | gen_path_expr.rs:7:13:7:15 | <...> |
+| gen_path_expr.rs:7:13:7:20 | ...::foo | gen_path_expr.rs:7:18:7:20 | foo |
+| gen_path_expr.rs:7:14:7:14 | T | gen_path_expr.rs:7:14:7:14 | T |
+| gen_path_expr.rs:7:14:7:14 | T | gen_path_expr.rs:7:14:7:14 | T |
+| gen_path_expr.rs:8:13:8:31 | <...> | gen_path_expr.rs:8:13:8:31 | <...> |
+| gen_path_expr.rs:8:13:8:36 | ...::foo | gen_path_expr.rs:8:34:8:36 | foo |
+| gen_path_expr.rs:8:14:8:21 | TypeRepr | gen_path_expr.rs:8:14:8:21 | TypeRepr |
+| gen_path_expr.rs:8:14:8:21 | TypeRepr | gen_path_expr.rs:8:14:8:21 | TypeRepr |
+| gen_path_pat.rs:5:11:5:11 | x | gen_path_pat.rs:5:11:5:11 | x |
+| gen_path_pat.rs:6:9:6:11 | Foo | gen_path_pat.rs:6:9:6:11 | Foo |
+| gen_path_pat.rs:6:9:6:16 | ...::Bar | gen_path_pat.rs:6:14:6:16 | Bar |
+| gen_path_type_repr.rs:5:14:5:16 | std | gen_path_type_repr.rs:5:14:5:16 | std |
+| gen_path_type_repr.rs:5:14:5:29 | ...::collections | gen_path_type_repr.rs:5:19:5:29 | collections |
+| gen_path_type_repr.rs:5:14:5:48 | ...::HashMap::<...> | gen_path_type_repr.rs:5:32:5:48 | HashMap::<...> |
+| gen_path_type_repr.rs:5:40:5:42 | i32 | gen_path_type_repr.rs:5:40:5:42 | i32 |
+| gen_path_type_repr.rs:5:45:5:47 | i32 | gen_path_type_repr.rs:5:45:5:47 | i32 |
+| gen_path_type_repr.rs:6:14:6:14 | X | gen_path_type_repr.rs:6:14:6:14 | X |
+| gen_path_type_repr.rs:6:14:6:20 | ...::Item | gen_path_type_repr.rs:6:17:6:20 | Item |
diff --git a/rust/ql/test/extractor-tests/generated/Path/Path_getQualifier.expected b/rust/ql/test/extractor-tests/generated/Path/Path_getQualifier.expected
index 44aa2ca5a00..de116eaca6a 100644
--- a/rust/ql/test/extractor-tests/generated/Path/Path_getQualifier.expected
+++ b/rust/ql/test/extractor-tests/generated/Path/Path_getQualifier.expected
@@ -1 +1,10 @@
-| gen_path.rs:5:5:5:12 | foo::bar | gen_path.rs:5:5:5:7 | foo |
+| gen_path.rs:5:9:5:31 | ...::some_module | gen_path.rs:5:9:5:18 | some_crate |
+| gen_path.rs:5:9:5:42 | ...::some_item | gen_path.rs:5:9:5:31 | ...::some_module |
+| gen_path.rs:6:5:6:12 | ...::bar | gen_path.rs:6:5:6:7 | foo |
+| gen_path_expr.rs:6:13:6:20 | ...::bar | gen_path_expr.rs:6:13:6:15 | foo |
+| gen_path_expr.rs:7:13:7:20 | ...::foo | gen_path_expr.rs:7:13:7:15 | <...> |
+| gen_path_expr.rs:8:13:8:36 | ...::foo | gen_path_expr.rs:8:13:8:31 | <...> |
+| gen_path_pat.rs:6:9:6:16 | ...::Bar | gen_path_pat.rs:6:9:6:11 | Foo |
+| gen_path_type_repr.rs:5:14:5:29 | ...::collections | gen_path_type_repr.rs:5:14:5:16 | std |
+| gen_path_type_repr.rs:5:14:5:48 | ...::HashMap::<...> | gen_path_type_repr.rs:5:14:5:29 | ...::collections |
+| gen_path_type_repr.rs:6:14:6:20 | ...::Item | gen_path_type_repr.rs:6:14:6:14 | X |
diff --git a/rust/ql/test/extractor-tests/generated/Path/Path_getResolvedCrateOrigin.expected b/rust/ql/test/extractor-tests/generated/Path/Path_getResolvedCrateOrigin.expected
index e69de29bb2d..3f821b1e080 100644
--- a/rust/ql/test/extractor-tests/generated/Path/Path_getResolvedCrateOrigin.expected
+++ b/rust/ql/test/extractor-tests/generated/Path/Path_getResolvedCrateOrigin.expected
@@ -0,0 +1,2 @@
+| gen_path_type_repr.rs:5:14:5:29 | ...::collections | lang:std |
+| gen_path_type_repr.rs:5:14:5:48 | ...::HashMap::<...> | lang:std |
diff --git a/rust/ql/test/extractor-tests/generated/Path/Path_getResolvedPath.expected b/rust/ql/test/extractor-tests/generated/Path/Path_getResolvedPath.expected
index e69de29bb2d..574e8ffb215 100644
--- a/rust/ql/test/extractor-tests/generated/Path/Path_getResolvedPath.expected
+++ b/rust/ql/test/extractor-tests/generated/Path/Path_getResolvedPath.expected
@@ -0,0 +1,2 @@
+| gen_path_type_repr.rs:5:14:5:29 | ...::collections | crate::collections |
+| gen_path_type_repr.rs:5:14:5:48 | ...::HashMap::<...> | crate::collections::hash::map::HashMap |
diff --git a/rust/ql/test/extractor-tests/generated/Path/gen_path.rs b/rust/ql/test/extractor-tests/generated/Path/gen_path.rs
index 3b3f054875a..de58e6978af 100644
--- a/rust/ql/test/extractor-tests/generated/Path/gen_path.rs
+++ b/rust/ql/test/extractor-tests/generated/Path/gen_path.rs
@@ -2,5 +2,6 @@
 
 fn test_path() -> () {
     // A path. For example:
+    use some_crate::some_module::some_item;
     foo::bar;
 }
diff --git a/rust/ql/test/extractor-tests/generated/PathExpr/gen_path_expr.rs b/rust/ql/test/extractor-tests/generated/Path/gen_path_expr.rs
similarity index 81%
rename from rust/ql/test/extractor-tests/generated/PathExpr/gen_path_expr.rs
rename to rust/ql/test/extractor-tests/generated/Path/gen_path_expr.rs
index dfd45ebd73f..dfc1b74308d 100644
--- a/rust/ql/test/extractor-tests/generated/PathExpr/gen_path_expr.rs
+++ b/rust/ql/test/extractor-tests/generated/Path/gen_path_expr.rs
@@ -5,5 +5,5 @@ fn test_path_expr() -> () {
     let x = variable;
     let x = foo::bar;
     let y = <T>::foo;
-    let z = <TypeRef as Trait>::foo;
+    let z = <TypeRepr as Trait>::foo;
 }
diff --git a/rust/ql/test/extractor-tests/generated/PathPat/gen_path_pat.rs b/rust/ql/test/extractor-tests/generated/Path/gen_path_pat.rs
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/PathPat/gen_path_pat.rs
rename to rust/ql/test/extractor-tests/generated/Path/gen_path_pat.rs
diff --git a/rust/ql/test/extractor-tests/generated/Path/gen_path_type_repr.rs b/rust/ql/test/extractor-tests/generated/Path/gen_path_type_repr.rs
new file mode 100644
index 00000000000..a3dc7ccb6e4
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Path/gen_path_type_repr.rs
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+
+fn test_path_type_repr() -> () {
+    // A type referring to a path. For example:
+    type X = std::collections::HashMap<i32, i32>;
+    type Y = X::Item;
+}
diff --git a/rust/ql/test/extractor-tests/generated/PathExpr/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/extractor-tests/generated/PathExpr/CONSISTENCY/DataFlowConsistency.expected
deleted file mode 100644
index c54360f7361..00000000000
--- a/rust/ql/test/extractor-tests/generated/PathExpr/CONSISTENCY/DataFlowConsistency.expected
+++ /dev/null
@@ -1,3 +0,0 @@
-uniqueNodeToString
-| gen_path_expr.rs:7:13:7:20 | (no string representation) | Node should have one toString but has 0. |
-| gen_path_expr.rs:8:13:8:35 | (no string representation) | Node should have one toString but has 0. |
diff --git a/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr.expected b/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr.expected
deleted file mode 100644
index a676396a2f9..00000000000
--- a/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-| gen_path_expr.rs:5:13:5:20 | variable | getNumberOfAttrs: | 0 | hasPath: | yes |
-| gen_path_expr.rs:6:13:6:20 | foo::bar | getNumberOfAttrs: | 0 | hasPath: | yes |
-| gen_path_expr.rs:7:13:7:20 | (no string representation) | getNumberOfAttrs: | 0 | hasPath: | yes |
-| gen_path_expr.rs:8:13:8:35 | (no string representation) | getNumberOfAttrs: | 0 | hasPath: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr_getPath.expected b/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr_getPath.expected
deleted file mode 100644
index a5765b5be60..00000000000
--- a/rust/ql/test/extractor-tests/generated/PathExpr/PathExpr_getPath.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-| gen_path_expr.rs:5:13:5:20 | variable | gen_path_expr.rs:5:13:5:20 | variable |
-| gen_path_expr.rs:6:13:6:20 | foo::bar | gen_path_expr.rs:6:13:6:20 | foo::bar |
-| gen_path_expr.rs:7:13:7:20 | (no string representation) | gen_path_expr.rs:7:13:7:20 | (no string representation) |
-| gen_path_expr.rs:8:13:8:35 | (no string representation) | gen_path_expr.rs:8:13:8:35 | (no string representation) |
diff --git a/rust/ql/test/extractor-tests/generated/PathPat/PathPat.expected b/rust/ql/test/extractor-tests/generated/PathPat/PathPat.expected
deleted file mode 100644
index 54845a7565c..00000000000
--- a/rust/ql/test/extractor-tests/generated/PathPat/PathPat.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_path_pat.rs:6:9:6:16 | PathPat | hasPath: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/PathPat/PathPat_getPath.expected b/rust/ql/test/extractor-tests/generated/PathPat/PathPat_getPath.expected
deleted file mode 100644
index d48ba6549db..00000000000
--- a/rust/ql/test/extractor-tests/generated/PathPat/PathPat_getPath.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_path_pat.rs:6:9:6:16 | PathPat | gen_path_pat.rs:6:9:6:16 | Foo::Bar |
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment.expected b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment.expected
deleted file mode 100644
index 32042fc6a59..00000000000
--- a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-| gen_path_segment.rs:5:5:5:8 | todo | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
-| gen_path_segment.rs:5:5:5:11 | $crate | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
-| gen_path_segment.rs:5:5:5:11 | panic | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
-| gen_path_segment.rs:5:5:5:11 | panicking | hasGenericArgList: | no | hasNameRef: | yes | hasParamList: | no | hasPathType: | no | hasRetType: | no | hasReturnTypeSyntax: | no | hasTy: | no |
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getNameRef.expected b/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getNameRef.expected
deleted file mode 100644
index 28346240d29..00000000000
--- a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getNameRef.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-| gen_path_segment.rs:5:5:5:8 | todo | gen_path_segment.rs:5:5:5:8 | todo |
-| gen_path_segment.rs:5:5:5:11 | $crate | gen_path_segment.rs:5:5:5:11 | $crate |
-| gen_path_segment.rs:5:5:5:11 | panic | gen_path_segment.rs:5:5:5:11 | panic |
-| gen_path_segment.rs:5:5:5:11 | panicking | gen_path_segment.rs:5:5:5:11 | panicking |
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/gen_path_segment.rs b/rust/ql/test/extractor-tests/generated/PathSegment/gen_path_segment.rs
deleted file mode 100644
index 0ab008b6a68..00000000000
--- a/rust/ql/test/extractor-tests/generated/PathSegment/gen_path_segment.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_path_segment() -> () {
-    // A PathSegment. For example:
-    todo!()
-}
diff --git a/rust/ql/test/extractor-tests/generated/PathType/gen_path_type.rs b/rust/ql/test/extractor-tests/generated/PathType/gen_path_type.rs
deleted file mode 100644
index e7666e2128a..00000000000
--- a/rust/ql/test/extractor-tests/generated/PathType/gen_path_type.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_path_type() -> () {
-    // A PathType. For example:
-    todo!()
-}
diff --git a/rust/ql/test/extractor-tests/generated/PtrType/PtrType_getTy.ql b/rust/ql/test/extractor-tests/generated/PtrType/PtrType_getTy.ql
deleted file mode 100644
index 4b42d47161a..00000000000
--- a/rust/ql/test/extractor-tests/generated/PtrType/PtrType_getTy.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from PtrType x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
diff --git a/rust/ql/test/extractor-tests/generated/PtrType/gen_ptr_type.rs b/rust/ql/test/extractor-tests/generated/PtrType/gen_ptr_type.rs
deleted file mode 100644
index 1a7e8960f1d..00000000000
--- a/rust/ql/test/extractor-tests/generated/PtrType/gen_ptr_type.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_ptr_type() -> () {
-    // A PtrType. For example:
-    todo!()
-}
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getPathType.expected b/rust/ql/test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getPathType.expected
rename to rust/ql/test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/PtrType/PtrType.ql b/rust/ql/test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr.ql
similarity index 54%
rename from rust/ql/test/extractor-tests/generated/PtrType/PtrType.ql
rename to rust/ql/test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr.ql
index 7dc004522c7..4cbda847f32 100644
--- a/rust/ql/test/extractor-tests/generated/PtrType/PtrType.ql
+++ b/rust/ql/test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr.ql
@@ -2,11 +2,11 @@
 import codeql.rust.elements
 import TestUtils
 
-from PtrType x, string isConst, string isMut, string hasTy
+from PtrTypeRepr x, string isConst, string isMut, string hasTypeRepr
 where
   toBeTested(x) and
   not x.isUnknown() and
   (if x.isConst() then isConst = "yes" else isConst = "no") and
   (if x.isMut() then isMut = "yes" else isMut = "no") and
-  if x.hasTy() then hasTy = "yes" else hasTy = "no"
-select x, "isConst:", isConst, "isMut:", isMut, "hasTy:", hasTy
+  if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no"
+select x, "isConst:", isConst, "isMut:", isMut, "hasTypeRepr:", hasTypeRepr
diff --git a/rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getTy.expected b/rust/ql/test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/PathSegment/PathSegment_getTy.expected
rename to rust/ql/test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr_getTypeRepr.ql b/rust/ql/test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr_getTypeRepr.ql
new file mode 100644
index 00000000000..8200677c2b5
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PtrTypeRepr/PtrTypeRepr_getTypeRepr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from PtrTypeRepr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/PtrTypeRepr/gen_ptr_type_repr.rs b/rust/ql/test/extractor-tests/generated/PtrTypeRepr/gen_ptr_type_repr.rs
new file mode 100644
index 00000000000..a071dfa0bbf
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/PtrTypeRepr/gen_ptr_type_repr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_ptr_type_repr() -> () {
+    // A PtrTypeRepr. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr.expected b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr.expected
index 6f222c18f03..7d8aeff6dfa 100644
--- a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr.expected
@@ -1,6 +1,6 @@
-| gen_range_expr.rs:5:13:5:18 | RangeExpr | getNumberOfAttrs: | 0 | hasEnd: | yes | hasOperatorName: | yes | hasStart: | yes |
-| gen_range_expr.rs:6:13:6:17 | RangeExpr | getNumberOfAttrs: | 0 | hasEnd: | yes | hasOperatorName: | yes | hasStart: | yes |
-| gen_range_expr.rs:7:13:7:16 | RangeExpr | getNumberOfAttrs: | 0 | hasEnd: | no | hasOperatorName: | yes | hasStart: | yes |
-| gen_range_expr.rs:8:13:8:16 | RangeExpr | getNumberOfAttrs: | 0 | hasEnd: | yes | hasOperatorName: | yes | hasStart: | no |
-| gen_range_expr.rs:9:13:9:17 | RangeExpr | getNumberOfAttrs: | 0 | hasEnd: | yes | hasOperatorName: | yes | hasStart: | no |
-| gen_range_expr.rs:10:13:10:14 | RangeExpr | getNumberOfAttrs: | 0 | hasEnd: | no | hasOperatorName: | yes | hasStart: | no |
+| gen_range_expr.rs:5:13:5:18 | 1..=10 | getNumberOfAttrs: | 0 | hasEnd: | yes | hasOperatorName: | yes | hasStart: | yes |
+| gen_range_expr.rs:6:13:6:17 | 1..10 | getNumberOfAttrs: | 0 | hasEnd: | yes | hasOperatorName: | yes | hasStart: | yes |
+| gen_range_expr.rs:7:13:7:16 | 10.. | getNumberOfAttrs: | 0 | hasEnd: | no | hasOperatorName: | yes | hasStart: | yes |
+| gen_range_expr.rs:8:13:8:16 | ..10 | getNumberOfAttrs: | 0 | hasEnd: | yes | hasOperatorName: | yes | hasStart: | no |
+| gen_range_expr.rs:9:13:9:17 | ..=10 | getNumberOfAttrs: | 0 | hasEnd: | yes | hasOperatorName: | yes | hasStart: | no |
+| gen_range_expr.rs:10:13:10:14 | .. | getNumberOfAttrs: | 0 | hasEnd: | no | hasOperatorName: | yes | hasStart: | no |
diff --git a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getEnd.expected b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getEnd.expected
index 101ae46138a..46f5dba778c 100644
--- a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getEnd.expected
+++ b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getEnd.expected
@@ -1,4 +1,4 @@
-| gen_range_expr.rs:5:13:5:18 | RangeExpr | gen_range_expr.rs:5:17:5:18 | 10 |
-| gen_range_expr.rs:6:13:6:17 | RangeExpr | gen_range_expr.rs:6:16:6:17 | 10 |
-| gen_range_expr.rs:8:13:8:16 | RangeExpr | gen_range_expr.rs:8:15:8:16 | 10 |
-| gen_range_expr.rs:9:13:9:17 | RangeExpr | gen_range_expr.rs:9:16:9:17 | 10 |
+| gen_range_expr.rs:5:13:5:18 | 1..=10 | gen_range_expr.rs:5:17:5:18 | 10 |
+| gen_range_expr.rs:6:13:6:17 | 1..10 | gen_range_expr.rs:6:16:6:17 | 10 |
+| gen_range_expr.rs:8:13:8:16 | ..10 | gen_range_expr.rs:8:15:8:16 | 10 |
+| gen_range_expr.rs:9:13:9:17 | ..=10 | gen_range_expr.rs:9:16:9:17 | 10 |
diff --git a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getOperatorName.expected b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getOperatorName.expected
index b0d778eb7bb..ee9172ac1ce 100644
--- a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getOperatorName.expected
+++ b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getOperatorName.expected
@@ -1,6 +1,6 @@
-| gen_range_expr.rs:5:13:5:18 | RangeExpr | ..= |
-| gen_range_expr.rs:6:13:6:17 | RangeExpr | .. |
-| gen_range_expr.rs:7:13:7:16 | RangeExpr | .. |
-| gen_range_expr.rs:8:13:8:16 | RangeExpr | .. |
-| gen_range_expr.rs:9:13:9:17 | RangeExpr | ..= |
-| gen_range_expr.rs:10:13:10:14 | RangeExpr | .. |
+| gen_range_expr.rs:5:13:5:18 | 1..=10 | ..= |
+| gen_range_expr.rs:6:13:6:17 | 1..10 | .. |
+| gen_range_expr.rs:7:13:7:16 | 10.. | .. |
+| gen_range_expr.rs:8:13:8:16 | ..10 | .. |
+| gen_range_expr.rs:9:13:9:17 | ..=10 | ..= |
+| gen_range_expr.rs:10:13:10:14 | .. | .. |
diff --git a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getStart.expected b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getStart.expected
index 79b34397efe..7f58ee5299f 100644
--- a/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getStart.expected
+++ b/rust/ql/test/extractor-tests/generated/RangeExpr/RangeExpr_getStart.expected
@@ -1,3 +1,3 @@
-| gen_range_expr.rs:5:13:5:18 | RangeExpr | gen_range_expr.rs:5:13:5:13 | 1 |
-| gen_range_expr.rs:6:13:6:17 | RangeExpr | gen_range_expr.rs:6:13:6:13 | 1 |
-| gen_range_expr.rs:7:13:7:16 | RangeExpr | gen_range_expr.rs:7:13:7:14 | 10 |
+| gen_range_expr.rs:5:13:5:18 | 1..=10 | gen_range_expr.rs:5:13:5:13 | 1 |
+| gen_range_expr.rs:6:13:6:17 | 1..10 | gen_range_expr.rs:6:13:6:13 | 1 |
+| gen_range_expr.rs:7:13:7:16 | 10.. | gen_range_expr.rs:7:13:7:14 | 10 |
diff --git a/rust/ql/test/extractor-tests/generated/RangePat/RangePat_getEnd.expected b/rust/ql/test/extractor-tests/generated/RangePat/RangePat_getEnd.expected
index 591b8d9093e..38ded3fb940 100644
--- a/rust/ql/test/extractor-tests/generated/RangePat/RangePat_getEnd.expected
+++ b/rust/ql/test/extractor-tests/generated/RangePat/RangePat_getEnd.expected
@@ -1,2 +1,2 @@
-| gen_range_pat.rs:6:9:6:12 | RangePat | gen_range_pat.rs:6:11:6:12 | LiteralPat |
-| gen_range_pat.rs:7:9:7:15 | RangePat | gen_range_pat.rs:7:14:7:15 | LiteralPat |
+| gen_range_pat.rs:6:9:6:12 | RangePat | gen_range_pat.rs:6:11:6:12 | 15 |
+| gen_range_pat.rs:7:9:7:15 | RangePat | gen_range_pat.rs:7:14:7:15 | 25 |
diff --git a/rust/ql/test/extractor-tests/generated/RangePat/RangePat_getStart.expected b/rust/ql/test/extractor-tests/generated/RangePat/RangePat_getStart.expected
index ef6a8ea2121..ac6eadaf08c 100644
--- a/rust/ql/test/extractor-tests/generated/RangePat/RangePat_getStart.expected
+++ b/rust/ql/test/extractor-tests/generated/RangePat/RangePat_getStart.expected
@@ -1,2 +1,2 @@
-| gen_range_pat.rs:7:9:7:15 | RangePat | gen_range_pat.rs:7:9:7:10 | LiteralPat |
-| gen_range_pat.rs:8:9:8:12 | RangePat | gen_range_pat.rs:8:9:8:10 | LiteralPat |
+| gen_range_pat.rs:7:9:7:15 | RangePat | gen_range_pat.rs:7:9:7:10 | 16 |
+| gen_range_pat.rs:8:9:8:12 | RangePat | gen_range_pat.rs:8:9:8:10 | 26 |
diff --git a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr.expected b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr.expected
index d30c4ef70e5..445b906bf88 100644
--- a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr.expected
@@ -1,4 +1,4 @@
-| gen_record_expr.rs:5:17:5:34 | RecordExpr | hasPath: | yes | hasRecordExprFieldList: | yes |
-| gen_record_expr.rs:6:18:6:38 | RecordExpr | hasPath: | yes | hasRecordExprFieldList: | yes |
-| gen_record_expr.rs:7:5:7:22 | RecordExpr | hasPath: | yes | hasRecordExprFieldList: | yes |
-| gen_record_expr.rs:8:5:8:14 | RecordExpr | hasPath: | yes | hasRecordExprFieldList: | yes |
+| gen_record_expr.rs:5:17:5:34 | Foo {...} | hasPath: | yes | hasRecordExprFieldList: | yes |
+| gen_record_expr.rs:6:18:6:38 | Foo {...} | hasPath: | yes | hasRecordExprFieldList: | yes |
+| gen_record_expr.rs:7:5:7:22 | Foo {...} | hasPath: | yes | hasRecordExprFieldList: | yes |
+| gen_record_expr.rs:8:5:8:14 | Foo {...} | hasPath: | yes | hasRecordExprFieldList: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getPath.expected b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getPath.expected
index 91d4f5cb0b5..5aad8aad60c 100644
--- a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getPath.expected
+++ b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getPath.expected
@@ -1,4 +1,4 @@
-| gen_record_expr.rs:5:17:5:34 | RecordExpr | gen_record_expr.rs:5:17:5:19 | Foo |
-| gen_record_expr.rs:6:18:6:38 | RecordExpr | gen_record_expr.rs:6:18:6:20 | Foo |
-| gen_record_expr.rs:7:5:7:22 | RecordExpr | gen_record_expr.rs:7:5:7:7 | Foo |
-| gen_record_expr.rs:8:5:8:14 | RecordExpr | gen_record_expr.rs:8:5:8:7 | Foo |
+| gen_record_expr.rs:5:17:5:34 | Foo {...} | gen_record_expr.rs:5:17:5:19 | Foo |
+| gen_record_expr.rs:6:18:6:38 | Foo {...} | gen_record_expr.rs:6:18:6:20 | Foo |
+| gen_record_expr.rs:7:5:7:22 | Foo {...} | gen_record_expr.rs:7:5:7:7 | Foo |
+| gen_record_expr.rs:8:5:8:14 | Foo {...} | gen_record_expr.rs:8:5:8:7 | Foo |
diff --git a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getRecordExprFieldList.expected b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getRecordExprFieldList.expected
index d00bf3935d3..79d18cac3b0 100644
--- a/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getRecordExprFieldList.expected
+++ b/rust/ql/test/extractor-tests/generated/RecordExpr/RecordExpr_getRecordExprFieldList.expected
@@ -1,4 +1,4 @@
-| gen_record_expr.rs:5:17:5:34 | RecordExpr | gen_record_expr.rs:5:21:5:34 | RecordExprFieldList |
-| gen_record_expr.rs:6:18:6:38 | RecordExpr | gen_record_expr.rs:6:22:6:38 | RecordExprFieldList |
-| gen_record_expr.rs:7:5:7:22 | RecordExpr | gen_record_expr.rs:7:9:7:22 | RecordExprFieldList |
-| gen_record_expr.rs:8:5:8:14 | RecordExpr | gen_record_expr.rs:8:9:8:14 | RecordExprFieldList |
+| gen_record_expr.rs:5:17:5:34 | Foo {...} | gen_record_expr.rs:5:21:5:34 | RecordExprFieldList |
+| gen_record_expr.rs:6:18:6:38 | Foo {...} | gen_record_expr.rs:6:22:6:38 | RecordExprFieldList |
+| gen_record_expr.rs:7:5:7:22 | Foo {...} | gen_record_expr.rs:7:9:7:22 | RecordExprFieldList |
+| gen_record_expr.rs:8:5:8:14 | Foo {...} | gen_record_expr.rs:8:9:8:14 | RecordExprFieldList |
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField.expected b/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField.expected
index 79ed3875918..46e7ce811bb 100644
--- a/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField.expected
+++ b/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField.expected
@@ -1,2 +1,2 @@
-| gen_record_expr_field.rs:5:11:5:14 | RecordExprField | getNumberOfAttrs: | 0 | hasExpr: | yes | hasNameRef: | yes |
-| gen_record_expr_field.rs:5:17:5:20 | RecordExprField | getNumberOfAttrs: | 0 | hasExpr: | yes | hasNameRef: | yes |
+| gen_record_expr_field.rs:5:11:5:14 | a: 1 | getNumberOfAttrs: | 0 | hasExpr: | yes | hasNameRef: | yes |
+| gen_record_expr_field.rs:5:17:5:20 | b: 2 | getNumberOfAttrs: | 0 | hasExpr: | yes | hasNameRef: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getExpr.expected b/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getExpr.expected
index ec096d00a31..cfb89242449 100644
--- a/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getExpr.expected
@@ -1,2 +1,2 @@
-| gen_record_expr_field.rs:5:11:5:14 | RecordExprField | gen_record_expr_field.rs:5:14:5:14 | 1 |
-| gen_record_expr_field.rs:5:17:5:20 | RecordExprField | gen_record_expr_field.rs:5:20:5:20 | 2 |
+| gen_record_expr_field.rs:5:11:5:14 | a: 1 | gen_record_expr_field.rs:5:14:5:14 | 1 |
+| gen_record_expr_field.rs:5:17:5:20 | b: 2 | gen_record_expr_field.rs:5:20:5:20 | 2 |
diff --git a/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getNameRef.expected b/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getNameRef.expected
index 081e3ccac56..d0a3f82cd9d 100644
--- a/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getNameRef.expected
+++ b/rust/ql/test/extractor-tests/generated/RecordExprField/RecordExprField_getNameRef.expected
@@ -1,2 +1,2 @@
-| gen_record_expr_field.rs:5:11:5:14 | RecordExprField | gen_record_expr_field.rs:5:11:5:11 | a |
-| gen_record_expr_field.rs:5:17:5:20 | RecordExprField | gen_record_expr_field.rs:5:17:5:17 | b |
+| gen_record_expr_field.rs:5:11:5:14 | a: 1 | gen_record_expr_field.rs:5:11:5:11 | a |
+| gen_record_expr_field.rs:5:17:5:20 | b: 2 | gen_record_expr_field.rs:5:17:5:17 | b |
diff --git a/rust/ql/test/extractor-tests/generated/RecordField/RecordField.ql b/rust/ql/test/extractor-tests/generated/RecordField/RecordField.ql
index a54b29b8215..6cb0510df2c 100644
--- a/rust/ql/test/extractor-tests/generated/RecordField/RecordField.ql
+++ b/rust/ql/test/extractor-tests/generated/RecordField/RecordField.ql
@@ -2,13 +2,13 @@
 import codeql.rust.elements
 import TestUtils
 
-from RecordField x, int getNumberOfAttrs, string hasName, string hasTy, string hasVisibility
+from RecordField x, int getNumberOfAttrs, string hasName, string hasTypeRepr, string hasVisibility
 where
   toBeTested(x) and
   not x.isUnknown() and
   getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.hasName() then hasName = "yes" else hasName = "no") and
-  (if x.hasTy() then hasTy = "yes" else hasTy = "no") and
+  (if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and
   if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no"
-select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasName:", hasName, "hasTy:", hasTy,
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasName:", hasName, "hasTypeRepr:", hasTypeRepr,
   "hasVisibility:", hasVisibility
diff --git a/rust/ql/test/extractor-tests/generated/PathType/PathType.expected b/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/PathType/PathType.expected
rename to rust/ql/test/extractor-tests/generated/RecordField/RecordField_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getTy.ql b/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/RecordField/RecordField_getTy.ql
rename to rust/ql/test/extractor-tests/generated/RecordField/RecordField_getTypeRepr.ql
index 1abbb150b25..ff17c17135b 100644
--- a/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getTy.ql
+++ b/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getTypeRepr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from RecordField x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat.expected b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat.expected
index 62cd3eb3c37..8d7f96229ad 100644
--- a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat.expected
+++ b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat.expected
@@ -1,2 +1,2 @@
-| gen_record_pat.rs:6:9:6:26 | RecordPat | hasPath: | yes | hasRecordPatFieldList: | yes |
-| gen_record_pat.rs:7:9:7:18 | RecordPat | hasPath: | yes | hasRecordPatFieldList: | yes |
+| gen_record_pat.rs:6:9:6:26 | Foo {...} | hasPath: | yes | hasRecordPatFieldList: | yes |
+| gen_record_pat.rs:7:9:7:18 | Foo {...} | hasPath: | yes | hasRecordPatFieldList: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getPath.expected b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getPath.expected
index a9e0be01d5b..7cd2f51d9eb 100644
--- a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getPath.expected
+++ b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getPath.expected
@@ -1,2 +1,2 @@
-| gen_record_pat.rs:6:9:6:26 | RecordPat | gen_record_pat.rs:6:9:6:11 | Foo |
-| gen_record_pat.rs:7:9:7:18 | RecordPat | gen_record_pat.rs:7:9:7:11 | Foo |
+| gen_record_pat.rs:6:9:6:26 | Foo {...} | gen_record_pat.rs:6:9:6:11 | Foo |
+| gen_record_pat.rs:7:9:7:18 | Foo {...} | gen_record_pat.rs:7:9:7:11 | Foo |
diff --git a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getRecordPatFieldList.expected b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getRecordPatFieldList.expected
index 86ba10ed9a3..bad0003c07b 100644
--- a/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getRecordPatFieldList.expected
+++ b/rust/ql/test/extractor-tests/generated/RecordPat/RecordPat_getRecordPatFieldList.expected
@@ -1,2 +1,2 @@
-| gen_record_pat.rs:6:9:6:26 | RecordPat | gen_record_pat.rs:6:13:6:26 | RecordPatFieldList |
-| gen_record_pat.rs:7:9:7:18 | RecordPat | gen_record_pat.rs:7:13:7:18 | RecordPatFieldList |
+| gen_record_pat.rs:6:9:6:26 | Foo {...} | gen_record_pat.rs:6:13:6:26 | RecordPatFieldList |
+| gen_record_pat.rs:7:9:7:18 | Foo {...} | gen_record_pat.rs:7:13:7:18 | RecordPatFieldList |
diff --git a/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getPat.expected b/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getPat.expected
index a3ac24ec52b..1fa8a0f8bb7 100644
--- a/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getPat.expected
+++ b/rust/ql/test/extractor-tests/generated/RecordPatField/RecordPatField_getPat.expected
@@ -1,2 +1,2 @@
-| gen_record_pat_field.rs:5:15:5:18 | RecordPatField | gen_record_pat_field.rs:5:18:5:18 | LiteralPat |
-| gen_record_pat_field.rs:5:21:5:24 | RecordPatField | gen_record_pat_field.rs:5:24:5:24 | LiteralPat |
+| gen_record_pat_field.rs:5:15:5:18 | RecordPatField | gen_record_pat_field.rs:5:18:5:18 | 1 |
+| gen_record_pat_field.rs:5:21:5:24 | RecordPatField | gen_record_pat_field.rs:5:24:5:24 | 2 |
diff --git a/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.expected b/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.expected
index d4c75d9a79a..412f8214206 100644
--- a/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr.expected
@@ -1,4 +1,4 @@
-| gen_ref_expr.rs:5:25:5:28 | RefExpr | getNumberOfAttrs: | 0 | hasExpr: | yes | isConst: | no | isMut: | no | isRaw: | no |
-| gen_ref_expr.rs:6:23:6:30 | RefExpr | getNumberOfAttrs: | 0 | hasExpr: | yes | isConst: | no | isMut: | yes | isRaw: | no |
-| gen_ref_expr.rs:7:35:7:48 | RefExpr | getNumberOfAttrs: | 0 | hasExpr: | yes | isConst: | yes | isMut: | no | isRaw: | yes |
-| gen_ref_expr.rs:8:33:8:44 | RefExpr | getNumberOfAttrs: | 0 | hasExpr: | yes | isConst: | no | isMut: | yes | isRaw: | yes |
+| gen_ref_expr.rs:5:25:5:28 | &foo | getNumberOfAttrs: | 0 | hasExpr: | yes | isConst: | no | isMut: | no | isRaw: | no |
+| gen_ref_expr.rs:6:23:6:30 | &mut foo | getNumberOfAttrs: | 0 | hasExpr: | yes | isConst: | no | isMut: | yes | isRaw: | no |
+| gen_ref_expr.rs:7:35:7:48 | &raw const foo | getNumberOfAttrs: | 0 | hasExpr: | yes | isConst: | yes | isMut: | no | isRaw: | yes |
+| gen_ref_expr.rs:8:33:8:44 | &raw mut foo | getNumberOfAttrs: | 0 | hasExpr: | yes | isConst: | no | isMut: | yes | isRaw: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr_getExpr.expected
index 571986ecf10..7709668f6fd 100644
--- a/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr_getExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/RefExpr/RefExpr_getExpr.expected
@@ -1,4 +1,4 @@
-| gen_ref_expr.rs:5:25:5:28 | RefExpr | gen_ref_expr.rs:5:26:5:28 | foo |
-| gen_ref_expr.rs:6:23:6:30 | RefExpr | gen_ref_expr.rs:6:28:6:30 | foo |
-| gen_ref_expr.rs:7:35:7:48 | RefExpr | gen_ref_expr.rs:7:46:7:48 | foo |
-| gen_ref_expr.rs:8:33:8:44 | RefExpr | gen_ref_expr.rs:8:42:8:44 | foo |
+| gen_ref_expr.rs:5:25:5:28 | &foo | gen_ref_expr.rs:5:26:5:28 | foo |
+| gen_ref_expr.rs:6:23:6:30 | &mut foo | gen_ref_expr.rs:6:28:6:30 | foo |
+| gen_ref_expr.rs:7:35:7:48 | &raw const foo | gen_ref_expr.rs:7:46:7:48 | foo |
+| gen_ref_expr.rs:8:33:8:44 | &raw mut foo | gen_ref_expr.rs:8:42:8:44 | foo |
diff --git a/rust/ql/test/extractor-tests/generated/RefPat/RefPat.expected b/rust/ql/test/extractor-tests/generated/RefPat/RefPat.expected
index c2fc3416297..a9dfaf87456 100644
--- a/rust/ql/test/extractor-tests/generated/RefPat/RefPat.expected
+++ b/rust/ql/test/extractor-tests/generated/RefPat/RefPat.expected
@@ -1,2 +1,2 @@
-| gen_ref_pat.rs:6:9:6:28 | RefPat | isMut: | yes | hasPat: | yes |
-| gen_ref_pat.rs:7:9:7:21 | RefPat | isMut: | no | hasPat: | yes |
+| gen_ref_pat.rs:6:9:6:28 | &mut ... | isMut: | yes | hasPat: | yes |
+| gen_ref_pat.rs:7:9:7:21 | &...::None | isMut: | no | hasPat: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/RefPat/RefPat_getPat.expected b/rust/ql/test/extractor-tests/generated/RefPat/RefPat_getPat.expected
index 891c3c8216e..029fd9fa172 100644
--- a/rust/ql/test/extractor-tests/generated/RefPat/RefPat_getPat.expected
+++ b/rust/ql/test/extractor-tests/generated/RefPat/RefPat_getPat.expected
@@ -1,2 +1,2 @@
-| gen_ref_pat.rs:6:9:6:28 | RefPat | gen_ref_pat.rs:6:14:6:28 | TupleStructPat |
-| gen_ref_pat.rs:7:9:7:21 | RefPat | gen_ref_pat.rs:7:10:7:21 | PathPat |
+| gen_ref_pat.rs:6:9:6:28 | &mut ... | gen_ref_pat.rs:6:14:6:28 | ...::Some(...) |
+| gen_ref_pat.rs:7:9:7:21 | &...::None | gen_ref_pat.rs:7:10:7:21 | ...::None |
diff --git a/rust/ql/test/extractor-tests/generated/RefType/RefType_getTy.ql b/rust/ql/test/extractor-tests/generated/RefType/RefType_getTy.ql
deleted file mode 100644
index 43df7ca037c..00000000000
--- a/rust/ql/test/extractor-tests/generated/RefType/RefType_getTy.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RefType x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
diff --git a/rust/ql/test/extractor-tests/generated/RefType/gen_ref_type.rs b/rust/ql/test/extractor-tests/generated/RefType/gen_ref_type.rs
deleted file mode 100644
index dacb6fc482d..00000000000
--- a/rust/ql/test/extractor-tests/generated/RefType/gen_ref_type.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_ref_type() -> () {
-    // A RefType. For example:
-    todo!()
-}
diff --git a/rust/ql/test/extractor-tests/generated/PathType/PathType_getPath.expected b/rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/PathType/PathType_getPath.expected
rename to rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/RefType/RefType.ql b/rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr.ql
similarity index 54%
rename from rust/ql/test/extractor-tests/generated/RefType/RefType.ql
rename to rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr.ql
index 1a0df7a0b98..e60d7faa8ed 100644
--- a/rust/ql/test/extractor-tests/generated/RefType/RefType.ql
+++ b/rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr.ql
@@ -2,11 +2,11 @@
 import codeql.rust.elements
 import TestUtils
 
-from RefType x, string isMut, string hasLifetime, string hasTy
+from RefTypeRepr x, string isMut, string hasLifetime, string hasTypeRepr
 where
   toBeTested(x) and
   not x.isUnknown() and
   (if x.isMut() then isMut = "yes" else isMut = "no") and
   (if x.hasLifetime() then hasLifetime = "yes" else hasLifetime = "no") and
-  if x.hasTy() then hasTy = "yes" else hasTy = "no"
-select x, "isMut:", isMut, "hasLifetime:", hasLifetime, "hasTy:", hasTy
+  if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no"
+select x, "isMut:", isMut, "hasLifetime:", hasLifetime, "hasTypeRepr:", hasTypeRepr
diff --git a/rust/ql/test/extractor-tests/generated/PtrType/PtrType.expected b/rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr_getLifetime.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/PtrType/PtrType.expected
rename to rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr_getLifetime.expected
diff --git a/rust/ql/test/extractor-tests/generated/RefType/RefType_getLifetime.ql b/rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr_getLifetime.ql
similarity index 88%
rename from rust/ql/test/extractor-tests/generated/RefType/RefType_getLifetime.ql
rename to rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr_getLifetime.ql
index 897c4ef519d..9d857300ea4 100644
--- a/rust/ql/test/extractor-tests/generated/RefType/RefType_getLifetime.ql
+++ b/rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr_getLifetime.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from RefType x
+from RefTypeRepr x
 where toBeTested(x) and not x.isUnknown()
 select x, x.getLifetime()
diff --git a/rust/ql/test/extractor-tests/generated/PtrType/PtrType_getTy.expected b/rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/PtrType/PtrType_getTy.expected
rename to rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr_getTypeRepr.ql b/rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr_getTypeRepr.ql
new file mode 100644
index 00000000000..1e04fa75ab3
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RefTypeRepr/RefTypeRepr_getTypeRepr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RefTypeRepr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/RefTypeRepr/gen_ref_type_repr.rs b/rust/ql/test/extractor-tests/generated/RefTypeRepr/gen_ref_type_repr.rs
new file mode 100644
index 00000000000..083e0817fbf
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RefTypeRepr/gen_ref_type_repr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_ref_type_repr() -> () {
+    // A RefTypeRepr. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/RetType/RetType.expected b/rust/ql/test/extractor-tests/generated/RetType/RetType.expected
deleted file mode 100644
index 726fcffd1d6..00000000000
--- a/rust/ql/test/extractor-tests/generated/RetType/RetType.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_ret_type.rs:3:20:3:24 | RetType | hasTy: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/RetType/RetType.ql b/rust/ql/test/extractor-tests/generated/RetType/RetType.ql
deleted file mode 100644
index c2fd2818d85..00000000000
--- a/rust/ql/test/extractor-tests/generated/RetType/RetType.ql
+++ /dev/null
@@ -1,10 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RetType x, string hasTy
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  if x.hasTy() then hasTy = "yes" else hasTy = "no"
-select x, "hasTy:", hasTy
diff --git a/rust/ql/test/extractor-tests/generated/RetType/RetType_getTy.expected b/rust/ql/test/extractor-tests/generated/RetType/RetType_getTy.expected
deleted file mode 100644
index e8e62fa58ec..00000000000
--- a/rust/ql/test/extractor-tests/generated/RetType/RetType_getTy.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_ret_type.rs:3:20:3:24 | RetType | gen_ret_type.rs:3:23:3:24 | TupleType |
diff --git a/rust/ql/test/extractor-tests/generated/RetType/RetType_getTy.ql b/rust/ql/test/extractor-tests/generated/RetType/RetType_getTy.ql
deleted file mode 100644
index 5163cb62b2f..00000000000
--- a/rust/ql/test/extractor-tests/generated/RetType/RetType_getTy.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from RetType x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
diff --git a/rust/ql/test/extractor-tests/generated/RetType/gen_ret_type.rs b/rust/ql/test/extractor-tests/generated/RetType/gen_ret_type.rs
deleted file mode 100644
index 146766cefe3..00000000000
--- a/rust/ql/test/extractor-tests/generated/RetType/gen_ret_type.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_ret_type() -> () {
-    // A RetType. For example:
-    todo!()
-}
diff --git a/rust/ql/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr.expected b/rust/ql/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr.expected
new file mode 100644
index 00000000000..fb87db7cabe
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr.expected
@@ -0,0 +1,2 @@
+| gen_ret_type_repr.rs:3:25:3:29 | RetTypeRepr | hasTypeRepr: | yes |
+
diff --git a/rust/ql/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr.ql b/rust/ql/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr.ql
new file mode 100644
index 00000000000..d03f9d4f1b6
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RetTypeRepr x, string hasTypeRepr
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no"
+select x, "hasTypeRepr:", hasTypeRepr
diff --git a/rust/ql/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr_getTypeRepr.expected b/rust/ql/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr_getTypeRepr.expected
new file mode 100644
index 00000000000..967da637efb
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr_getTypeRepr.expected
@@ -0,0 +1 @@
+| gen_ret_type_repr.rs:3:25:3:29 | RetTypeRepr | gen_ret_type_repr.rs:3:28:3:29 | TupleTypeRepr |
diff --git a/rust/ql/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr_getTypeRepr.ql b/rust/ql/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr_getTypeRepr.ql
new file mode 100644
index 00000000000..b2a7bf73d76
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RetTypeRepr/RetTypeRepr_getTypeRepr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from RetTypeRepr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/RetTypeRepr/gen_ret_type_repr.rs b/rust/ql/test/extractor-tests/generated/RetTypeRepr/gen_ret_type_repr.rs
new file mode 100644
index 00000000000..4c3b8a6aaf0
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/RetTypeRepr/gen_ret_type_repr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_ret_type_repr() -> () {
+    // A RetTypeRepr. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr.expected b/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr.expected
index dbf54e0f49b..83220773989 100644
--- a/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr.expected
@@ -1,2 +1,2 @@
-| gen_return_expr.rs:5:5:5:13 | ReturnExpr | getNumberOfAttrs: | 0 | hasExpr: | yes |
-| gen_return_expr.rs:8:5:8:10 | ReturnExpr | getNumberOfAttrs: | 0 | hasExpr: | no |
+| gen_return_expr.rs:5:5:5:13 | return 42 | getNumberOfAttrs: | 0 | hasExpr: | yes |
+| gen_return_expr.rs:8:5:8:10 | return | getNumberOfAttrs: | 0 | hasExpr: | no |
diff --git a/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr_getExpr.expected
index 2e1a4a8f8ce..c75ecd0b23c 100644
--- a/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr_getExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/ReturnExpr/ReturnExpr_getExpr.expected
@@ -1 +1 @@
-| gen_return_expr.rs:5:5:5:13 | ReturnExpr | gen_return_expr.rs:5:12:5:13 | 42 |
+| gen_return_expr.rs:5:5:5:13 | return 42 | gen_return_expr.rs:5:12:5:13 | 42 |
diff --git a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.expected b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.expected
index e69de29bb2d..6fd67c90f3b 100644
--- a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.expected
+++ b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.expected
@@ -0,0 +1 @@
+| gen_self_param.rs:5:13:5:21 | SelfParam | getNumberOfAttrs: | 0 | hasTypeRepr: | no | isMut: | yes | hasLifetime: | no | hasName: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.ql b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.ql
index af2fa064a72..2e8ef6d0bb6 100644
--- a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.ql
+++ b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam.ql
@@ -3,14 +3,15 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  SelfParam x, int getNumberOfAttrs, string isMut, string hasLifetime, string hasName, string hasTy
+  SelfParam x, int getNumberOfAttrs, string hasTypeRepr, string isMut, string hasLifetime,
+  string hasName
 where
   toBeTested(x) and
   not x.isUnknown() and
   getNumberOfAttrs = x.getNumberOfAttrs() and
+  (if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and
   (if x.isMut() then isMut = "yes" else isMut = "no") and
   (if x.hasLifetime() then hasLifetime = "yes" else hasLifetime = "no") and
-  (if x.hasName() then hasName = "yes" else hasName = "no") and
-  if x.hasTy() then hasTy = "yes" else hasTy = "no"
-select x, "getNumberOfAttrs:", getNumberOfAttrs, "isMut:", isMut, "hasLifetime:", hasLifetime,
-  "hasName:", hasName, "hasTy:", hasTy
+  if x.hasName() then hasName = "yes" else hasName = "no"
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasTypeRepr:", hasTypeRepr, "isMut:", isMut,
+  "hasLifetime:", hasLifetime, "hasName:", hasName
diff --git a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getName.expected b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getName.expected
index e69de29bb2d..70a9a4a0659 100644
--- a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getName.expected
+++ b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getName.expected
@@ -0,0 +1 @@
+| gen_self_param.rs:5:13:5:21 | SelfParam | gen_self_param.rs:5:18:5:21 | self |
diff --git a/rust/ql/test/extractor-tests/generated/RecordField/RecordField_getTy.expected b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/RecordField/RecordField_getTy.expected
rename to rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getTy.ql b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getTy.ql
rename to rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getTypeRepr.ql
index 5c04c13cdf2..0be0ec9902d 100644
--- a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getTy.ql
+++ b/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getTypeRepr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from SelfParam x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/SelfParam/gen_self_param.rs b/rust/ql/test/extractor-tests/generated/SelfParam/gen_self_param.rs
index 36f8ffd8baf..6278147a878 100644
--- a/rust/ql/test/extractor-tests/generated/SelfParam/gen_self_param.rs
+++ b/rust/ql/test/extractor-tests/generated/SelfParam/gen_self_param.rs
@@ -1,6 +1,8 @@
 // generated by codegen, do not edit
 
 fn test_self_param() -> () {
-    // A SelfParam. For example:
-    todo!()
+    // A `self` parameter. For example `self` in:
+    fn push(&mut self, value: T) {
+      // ...
+    }
 }
diff --git a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getPat.expected b/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getPat.expected
index e874d3a22ee..0725988f37f 100644
--- a/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getPat.expected
+++ b/rust/ql/test/extractor-tests/generated/SlicePat/SlicePat_getPat.expected
@@ -1,13 +1,13 @@
-| gen_slice_pat.rs:6:9:6:23 | SlicePat | 0 | gen_slice_pat.rs:6:10:6:10 | LiteralPat |
-| gen_slice_pat.rs:6:9:6:23 | SlicePat | 1 | gen_slice_pat.rs:6:13:6:13 | LiteralPat |
-| gen_slice_pat.rs:6:9:6:23 | SlicePat | 2 | gen_slice_pat.rs:6:16:6:16 | LiteralPat |
-| gen_slice_pat.rs:6:9:6:23 | SlicePat | 3 | gen_slice_pat.rs:6:19:6:19 | LiteralPat |
-| gen_slice_pat.rs:6:9:6:23 | SlicePat | 4 | gen_slice_pat.rs:6:22:6:22 | LiteralPat |
-| gen_slice_pat.rs:7:9:7:18 | SlicePat | 0 | gen_slice_pat.rs:7:10:7:10 | LiteralPat |
-| gen_slice_pat.rs:7:9:7:18 | SlicePat | 1 | gen_slice_pat.rs:7:13:7:13 | LiteralPat |
-| gen_slice_pat.rs:7:9:7:18 | SlicePat | 2 | gen_slice_pat.rs:7:16:7:17 | RestPat |
+| gen_slice_pat.rs:6:9:6:23 | SlicePat | 0 | gen_slice_pat.rs:6:10:6:10 | 1 |
+| gen_slice_pat.rs:6:9:6:23 | SlicePat | 1 | gen_slice_pat.rs:6:13:6:13 | 2 |
+| gen_slice_pat.rs:6:9:6:23 | SlicePat | 2 | gen_slice_pat.rs:6:16:6:16 | 3 |
+| gen_slice_pat.rs:6:9:6:23 | SlicePat | 3 | gen_slice_pat.rs:6:19:6:19 | 4 |
+| gen_slice_pat.rs:6:9:6:23 | SlicePat | 4 | gen_slice_pat.rs:6:22:6:22 | 5 |
+| gen_slice_pat.rs:7:9:7:18 | SlicePat | 0 | gen_slice_pat.rs:7:10:7:10 | 1 |
+| gen_slice_pat.rs:7:9:7:18 | SlicePat | 1 | gen_slice_pat.rs:7:13:7:13 | 2 |
+| gen_slice_pat.rs:7:9:7:18 | SlicePat | 2 | gen_slice_pat.rs:7:16:7:17 | .. |
 | gen_slice_pat.rs:8:9:8:24 | SlicePat | 0 | gen_slice_pat.rs:8:10:8:10 | x |
 | gen_slice_pat.rs:8:9:8:24 | SlicePat | 1 | gen_slice_pat.rs:8:13:8:13 | y |
-| gen_slice_pat.rs:8:9:8:24 | SlicePat | 2 | gen_slice_pat.rs:8:16:8:17 | RestPat |
+| gen_slice_pat.rs:8:9:8:24 | SlicePat | 2 | gen_slice_pat.rs:8:16:8:17 | .. |
 | gen_slice_pat.rs:8:9:8:24 | SlicePat | 3 | gen_slice_pat.rs:8:20:8:20 | z |
-| gen_slice_pat.rs:8:9:8:24 | SlicePat | 4 | gen_slice_pat.rs:8:23:8:23 | LiteralPat |
+| gen_slice_pat.rs:8:9:8:24 | SlicePat | 4 | gen_slice_pat.rs:8:23:8:23 | 7 |
diff --git a/rust/ql/test/extractor-tests/generated/SliceType/SliceType.ql b/rust/ql/test/extractor-tests/generated/SliceType/SliceType.ql
deleted file mode 100644
index ebd87495b49..00000000000
--- a/rust/ql/test/extractor-tests/generated/SliceType/SliceType.ql
+++ /dev/null
@@ -1,10 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from SliceType x, string hasTy
-where
-  toBeTested(x) and
-  not x.isUnknown() and
-  if x.hasTy() then hasTy = "yes" else hasTy = "no"
-select x, "hasTy:", hasTy
diff --git a/rust/ql/test/extractor-tests/generated/SliceType/SliceType_getTy.ql b/rust/ql/test/extractor-tests/generated/SliceType/SliceType_getTy.ql
deleted file mode 100644
index ff977cdd8fc..00000000000
--- a/rust/ql/test/extractor-tests/generated/SliceType/SliceType_getTy.ql
+++ /dev/null
@@ -1,7 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-from SliceType x
-where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
diff --git a/rust/ql/test/extractor-tests/generated/SliceType/gen_slice_type.rs b/rust/ql/test/extractor-tests/generated/SliceType/gen_slice_type.rs
deleted file mode 100644
index 49c11e484ac..00000000000
--- a/rust/ql/test/extractor-tests/generated/SliceType/gen_slice_type.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_slice_type() -> () {
-    // A SliceType. For example:
-    todo!()
-}
diff --git a/rust/ql/test/extractor-tests/generated/RefType/RefType.expected b/rust/ql/test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/RefType/RefType.expected
rename to rust/ql/test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr.ql b/rust/ql/test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr.ql
new file mode 100644
index 00000000000..4f60ce58624
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr.ql
@@ -0,0 +1,10 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from SliceTypeRepr x, string hasTypeRepr
+where
+  toBeTested(x) and
+  not x.isUnknown() and
+  if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no"
+select x, "hasTypeRepr:", hasTypeRepr
diff --git a/rust/ql/test/extractor-tests/generated/RefType/RefType_getLifetime.expected b/rust/ql/test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/RefType/RefType_getLifetime.expected
rename to rust/ql/test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr_getTypeRepr.ql b/rust/ql/test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr_getTypeRepr.ql
new file mode 100644
index 00000000000..80d2c59ba29
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr_getTypeRepr.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from SliceTypeRepr x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/SliceTypeRepr/gen_slice_type_repr.rs b/rust/ql/test/extractor-tests/generated/SliceTypeRepr/gen_slice_type_repr.rs
new file mode 100644
index 00000000000..657b98a3efd
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/SliceTypeRepr/gen_slice_type_repr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_slice_type_repr() -> () {
+    // A SliceTypeRepr. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile_getItem.expected b/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile_getItem.expected
index a256c2b84b2..981f445201e 100644
--- a/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile_getItem.expected
+++ b/rust/ql/test/extractor-tests/generated/SourceFile/SourceFile_getItem.expected
@@ -1,2 +1,2 @@
-| gen_source_file.rs:1:1:6:2 | SourceFile | 0 | gen_source_file.rs:3:1:6:1 | test_source_file |
-| lib.rs:1:1:1:20 | SourceFile | 0 | lib.rs:1:1:1:20 | Module |
+| gen_source_file.rs:1:1:6:2 | SourceFile | 0 | gen_source_file.rs:3:1:6:1 | fn test_source_file |
+| lib.rs:1:1:1:20 | SourceFile | 0 | lib.rs:1:1:1:20 | mod gen_source_file |
diff --git a/rust/ql/test/extractor-tests/generated/Static/Static.ql b/rust/ql/test/extractor-tests/generated/Static/Static.ql
index 7450b7778a1..3a632dabf47 100644
--- a/rust/ql/test/extractor-tests/generated/Static/Static.ql
+++ b/rust/ql/test/extractor-tests/generated/Static/Static.ql
@@ -4,7 +4,8 @@ import TestUtils
 
 from
   Static x, string hasExtendedCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs,
-  string hasBody, string isMut, string isStatic, string hasName, string hasTy, string hasVisibility
+  string hasBody, string isMut, string isStatic, string hasName, string hasTypeRepr,
+  string hasVisibility
 where
   toBeTested(x) and
   not x.isUnknown() and
@@ -19,8 +20,8 @@ where
   (if x.isMut() then isMut = "yes" else isMut = "no") and
   (if x.isStatic() then isStatic = "yes" else isStatic = "no") and
   (if x.hasName() then hasName = "yes" else hasName = "no") and
-  (if x.hasTy() then hasTy = "yes" else hasTy = "no") and
+  (if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and
   if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no"
 select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
   "getNumberOfAttrs:", getNumberOfAttrs, "hasBody:", hasBody, "isMut:", isMut, "isStatic:",
-  isStatic, "hasName:", hasName, "hasTy:", hasTy, "hasVisibility:", hasVisibility
+  isStatic, "hasName:", hasName, "hasTypeRepr:", hasTypeRepr, "hasVisibility:", hasVisibility
diff --git a/rust/ql/test/extractor-tests/generated/RefType/RefType_getTy.expected b/rust/ql/test/extractor-tests/generated/Static/Static_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/RefType/RefType_getTy.expected
rename to rust/ql/test/extractor-tests/generated/Static/Static_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/Static/Static_getTy.ql b/rust/ql/test/extractor-tests/generated/Static/Static_getTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/Static/Static_getTy.ql
rename to rust/ql/test/extractor-tests/generated/Static/Static_getTypeRepr.ql
index b1dc6d79529..6aa9e4108e9 100644
--- a/rust/ql/test/extractor-tests/generated/Static/Static_getTy.ql
+++ b/rust/ql/test/extractor-tests/generated/Static/Static_getTypeRepr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from Static x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/Trait/AssocItemList_getAssocItem.expected b/rust/ql/test/extractor-tests/generated/Trait/AssocItemList_getAssocItem.expected
index 0f70039583a..c7337ca090a 100644
--- a/rust/ql/test/extractor-tests/generated/Trait/AssocItemList_getAssocItem.expected
+++ b/rust/ql/test/extractor-tests/generated/Trait/AssocItemList_getAssocItem.expected
@@ -1,3 +1,3 @@
 | gen_trait.rs:4:20:8:1 | AssocItemList | 0 | gen_trait.rs:5:3:5:18 | TypeAlias |
 | gen_trait.rs:4:20:8:1 | AssocItemList | 1 | gen_trait.rs:6:3:6:20 | TypeAlias |
-| gen_trait.rs:4:20:8:1 | AssocItemList | 2 | gen_trait.rs:7:3:7:72 | frobinize_with |
+| gen_trait.rs:4:20:8:1 | AssocItemList | 2 | gen_trait.rs:7:3:7:72 | fn frobinize_with |
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait.expected b/rust/ql/test/extractor-tests/generated/Trait/Trait.expected
index ba06219a2d4..451422d330a 100644
--- a/rust/ql/test/extractor-tests/generated/Trait/Trait.expected
+++ b/rust/ql/test/extractor-tests/generated/Trait/Trait.expected
@@ -1,2 +1,2 @@
-| gen_trait.rs:3:1:8:1 | Trait | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasAssocItemList: | yes | getNumberOfAttrs: | 0 | hasGenericParamList: | no | isAuto: | no | isUnsafe: | no | hasName: | yes | hasTypeBoundList: | no | hasVisibility: | no | hasWhereClause: | no |
-| gen_trait.rs:10:1:10:57 | Trait | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasAssocItemList: | yes | getNumberOfAttrs: | 0 | hasGenericParamList: | yes | isAuto: | no | isUnsafe: | no | hasName: | yes | hasTypeBoundList: | no | hasVisibility: | yes | hasWhereClause: | yes |
+| gen_trait.rs:3:1:8:1 | trait Frobinizable | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasAssocItemList: | yes | getNumberOfAttrs: | 0 | hasGenericParamList: | no | isAuto: | no | isUnsafe: | no | hasName: | yes | hasTypeBoundList: | no | hasVisibility: | no | hasWhereClause: | no |
+| gen_trait.rs:10:1:10:57 | trait Foo | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasAssocItemList: | yes | getNumberOfAttrs: | 0 | hasGenericParamList: | yes | isAuto: | no | isUnsafe: | no | hasName: | yes | hasTypeBoundList: | no | hasVisibility: | yes | hasWhereClause: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait_getAssocItemList.expected b/rust/ql/test/extractor-tests/generated/Trait/Trait_getAssocItemList.expected
index fc16a774800..b60c89c8d3f 100644
--- a/rust/ql/test/extractor-tests/generated/Trait/Trait_getAssocItemList.expected
+++ b/rust/ql/test/extractor-tests/generated/Trait/Trait_getAssocItemList.expected
@@ -1,2 +1,2 @@
-| gen_trait.rs:3:1:8:1 | Trait | gen_trait.rs:4:20:8:1 | AssocItemList |
-| gen_trait.rs:10:1:10:57 | Trait | gen_trait.rs:10:56:10:57 | AssocItemList |
+| gen_trait.rs:3:1:8:1 | trait Frobinizable | gen_trait.rs:4:20:8:1 | AssocItemList |
+| gen_trait.rs:10:1:10:57 | trait Foo | gen_trait.rs:10:56:10:57 | AssocItemList |
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait_getCrateOrigin.expected b/rust/ql/test/extractor-tests/generated/Trait/Trait_getCrateOrigin.expected
index 36106a58ae0..1e42bb43731 100644
--- a/rust/ql/test/extractor-tests/generated/Trait/Trait_getCrateOrigin.expected
+++ b/rust/ql/test/extractor-tests/generated/Trait/Trait_getCrateOrigin.expected
@@ -1,2 +1,2 @@
-| gen_trait.rs:3:1:8:1 | Trait | repo::test |
-| gen_trait.rs:10:1:10:57 | Trait | repo::test |
+| gen_trait.rs:3:1:8:1 | trait Frobinizable | repo::test |
+| gen_trait.rs:10:1:10:57 | trait Foo | repo::test |
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait_getExtendedCanonicalPath.expected b/rust/ql/test/extractor-tests/generated/Trait/Trait_getExtendedCanonicalPath.expected
index d89c9f23757..6a5e8203673 100644
--- a/rust/ql/test/extractor-tests/generated/Trait/Trait_getExtendedCanonicalPath.expected
+++ b/rust/ql/test/extractor-tests/generated/Trait/Trait_getExtendedCanonicalPath.expected
@@ -1,2 +1,2 @@
-| gen_trait.rs:3:1:8:1 | Trait | crate::gen_trait::Frobinizable |
-| gen_trait.rs:10:1:10:57 | Trait | crate::gen_trait::Foo |
+| gen_trait.rs:3:1:8:1 | trait Frobinizable | crate::gen_trait::Frobinizable |
+| gen_trait.rs:10:1:10:57 | trait Foo | crate::gen_trait::Foo |
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait_getGenericParamList.expected b/rust/ql/test/extractor-tests/generated/Trait/Trait_getGenericParamList.expected
index 85a848355f1..1ea7592a597 100644
--- a/rust/ql/test/extractor-tests/generated/Trait/Trait_getGenericParamList.expected
+++ b/rust/ql/test/extractor-tests/generated/Trait/Trait_getGenericParamList.expected
@@ -1 +1 @@
-| gen_trait.rs:10:1:10:57 | Trait | gen_trait.rs:10:14:10:30 | GenericParamList |
+| gen_trait.rs:10:1:10:57 | trait Foo | gen_trait.rs:10:14:10:30 | GenericParamList |
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait_getName.expected b/rust/ql/test/extractor-tests/generated/Trait/Trait_getName.expected
index cc60a2ab938..1c087cdea89 100644
--- a/rust/ql/test/extractor-tests/generated/Trait/Trait_getName.expected
+++ b/rust/ql/test/extractor-tests/generated/Trait/Trait_getName.expected
@@ -1,2 +1,2 @@
-| gen_trait.rs:3:1:8:1 | Trait | gen_trait.rs:4:7:4:18 | Frobinizable |
-| gen_trait.rs:10:1:10:57 | Trait | gen_trait.rs:10:11:10:13 | Foo |
+| gen_trait.rs:3:1:8:1 | trait Frobinizable | gen_trait.rs:4:7:4:18 | Frobinizable |
+| gen_trait.rs:10:1:10:57 | trait Foo | gen_trait.rs:10:11:10:13 | Foo |
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait_getVisibility.expected b/rust/ql/test/extractor-tests/generated/Trait/Trait_getVisibility.expected
index 67d505acda7..56576624e47 100644
--- a/rust/ql/test/extractor-tests/generated/Trait/Trait_getVisibility.expected
+++ b/rust/ql/test/extractor-tests/generated/Trait/Trait_getVisibility.expected
@@ -1 +1 @@
-| gen_trait.rs:10:1:10:57 | Trait | gen_trait.rs:10:1:10:3 | Visibility |
+| gen_trait.rs:10:1:10:57 | trait Foo | gen_trait.rs:10:1:10:3 | Visibility |
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait_getWhereClause.expected b/rust/ql/test/extractor-tests/generated/Trait/Trait_getWhereClause.expected
index a1ae3161e79..d46ac2d04cd 100644
--- a/rust/ql/test/extractor-tests/generated/Trait/Trait_getWhereClause.expected
+++ b/rust/ql/test/extractor-tests/generated/Trait/Trait_getWhereClause.expected
@@ -1 +1 @@
-| gen_trait.rs:10:1:10:57 | Trait | gen_trait.rs:10:32:10:54 | WhereClause |
+| gen_trait.rs:10:1:10:57 | trait Foo | gen_trait.rs:10:32:10:54 | WhereClause |
diff --git a/rust/ql/test/extractor-tests/generated/TupleField/TupleField.ql b/rust/ql/test/extractor-tests/generated/TupleField/TupleField.ql
index d3f83968497..15401629a60 100644
--- a/rust/ql/test/extractor-tests/generated/TupleField/TupleField.ql
+++ b/rust/ql/test/extractor-tests/generated/TupleField/TupleField.ql
@@ -2,11 +2,12 @@
 import codeql.rust.elements
 import TestUtils
 
-from TupleField x, int getNumberOfAttrs, string hasTy, string hasVisibility
+from TupleField x, int getNumberOfAttrs, string hasTypeRepr, string hasVisibility
 where
   toBeTested(x) and
   not x.isUnknown() and
   getNumberOfAttrs = x.getNumberOfAttrs() and
-  (if x.hasTy() then hasTy = "yes" else hasTy = "no") and
+  (if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and
   if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no"
-select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasTy:", hasTy, "hasVisibility:", hasVisibility
+select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasTypeRepr:", hasTypeRepr, "hasVisibility:",
+  hasVisibility
diff --git a/rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getTy.expected b/rust/ql/test/extractor-tests/generated/TupleField/TupleField_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/SelfParam/SelfParam_getTy.expected
rename to rust/ql/test/extractor-tests/generated/TupleField/TupleField_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/TupleField/TupleField_getTy.ql b/rust/ql/test/extractor-tests/generated/TupleField/TupleField_getTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/TupleField/TupleField_getTy.ql
rename to rust/ql/test/extractor-tests/generated/TupleField/TupleField_getTypeRepr.ql
index ba0b3bfdbee..b68e736cec3 100644
--- a/rust/ql/test/extractor-tests/generated/TupleField/TupleField_getTy.ql
+++ b/rust/ql/test/extractor-tests/generated/TupleField/TupleField_getTypeRepr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from TupleField x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getField.expected b/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getField.expected
index 59d028b43ca..78e00f39c92 100644
--- a/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getField.expected
+++ b/rust/ql/test/extractor-tests/generated/TuplePat/TuplePat_getField.expected
@@ -2,5 +2,5 @@
 | gen_tuple_pat.rs:5:9:5:14 | TuplePat | 1 | gen_tuple_pat.rs:5:13:5:13 | y |
 | gen_tuple_pat.rs:6:9:6:22 | TuplePat | 0 | gen_tuple_pat.rs:6:10:6:10 | a |
 | gen_tuple_pat.rs:6:9:6:22 | TuplePat | 1 | gen_tuple_pat.rs:6:13:6:13 | b |
-| gen_tuple_pat.rs:6:9:6:22 | TuplePat | 2 | gen_tuple_pat.rs:6:16:6:17 | RestPat |
+| gen_tuple_pat.rs:6:9:6:22 | TuplePat | 2 | gen_tuple_pat.rs:6:16:6:17 | .. |
 | gen_tuple_pat.rs:6:9:6:22 | TuplePat | 3 | gen_tuple_pat.rs:6:21:6:21 | z |
diff --git a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.expected b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.expected
index a0d12cc8509..78a0609f3b7 100644
--- a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.expected
+++ b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.expected
@@ -1,3 +1,3 @@
-| gen_tuple_struct_pat.rs:6:9:6:27 | TupleStructPat | getNumberOfFields: | 4 | hasPath: | yes |
-| gen_tuple_struct_pat.rs:7:9:7:20 | TupleStructPat | getNumberOfFields: | 2 | hasPath: | yes |
-| gen_tuple_struct_pat.rs:8:9:8:17 | TupleStructPat | getNumberOfFields: | 1 | hasPath: | yes |
+| gen_tuple_struct_pat.rs:6:9:6:27 | Tuple(...) | getNumberOfFields: | 4 | hasPath: | yes |
+| gen_tuple_struct_pat.rs:7:9:7:20 | Tuple(...) | getNumberOfFields: | 2 | hasPath: | yes |
+| gen_tuple_struct_pat.rs:8:9:8:17 | Tuple(...) | getNumberOfFields: | 1 | hasPath: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getField.expected b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getField.expected
index 7a009a0818b..21e1a701963 100644
--- a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getField.expected
+++ b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getField.expected
@@ -1,7 +1,7 @@
-| gen_tuple_struct_pat.rs:6:9:6:27 | TupleStructPat | 0 | gen_tuple_struct_pat.rs:6:15:6:17 | LiteralPat |
-| gen_tuple_struct_pat.rs:6:9:6:27 | TupleStructPat | 1 | gen_tuple_struct_pat.rs:6:20:6:20 | LiteralPat |
-| gen_tuple_struct_pat.rs:6:9:6:27 | TupleStructPat | 2 | gen_tuple_struct_pat.rs:6:23:6:23 | LiteralPat |
-| gen_tuple_struct_pat.rs:6:9:6:27 | TupleStructPat | 3 | gen_tuple_struct_pat.rs:6:26:6:26 | LiteralPat |
-| gen_tuple_struct_pat.rs:7:9:7:20 | TupleStructPat | 0 | gen_tuple_struct_pat.rs:7:15:7:16 | RestPat |
-| gen_tuple_struct_pat.rs:7:9:7:20 | TupleStructPat | 1 | gen_tuple_struct_pat.rs:7:19:7:19 | LiteralPat |
-| gen_tuple_struct_pat.rs:8:9:8:17 | TupleStructPat | 0 | gen_tuple_struct_pat.rs:8:15:8:16 | RestPat |
+| gen_tuple_struct_pat.rs:6:9:6:27 | Tuple(...) | 0 | gen_tuple_struct_pat.rs:6:15:6:17 | "a" |
+| gen_tuple_struct_pat.rs:6:9:6:27 | Tuple(...) | 1 | gen_tuple_struct_pat.rs:6:20:6:20 | 1 |
+| gen_tuple_struct_pat.rs:6:9:6:27 | Tuple(...) | 2 | gen_tuple_struct_pat.rs:6:23:6:23 | 2 |
+| gen_tuple_struct_pat.rs:6:9:6:27 | Tuple(...) | 3 | gen_tuple_struct_pat.rs:6:26:6:26 | 3 |
+| gen_tuple_struct_pat.rs:7:9:7:20 | Tuple(...) | 0 | gen_tuple_struct_pat.rs:7:15:7:16 | .. |
+| gen_tuple_struct_pat.rs:7:9:7:20 | Tuple(...) | 1 | gen_tuple_struct_pat.rs:7:19:7:19 | 3 |
+| gen_tuple_struct_pat.rs:8:9:8:17 | Tuple(...) | 0 | gen_tuple_struct_pat.rs:8:15:8:16 | .. |
diff --git a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getPath.expected b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getPath.expected
index 0c07d081720..34f30ed8ae1 100644
--- a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getPath.expected
+++ b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat_getPath.expected
@@ -1,3 +1,3 @@
-| gen_tuple_struct_pat.rs:6:9:6:27 | TupleStructPat | gen_tuple_struct_pat.rs:6:9:6:13 | Tuple |
-| gen_tuple_struct_pat.rs:7:9:7:20 | TupleStructPat | gen_tuple_struct_pat.rs:7:9:7:13 | Tuple |
-| gen_tuple_struct_pat.rs:8:9:8:17 | TupleStructPat | gen_tuple_struct_pat.rs:8:9:8:13 | Tuple |
+| gen_tuple_struct_pat.rs:6:9:6:27 | Tuple(...) | gen_tuple_struct_pat.rs:6:9:6:13 | Tuple |
+| gen_tuple_struct_pat.rs:7:9:7:20 | Tuple(...) | gen_tuple_struct_pat.rs:7:9:7:13 | Tuple |
+| gen_tuple_struct_pat.rs:8:9:8:17 | Tuple(...) | gen_tuple_struct_pat.rs:8:9:8:13 | Tuple |
diff --git a/rust/ql/test/extractor-tests/generated/TupleType/TupleType.expected b/rust/ql/test/extractor-tests/generated/TupleType/TupleType.expected
deleted file mode 100644
index 40f8dde9302..00000000000
--- a/rust/ql/test/extractor-tests/generated/TupleType/TupleType.expected
+++ /dev/null
@@ -1 +0,0 @@
-| gen_tuple_type.rs:3:25:3:26 | TupleType | getNumberOfFields: | 0 |
diff --git a/rust/ql/test/extractor-tests/generated/TupleType/gen_tuple_type.rs b/rust/ql/test/extractor-tests/generated/TupleType/gen_tuple_type.rs
deleted file mode 100644
index 5e1a26db519..00000000000
--- a/rust/ql/test/extractor-tests/generated/TupleType/gen_tuple_type.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// generated by codegen, do not edit
-
-fn test_tuple_type() -> () {
-    // A TupleType. For example:
-    todo!()
-}
diff --git a/rust/ql/test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr.expected b/rust/ql/test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr.expected
new file mode 100644
index 00000000000..a35fda17581
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr.expected
@@ -0,0 +1 @@
+| gen_tuple_type_repr.rs:3:30:3:31 | TupleTypeRepr | getNumberOfFields: | 0 |
diff --git a/rust/ql/test/extractor-tests/generated/TupleType/TupleType.ql b/rust/ql/test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr.ql
similarity index 83%
rename from rust/ql/test/extractor-tests/generated/TupleType/TupleType.ql
rename to rust/ql/test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr.ql
index 785ae988aa0..79bf87b93a6 100644
--- a/rust/ql/test/extractor-tests/generated/TupleType/TupleType.ql
+++ b/rust/ql/test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr.ql
@@ -2,7 +2,7 @@
 import codeql.rust.elements
 import TestUtils
 
-from TupleType x, int getNumberOfFields
+from TupleTypeRepr x, int getNumberOfFields
 where
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/SliceType/SliceType.expected b/rust/ql/test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr_getField.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/SliceType/SliceType.expected
rename to rust/ql/test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr_getField.expected
diff --git a/rust/ql/test/extractor-tests/generated/TupleType/TupleType_getField.ql b/rust/ql/test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr_getField.ql
similarity index 83%
rename from rust/ql/test/extractor-tests/generated/TupleType/TupleType_getField.ql
rename to rust/ql/test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr_getField.ql
index c77aa1e03b6..3f11b1aa415 100644
--- a/rust/ql/test/extractor-tests/generated/TupleType/TupleType_getField.ql
+++ b/rust/ql/test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr_getField.ql
@@ -2,6 +2,6 @@
 import codeql.rust.elements
 import TestUtils
 
-from TupleType x, int index
+from TupleTypeRepr x, int index
 where toBeTested(x) and not x.isUnknown()
 select x, index, x.getField(index)
diff --git a/rust/ql/test/extractor-tests/generated/TupleTypeRepr/gen_tuple_type_repr.rs b/rust/ql/test/extractor-tests/generated/TupleTypeRepr/gen_tuple_type_repr.rs
new file mode 100644
index 00000000000..69dbf686aff
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/TupleTypeRepr/gen_tuple_type_repr.rs
@@ -0,0 +1,6 @@
+// generated by codegen, do not edit
+
+fn test_tuple_type_repr() -> () {
+    // A TupleTypeRepr. For example:
+    todo!()
+}
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql
index 5959301f81a..16e92ed7e02 100644
--- a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql
+++ b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 from
   TypeAlias x, string hasExtendedCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs,
-  string hasGenericParamList, string isDefault, string hasName, string hasTy,
+  string hasGenericParamList, string isDefault, string hasName, string hasTypeRepr,
   string hasTypeBoundList, string hasVisibility, string hasWhereClause
 where
   toBeTested(x) and
@@ -19,11 +19,11 @@ where
   (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and
   (if x.isDefault() then isDefault = "yes" else isDefault = "no") and
   (if x.hasName() then hasName = "yes" else hasName = "no") and
-  (if x.hasTy() then hasTy = "yes" else hasTy = "no") and
+  (if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and
   (if x.hasTypeBoundList() then hasTypeBoundList = "yes" else hasTypeBoundList = "no") and
   (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and
   if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no"
 select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
   "getNumberOfAttrs:", getNumberOfAttrs, "hasGenericParamList:", hasGenericParamList, "isDefault:",
-  isDefault, "hasName:", hasName, "hasTy:", hasTy, "hasTypeBoundList:", hasTypeBoundList,
-  "hasVisibility:", hasVisibility, "hasWhereClause:", hasWhereClause
+  isDefault, "hasName:", hasName, "hasTypeRepr:", hasTypeRepr, "hasTypeBoundList:",
+  hasTypeBoundList, "hasVisibility:", hasVisibility, "hasWhereClause:", hasWhereClause
diff --git a/rust/ql/test/extractor-tests/generated/SliceType/SliceType_getTy.expected b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/SliceType/SliceType_getTy.expected
rename to rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getTy.ql b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getTy.ql
rename to rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getTypeRepr.ql
index 885047b16e9..82be0a670ec 100644
--- a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getTy.ql
+++ b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getTypeRepr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from TypeAlias x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg.ql b/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg.ql
index 17a26b5b190..03464c38218 100644
--- a/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg.ql
+++ b/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg.ql
@@ -2,9 +2,9 @@
 import codeql.rust.elements
 import TestUtils
 
-from TypeArg x, string hasTy
+from TypeArg x, string hasTypeRepr
 where
   toBeTested(x) and
   not x.isUnknown() and
-  if x.hasTy() then hasTy = "yes" else hasTy = "no"
-select x, "hasTy:", hasTy
+  if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no"
+select x, "hasTypeRepr:", hasTypeRepr
diff --git a/rust/ql/test/extractor-tests/generated/Static/Static_getTy.expected b/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/Static/Static_getTy.expected
rename to rust/ql/test/extractor-tests/generated/TypeArg/TypeArg_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg_getTy.ql b/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg_getTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/TypeArg/TypeArg_getTy.ql
rename to rust/ql/test/extractor-tests/generated/TypeArg/TypeArg_getTypeRepr.ql
index 55434bfda46..d1a4956f460 100644
--- a/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg_getTy.ql
+++ b/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg_getTypeRepr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from TypeArg x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.ql b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.ql
index 449ca67ed71..ee0be38236a 100644
--- a/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.ql
+++ b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.ql
@@ -4,7 +4,7 @@ import TestUtils
 
 from
   TypeBound x, string hasGenericParamList, string isAsync, string isConst, string hasLifetime,
-  string hasTy
+  string hasTypeRepr
 where
   toBeTested(x) and
   not x.isUnknown() and
@@ -12,6 +12,6 @@ where
   (if x.isAsync() then isAsync = "yes" else isAsync = "no") and
   (if x.isConst() then isConst = "yes" else isConst = "no") and
   (if x.hasLifetime() then hasLifetime = "yes" else hasLifetime = "no") and
-  if x.hasTy() then hasTy = "yes" else hasTy = "no"
+  if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no"
 select x, "hasGenericParamList:", hasGenericParamList, "isAsync:", isAsync, "isConst:", isConst,
-  "hasLifetime:", hasLifetime, "hasTy:", hasTy
+  "hasLifetime:", hasLifetime, "hasTypeRepr:", hasTypeRepr
diff --git a/rust/ql/test/extractor-tests/generated/TupleField/TupleField_getTy.expected b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/TupleField/TupleField_getTy.expected
rename to rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getTy.ql b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getTy.ql
rename to rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getTypeRepr.ql
index 56c8f92d433..d8ed0d05256 100644
--- a/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getTy.ql
+++ b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getTypeRepr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from TypeBound x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.expected b/rust/ql/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.expected
index 3b2effb788e..ea89e8b29b4 100644
--- a/rust/ql/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.expected
@@ -1 +1 @@
-| gen_underscore_expr.rs:5:5:5:5 | UnderscoreExpr | getNumberOfAttrs: | 0 |
+| gen_underscore_expr.rs:5:5:5:5 | _ | getNumberOfAttrs: | 0 |
diff --git a/rust/ql/test/extractor-tests/generated/Variant/Variant.ql b/rust/ql/test/extractor-tests/generated/Variant/Variant.ql
index 2cbcd20cbf0..92ebcbe55ee 100644
--- a/rust/ql/test/extractor-tests/generated/Variant/Variant.ql
+++ b/rust/ql/test/extractor-tests/generated/Variant/Variant.ql
@@ -3,15 +3,22 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  Variant x, int getNumberOfAttrs, string hasExpr, string hasFieldList, string hasName,
-  string hasVisibility
+  Variant x, string hasExtendedCanonicalPath, string hasCrateOrigin, int getNumberOfAttrs,
+  string hasExpr, string hasFieldList, string hasName, string hasVisibility
 where
   toBeTested(x) and
   not x.isUnknown() and
+  (
+    if x.hasExtendedCanonicalPath()
+    then hasExtendedCanonicalPath = "yes"
+    else hasExtendedCanonicalPath = "no"
+  ) and
+  (if x.hasCrateOrigin() then hasCrateOrigin = "yes" else hasCrateOrigin = "no") and
   getNumberOfAttrs = x.getNumberOfAttrs() and
   (if x.hasExpr() then hasExpr = "yes" else hasExpr = "no") and
   (if x.hasFieldList() then hasFieldList = "yes" else hasFieldList = "no") and
   (if x.hasName() then hasName = "yes" else hasName = "no") and
   if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no"
-select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", hasExpr, "hasFieldList:", hasFieldList,
+select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
+  "getNumberOfAttrs:", getNumberOfAttrs, "hasExpr:", hasExpr, "hasFieldList:", hasFieldList,
   "hasName:", hasName, "hasVisibility:", hasVisibility
diff --git a/rust/ql/test/extractor-tests/generated/TupleType/TupleType_getField.expected b/rust/ql/test/extractor-tests/generated/Variant/Variant_getCrateOrigin.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/TupleType/TupleType_getField.expected
rename to rust/ql/test/extractor-tests/generated/Variant/Variant_getCrateOrigin.expected
diff --git a/rust/ql/test/extractor-tests/generated/Variant/Variant_getCrateOrigin.ql b/rust/ql/test/extractor-tests/generated/Variant/Variant_getCrateOrigin.ql
new file mode 100644
index 00000000000..0acfd9827fe
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Variant/Variant_getCrateOrigin.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Variant x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getCrateOrigin()
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getTy.expected b/rust/ql/test/extractor-tests/generated/Variant/Variant_getExtendedCanonicalPath.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias_getTy.expected
rename to rust/ql/test/extractor-tests/generated/Variant/Variant_getExtendedCanonicalPath.expected
diff --git a/rust/ql/test/extractor-tests/generated/Variant/Variant_getExtendedCanonicalPath.ql b/rust/ql/test/extractor-tests/generated/Variant/Variant_getExtendedCanonicalPath.ql
new file mode 100644
index 00000000000..ad8aaf86a5c
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Variant/Variant_getExtendedCanonicalPath.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Variant x
+where toBeTested(x) and not x.isUnknown()
+select x, x.getExtendedCanonicalPath()
diff --git a/rust/ql/test/extractor-tests/generated/WherePred/WherePred.ql b/rust/ql/test/extractor-tests/generated/WherePred/WherePred.ql
index 40d5072725d..a4471e43ef6 100644
--- a/rust/ql/test/extractor-tests/generated/WherePred/WherePred.ql
+++ b/rust/ql/test/extractor-tests/generated/WherePred/WherePred.ql
@@ -3,13 +3,14 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  WherePred x, string hasGenericParamList, string hasLifetime, string hasTy, string hasTypeBoundList
+  WherePred x, string hasGenericParamList, string hasLifetime, string hasTypeRepr,
+  string hasTypeBoundList
 where
   toBeTested(x) and
   not x.isUnknown() and
   (if x.hasGenericParamList() then hasGenericParamList = "yes" else hasGenericParamList = "no") and
   (if x.hasLifetime() then hasLifetime = "yes" else hasLifetime = "no") and
-  (if x.hasTy() then hasTy = "yes" else hasTy = "no") and
+  (if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and
   if x.hasTypeBoundList() then hasTypeBoundList = "yes" else hasTypeBoundList = "no"
-select x, "hasGenericParamList:", hasGenericParamList, "hasLifetime:", hasLifetime, "hasTy:", hasTy,
-  "hasTypeBoundList:", hasTypeBoundList
+select x, "hasGenericParamList:", hasGenericParamList, "hasLifetime:", hasLifetime, "hasTypeRepr:",
+  hasTypeRepr, "hasTypeBoundList:", hasTypeBoundList
diff --git a/rust/ql/test/extractor-tests/generated/TypeArg/TypeArg_getTy.expected b/rust/ql/test/extractor-tests/generated/WherePred/WherePred_getTypeRepr.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/TypeArg/TypeArg_getTy.expected
rename to rust/ql/test/extractor-tests/generated/WherePred/WherePred_getTypeRepr.expected
diff --git a/rust/ql/test/extractor-tests/generated/WherePred/WherePred_getTy.ql b/rust/ql/test/extractor-tests/generated/WherePred/WherePred_getTypeRepr.ql
similarity index 84%
rename from rust/ql/test/extractor-tests/generated/WherePred/WherePred_getTy.ql
rename to rust/ql/test/extractor-tests/generated/WherePred/WherePred_getTypeRepr.ql
index bbb432ddbe7..e1992ba278e 100644
--- a/rust/ql/test/extractor-tests/generated/WherePred/WherePred_getTy.ql
+++ b/rust/ql/test/extractor-tests/generated/WherePred/WherePred_getTypeRepr.ql
@@ -4,4 +4,4 @@ import TestUtils
 
 from WherePred x
 where toBeTested(x) and not x.isUnknown()
-select x, x.getTy()
+select x, x.getTypeRepr()
diff --git a/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr.ql b/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr.ql
index ceb095e9d20..8544014e571 100644
--- a/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/WhileExpr/WhileExpr.ql
@@ -2,13 +2,13 @@
 import codeql.rust.elements
 import TestUtils
 
-from WhileExpr x, int getNumberOfAttrs, string hasCondition, string hasLabel, string hasLoopBody
+from WhileExpr x, string hasLabel, string hasLoopBody, int getNumberOfAttrs, string hasCondition
 where
   toBeTested(x) and
   not x.isUnknown() and
-  getNumberOfAttrs = x.getNumberOfAttrs() and
-  (if x.hasCondition() then hasCondition = "yes" else hasCondition = "no") and
   (if x.hasLabel() then hasLabel = "yes" else hasLabel = "no") and
-  if x.hasLoopBody() then hasLoopBody = "yes" else hasLoopBody = "no"
-select x, "getNumberOfAttrs:", getNumberOfAttrs, "hasCondition:", hasCondition, "hasLabel:",
-  hasLabel, "hasLoopBody:", hasLoopBody
+  (if x.hasLoopBody() then hasLoopBody = "yes" else hasLoopBody = "no") and
+  getNumberOfAttrs = x.getNumberOfAttrs() and
+  if x.hasCondition() then hasCondition = "yes" else hasCondition = "no"
+select x, "hasLabel:", hasLabel, "hasLoopBody:", hasLoopBody, "getNumberOfAttrs:", getNumberOfAttrs,
+  "hasCondition:", hasCondition
diff --git a/rust/ql/test/extractor-tests/generated/WildcardPat/WildcardPat.expected b/rust/ql/test/extractor-tests/generated/WildcardPat/WildcardPat.expected
index ceb155671b7..b8ac989ee1c 100644
--- a/rust/ql/test/extractor-tests/generated/WildcardPat/WildcardPat.expected
+++ b/rust/ql/test/extractor-tests/generated/WildcardPat/WildcardPat.expected
@@ -1 +1 @@
-| gen_wildcard_pat.rs:5:9:5:9 | WildcardPat |
+| gen_wildcard_pat.rs:5:9:5:9 | _ |
diff --git a/rust/ql/test/extractor-tests/utf8/ast.expected b/rust/ql/test/extractor-tests/utf8/ast.expected
index dfc20f5ab58..560f834766e 100644
--- a/rust/ql/test/extractor-tests/utf8/ast.expected
+++ b/rust/ql/test/extractor-tests/utf8/ast.expected
@@ -1,33 +1,33 @@
-| lib.rs:1:1:1:21 | Module |
 | lib.rs:1:1:1:21 | SourceFile |
+| lib.rs:1:1:1:21 | mod utf8_identifiers |
 | lib.rs:1:5:1:20 | utf8_identifiers |
-| utf8_identifiers.rs:1:1:4:6 | foo |
+| utf8_identifiers.rs:1:1:4:6 | fn foo |
 | utf8_identifiers.rs:1:1:12:2 | SourceFile |
 | utf8_identifiers.rs:1:4:1:6 | foo |
 | utf8_identifiers.rs:1:7:4:1 | GenericParamList |
-| utf8_identifiers.rs:2:5:2:6 | Lifetime |
+| utf8_identifiers.rs:2:5:2:6 | ''\u03b2 |
 | utf8_identifiers.rs:2:5:2:6 | LifetimeParam |
 | utf8_identifiers.rs:3:5:3:5 | TypeParam |
 | utf8_identifiers.rs:3:5:3:5 | \u03b3 |
 | utf8_identifiers.rs:4:2:4:3 | ParamList |
-| utf8_identifiers.rs:4:5:4:6 | BlockExpr |
 | utf8_identifiers.rs:4:5:4:6 | StmtList |
+| utf8_identifiers.rs:4:5:4:6 | { ... } |
 | utf8_identifiers.rs:6:1:8:1 | Struct |
 | utf8_identifiers.rs:6:8:6:8 | X |
 | utf8_identifiers.rs:6:10:8:1 | RecordFieldList |
 | utf8_identifiers.rs:7:5:7:5 | \u03b4 |
 | utf8_identifiers.rs:7:5:7:13 | RecordField |
-| utf8_identifiers.rs:7:9:7:13 | PathType |
+| utf8_identifiers.rs:7:9:7:13 | usize |
 | utf8_identifiers.rs:7:9:7:13 | usize |
 | utf8_identifiers.rs:7:9:7:13 | usize |
 | utf8_identifiers.rs:7:9:7:13 | usize |
 | utf8_identifiers.rs:10:1:10:3 | Visibility |
-| utf8_identifiers.rs:10:1:12:1 | main |
+| utf8_identifiers.rs:10:1:12:1 | fn main |
 | utf8_identifiers.rs:10:8:10:11 | main |
 | utf8_identifiers.rs:10:12:10:13 | ParamList |
-| utf8_identifiers.rs:10:15:12:1 | BlockExpr |
 | utf8_identifiers.rs:10:15:12:1 | StmtList |
-| utf8_identifiers.rs:11:5:11:24 | LetStmt |
+| utf8_identifiers.rs:10:15:12:1 | { ... } |
+| utf8_identifiers.rs:11:5:11:24 | let ... = 0.00001f64 |
 | utf8_identifiers.rs:11:9:11:9 | \u03b1 |
 | utf8_identifiers.rs:11:9:11:9 | \u03b1 |
 | utf8_identifiers.rs:11:14:11:23 | 0.00001f64 |
diff --git a/rust/ql/test/library-tests/controlflow-unstable/Cfg.expected b/rust/ql/test/library-tests/controlflow-unstable/Cfg.expected
index 05851289a35..7a7d9884f19 100644
--- a/rust/ql/test/library-tests/controlflow-unstable/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow-unstable/Cfg.expected
@@ -1,53 +1,53 @@
 edges
-| test.rs:5:5:11:5 | enter test_and_if_let | test.rs:5:24:5:24 | a |  |
-| test.rs:5:5:11:5 | exit test_and_if_let (normal) | test.rs:5:5:11:5 | exit test_and_if_let |  |
-| test.rs:5:24:5:24 | a | test.rs:5:24:5:30 | Param | match |
-| test.rs:5:24:5:30 | Param | test.rs:5:33:5:33 | b |  |
-| test.rs:5:33:5:33 | b | test.rs:5:33:5:47 | Param | match |
-| test.rs:5:33:5:47 | Param | test.rs:5:50:5:50 | c |  |
-| test.rs:5:50:5:50 | c | test.rs:5:50:5:56 | Param | match |
-| test.rs:5:50:5:56 | Param | test.rs:6:12:6:12 | a |  |
-| test.rs:5:67:11:5 | BlockExpr | test.rs:5:5:11:5 | exit test_and_if_let (normal) |  |
-| test.rs:6:9:10:9 | IfExpr | test.rs:5:67:11:5 | BlockExpr |  |
+| test.rs:5:5:11:5 | enter fn test_and_if_let | test.rs:5:24:5:24 | a |  |
+| test.rs:5:5:11:5 | exit fn test_and_if_let (normal) | test.rs:5:5:11:5 | exit fn test_and_if_let |  |
+| test.rs:5:24:5:24 | a | test.rs:5:24:5:30 | ...: bool | match |
+| test.rs:5:24:5:30 | ...: bool | test.rs:5:33:5:33 | b |  |
+| test.rs:5:33:5:33 | b | test.rs:5:33:5:47 | ...: Option::<...> | match |
+| test.rs:5:33:5:47 | ...: Option::<...> | test.rs:5:50:5:50 | c |  |
+| test.rs:5:50:5:50 | c | test.rs:5:50:5:56 | ...: bool | match |
+| test.rs:5:50:5:56 | ...: bool | test.rs:6:12:6:12 | a |  |
+| test.rs:5:67:11:5 | { ... } | test.rs:5:5:11:5 | exit fn test_and_if_let (normal) |  |
+| test.rs:6:9:10:9 | if ... {...} else {...} | test.rs:5:67:11:5 | { ... } |  |
 | test.rs:6:12:6:12 | a | test.rs:6:12:6:31 | [boolean(false)] ... && ... | false |
-| test.rs:6:12:6:12 | a | test.rs:6:17:6:31 | LetExpr | true |
+| test.rs:6:12:6:12 | a | test.rs:6:17:6:31 | let ... = b | true |
 | test.rs:6:12:6:31 | [boolean(false)] ... && ... | test.rs:9:13:9:17 | false | false |
 | test.rs:6:12:6:31 | [boolean(true)] ... && ... | test.rs:7:13:7:13 | d | true |
-| test.rs:6:17:6:31 | LetExpr | test.rs:6:31:6:31 | b |  |
-| test.rs:6:21:6:27 | TupleStructPat | test.rs:6:12:6:31 | [boolean(false)] ... && ... | no-match |
-| test.rs:6:21:6:27 | TupleStructPat | test.rs:6:26:6:26 | d | match |
+| test.rs:6:17:6:31 | let ... = b | test.rs:6:31:6:31 | b |  |
+| test.rs:6:21:6:27 | Some(...) | test.rs:6:12:6:31 | [boolean(false)] ... && ... | no-match |
+| test.rs:6:21:6:27 | Some(...) | test.rs:6:26:6:26 | d | match |
 | test.rs:6:26:6:26 | d | test.rs:6:12:6:31 | [boolean(true)] ... && ... | match |
-| test.rs:6:31:6:31 | b | test.rs:6:21:6:27 | TupleStructPat |  |
-| test.rs:6:33:8:9 | BlockExpr | test.rs:6:9:10:9 | IfExpr |  |
-| test.rs:7:13:7:13 | d | test.rs:6:33:8:9 | BlockExpr |  |
-| test.rs:8:16:10:9 | BlockExpr | test.rs:6:9:10:9 | IfExpr |  |
-| test.rs:9:13:9:17 | false | test.rs:8:16:10:9 | BlockExpr |  |
-| test.rs:13:5:21:5 | enter test_and_if_let2 | test.rs:13:25:13:25 | a |  |
-| test.rs:13:5:21:5 | exit test_and_if_let2 (normal) | test.rs:13:5:21:5 | exit test_and_if_let2 |  |
-| test.rs:13:25:13:25 | a | test.rs:13:25:13:31 | Param | match |
-| test.rs:13:25:13:31 | Param | test.rs:13:34:13:34 | b |  |
-| test.rs:13:34:13:34 | b | test.rs:13:34:13:39 | Param | match |
-| test.rs:13:34:13:39 | Param | test.rs:13:42:13:42 | c |  |
-| test.rs:13:42:13:42 | c | test.rs:13:42:13:48 | Param | match |
-| test.rs:13:42:13:48 | Param | test.rs:14:12:14:12 | a |  |
-| test.rs:13:59:21:5 | BlockExpr | test.rs:13:5:21:5 | exit test_and_if_let2 (normal) |  |
-| test.rs:14:9:20:9 | IfExpr | test.rs:13:59:21:5 | BlockExpr |  |
+| test.rs:6:31:6:31 | b | test.rs:6:21:6:27 | Some(...) |  |
+| test.rs:6:33:8:9 | { ... } | test.rs:6:9:10:9 | if ... {...} else {...} |  |
+| test.rs:7:13:7:13 | d | test.rs:6:33:8:9 | { ... } |  |
+| test.rs:8:16:10:9 | { ... } | test.rs:6:9:10:9 | if ... {...} else {...} |  |
+| test.rs:9:13:9:17 | false | test.rs:8:16:10:9 | { ... } |  |
+| test.rs:13:5:21:5 | enter fn test_and_if_let2 | test.rs:13:25:13:25 | a |  |
+| test.rs:13:5:21:5 | exit fn test_and_if_let2 (normal) | test.rs:13:5:21:5 | exit fn test_and_if_let2 |  |
+| test.rs:13:25:13:25 | a | test.rs:13:25:13:31 | ...: bool | match |
+| test.rs:13:25:13:31 | ...: bool | test.rs:13:34:13:34 | b |  |
+| test.rs:13:34:13:34 | b | test.rs:13:34:13:39 | ...: i64 | match |
+| test.rs:13:34:13:39 | ...: i64 | test.rs:13:42:13:42 | c |  |
+| test.rs:13:42:13:42 | c | test.rs:13:42:13:48 | ...: bool | match |
+| test.rs:13:42:13:48 | ...: bool | test.rs:14:12:14:12 | a |  |
+| test.rs:13:59:21:5 | { ... } | test.rs:13:5:21:5 | exit fn test_and_if_let2 (normal) |  |
+| test.rs:14:9:20:9 | if ... {...} else {...} | test.rs:13:59:21:5 | { ... } |  |
 | test.rs:14:12:14:12 | a | test.rs:14:12:14:25 | [boolean(false)] ... && ... | false |
-| test.rs:14:12:14:12 | a | test.rs:14:17:14:25 | LetExpr | true |
+| test.rs:14:12:14:12 | a | test.rs:14:17:14:25 | let ... = b | true |
 | test.rs:14:12:14:25 | [boolean(false)] ... && ... | test.rs:14:12:15:16 | [boolean(false)] ... && ... | false |
 | test.rs:14:12:14:25 | [boolean(true)] ... && ... | test.rs:15:16:15:16 | c | true |
 | test.rs:14:12:15:16 | [boolean(false)] ... && ... | test.rs:19:13:19:17 | false | false |
 | test.rs:14:12:15:16 | [boolean(true)] ... && ... | test.rs:17:13:17:13 | d | true |
-| test.rs:14:17:14:25 | LetExpr | test.rs:14:25:14:25 | b |  |
+| test.rs:14:17:14:25 | let ... = b | test.rs:14:25:14:25 | b |  |
 | test.rs:14:21:14:21 | d | test.rs:14:12:14:25 | [boolean(true)] ... && ... | match |
 | test.rs:14:25:14:25 | b | test.rs:14:21:14:21 | d |  |
 | test.rs:15:16:15:16 | c | test.rs:14:12:15:16 | [boolean(false)] ... && ... | false |
 | test.rs:15:16:15:16 | c | test.rs:14:12:15:16 | [boolean(true)] ... && ... | true |
-| test.rs:16:9:18:9 | BlockExpr | test.rs:14:9:20:9 | IfExpr |  |
+| test.rs:16:9:18:9 | { ... } | test.rs:14:9:20:9 | if ... {...} else {...} |  |
 | test.rs:17:13:17:13 | d | test.rs:17:17:17:17 | 0 |  |
-| test.rs:17:13:17:17 | ... > ... | test.rs:16:9:18:9 | BlockExpr |  |
+| test.rs:17:13:17:17 | ... > ... | test.rs:16:9:18:9 | { ... } |  |
 | test.rs:17:17:17:17 | 0 | test.rs:17:13:17:17 | ... > ... |  |
-| test.rs:18:16:20:9 | BlockExpr | test.rs:14:9:20:9 | IfExpr |  |
-| test.rs:19:13:19:17 | false | test.rs:18:16:20:9 | BlockExpr |  |
+| test.rs:18:16:20:9 | { ... } | test.rs:14:9:20:9 | if ... {...} else {...} |  |
+| test.rs:19:13:19:17 | false | test.rs:18:16:20:9 | { ... } |  |
 breakTarget
 continueTarget
diff --git a/rust/ql/test/library-tests/controlflow/Cfg.expected b/rust/ql/test/library-tests/controlflow/Cfg.expected
index 620837abc82..3165b2354be 100644
--- a/rust/ql/test/library-tests/controlflow/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow/Cfg.expected
@@ -1,479 +1,479 @@
 edges
-| test.rs:5:5:8:5 | enter function_call | test.rs:6:9:6:64 | ExprStmt |  |
-| test.rs:5:5:8:5 | exit function_call (normal) | test.rs:5:5:8:5 | exit function_call |  |
-| test.rs:5:24:8:5 | BlockExpr | test.rs:5:5:8:5 | exit function_call (normal) |  |
-| test.rs:6:9:6:44 | logical_operators::test_and_operator | test.rs:6:46:6:49 | true |  |
-| test.rs:6:9:6:63 | CallExpr | test.rs:7:9:7:22 | ExprStmt |  |
-| test.rs:6:9:6:64 | ExprStmt | test.rs:6:9:6:44 | logical_operators::test_and_operator |  |
+| test.rs:5:5:8:5 | enter fn function_call | test.rs:6:9:6:64 | ExprStmt |  |
+| test.rs:5:5:8:5 | exit fn function_call (normal) | test.rs:5:5:8:5 | exit fn function_call |  |
+| test.rs:5:24:8:5 | { ... } | test.rs:5:5:8:5 | exit fn function_call (normal) |  |
+| test.rs:6:9:6:44 | ...::test_and_operator | test.rs:6:46:6:49 | true |  |
+| test.rs:6:9:6:63 | ...::test_and_operator(...) | test.rs:7:9:7:22 | ExprStmt |  |
+| test.rs:6:9:6:64 | ExprStmt | test.rs:6:9:6:44 | ...::test_and_operator |  |
 | test.rs:6:46:6:49 | true | test.rs:6:52:6:56 | false |  |
 | test.rs:6:52:6:56 | false | test.rs:6:59:6:62 | true |  |
-| test.rs:6:59:6:62 | true | test.rs:6:9:6:63 | CallExpr |  |
-| test.rs:7:9:7:19 | method_call | test.rs:7:9:7:21 | CallExpr |  |
-| test.rs:7:9:7:21 | CallExpr | test.rs:5:24:8:5 | BlockExpr |  |
+| test.rs:6:59:6:62 | true | test.rs:6:9:6:63 | ...::test_and_operator(...) |  |
+| test.rs:7:9:7:19 | method_call | test.rs:7:9:7:21 | method_call(...) |  |
+| test.rs:7:9:7:21 | method_call(...) | test.rs:5:24:8:5 | { ... } |  |
 | test.rs:7:9:7:22 | ExprStmt | test.rs:7:9:7:19 | method_call |  |
-| test.rs:10:5:13:5 | enter method_call | test.rs:11:9:11:37 | LetStmt |  |
-| test.rs:10:5:13:5 | exit method_call (normal) | test.rs:10:5:13:5 | exit method_call |  |
-| test.rs:10:22:13:5 | BlockExpr | test.rs:10:5:13:5 | exit method_call (normal) |  |
-| test.rs:11:9:11:37 | LetStmt | test.rs:11:23:11:34 | HashMap::new |  |
+| test.rs:10:5:13:5 | enter fn method_call | test.rs:11:9:11:37 | let ... = ... |  |
+| test.rs:10:5:13:5 | exit fn method_call (normal) | test.rs:10:5:13:5 | exit fn method_call |  |
+| test.rs:10:22:13:5 | { ... } | test.rs:10:5:13:5 | exit fn method_call (normal) |  |
+| test.rs:11:9:11:37 | let ... = ... | test.rs:11:23:11:34 | ...::new |  |
 | test.rs:11:13:11:19 | map | test.rs:12:9:12:28 | ExprStmt | match |
-| test.rs:11:23:11:34 | HashMap::new | test.rs:11:23:11:36 | CallExpr |  |
-| test.rs:11:23:11:36 | CallExpr | test.rs:11:13:11:19 | map |  |
+| test.rs:11:23:11:34 | ...::new | test.rs:11:23:11:36 | ...::new(...) |  |
+| test.rs:11:23:11:36 | ...::new(...) | test.rs:11:13:11:19 | map |  |
 | test.rs:12:9:12:11 | map | test.rs:12:20:12:21 | 37 |  |
-| test.rs:12:9:12:27 | ... .insert(...) | test.rs:10:22:13:5 | BlockExpr |  |
+| test.rs:12:9:12:27 | ... .insert(...) | test.rs:10:22:13:5 | { ... } |  |
 | test.rs:12:9:12:28 | ExprStmt | test.rs:12:9:12:11 | map |  |
 | test.rs:12:20:12:21 | 37 | test.rs:12:24:12:26 | "a" |  |
 | test.rs:12:24:12:26 | "a" | test.rs:12:9:12:27 | ... .insert(...) |  |
-| test.rs:18:5:24:5 | enter next | test.rs:18:13:18:13 | n |  |
-| test.rs:18:5:24:5 | exit next (normal) | test.rs:18:5:24:5 | exit next |  |
-| test.rs:18:13:18:13 | n | test.rs:18:13:18:18 | Param | match |
-| test.rs:18:13:18:18 | Param | test.rs:19:12:19:12 | n |  |
-| test.rs:18:28:24:5 | BlockExpr | test.rs:18:5:24:5 | exit next (normal) |  |
-| test.rs:19:9:23:9 | IfExpr | test.rs:18:28:24:5 | BlockExpr |  |
+| test.rs:18:5:24:5 | enter fn next | test.rs:18:13:18:13 | n |  |
+| test.rs:18:5:24:5 | exit fn next (normal) | test.rs:18:5:24:5 | exit fn next |  |
+| test.rs:18:13:18:13 | n | test.rs:18:13:18:18 | ...: i64 | match |
+| test.rs:18:13:18:18 | ...: i64 | test.rs:19:12:19:12 | n |  |
+| test.rs:18:28:24:5 | { ... } | test.rs:18:5:24:5 | exit fn next (normal) |  |
+| test.rs:19:9:23:9 | if ... {...} else {...} | test.rs:18:28:24:5 | { ... } |  |
 | test.rs:19:12:19:12 | n | test.rs:19:16:19:16 | 2 |  |
 | test.rs:19:12:19:16 | ... % ... | test.rs:19:21:19:21 | 0 |  |
 | test.rs:19:12:19:21 | ... == ... | test.rs:20:13:20:13 | n | true |
 | test.rs:19:12:19:21 | ... == ... | test.rs:22:13:22:13 | 3 | false |
 | test.rs:19:16:19:16 | 2 | test.rs:19:12:19:16 | ... % ... |  |
 | test.rs:19:21:19:21 | 0 | test.rs:19:12:19:21 | ... == ... |  |
-| test.rs:19:23:21:9 | BlockExpr | test.rs:19:9:23:9 | IfExpr |  |
+| test.rs:19:23:21:9 | { ... } | test.rs:19:9:23:9 | if ... {...} else {...} |  |
 | test.rs:20:13:20:13 | n | test.rs:20:17:20:17 | 2 |  |
-| test.rs:20:13:20:17 | ... / ... | test.rs:19:23:21:9 | BlockExpr |  |
+| test.rs:20:13:20:17 | ... / ... | test.rs:19:23:21:9 | { ... } |  |
 | test.rs:20:17:20:17 | 2 | test.rs:20:13:20:17 | ... / ... |  |
-| test.rs:21:16:23:9 | BlockExpr | test.rs:19:9:23:9 | IfExpr |  |
+| test.rs:21:16:23:9 | { ... } | test.rs:19:9:23:9 | if ... {...} else {...} |  |
 | test.rs:22:13:22:13 | 3 | test.rs:22:17:22:17 | n |  |
 | test.rs:22:13:22:17 | ... * ... | test.rs:22:21:22:21 | 1 |  |
-| test.rs:22:13:22:21 | ... + ... | test.rs:21:16:23:9 | BlockExpr |  |
+| test.rs:22:13:22:21 | ... + ... | test.rs:21:16:23:9 | { ... } |  |
 | test.rs:22:17:22:17 | n | test.rs:22:13:22:17 | ... * ... |  |
 | test.rs:22:21:22:21 | 1 | test.rs:22:13:22:21 | ... + ... |  |
-| test.rs:26:5:42:5 | enter test_break_and_continue | test.rs:26:32:26:32 | n |  |
-| test.rs:26:5:42:5 | exit test_break_and_continue (normal) | test.rs:26:5:42:5 | exit test_break_and_continue |  |
-| test.rs:26:32:26:32 | n | test.rs:26:32:26:37 | Param | match |
-| test.rs:26:32:26:37 | Param | test.rs:27:9:27:22 | LetStmt |  |
-| test.rs:27:9:27:22 | LetStmt | test.rs:27:21:27:21 | n |  |
+| test.rs:26:5:42:5 | enter fn test_break_and_continue | test.rs:26:32:26:32 | n |  |
+| test.rs:26:5:42:5 | exit fn test_break_and_continue (normal) | test.rs:26:5:42:5 | exit fn test_break_and_continue |  |
+| test.rs:26:32:26:32 | n | test.rs:26:32:26:37 | ...: i64 | match |
+| test.rs:26:32:26:37 | ...: i64 | test.rs:27:9:27:22 | let ... = n |  |
+| test.rs:27:9:27:22 | let ... = n | test.rs:27:21:27:21 | n |  |
 | test.rs:27:13:27:17 | i | test.rs:28:9:40:9 | ExprStmt | match |
 | test.rs:27:21:27:21 | n | test.rs:27:13:27:17 | i |  |
 | test.rs:28:9:40:9 | ExprStmt | test.rs:29:13:29:24 | ExprStmt |  |
-| test.rs:28:9:40:9 | LoopExpr | test.rs:41:9:41:20 | ExprStmt |  |
-| test.rs:28:14:40:9 | BlockExpr | test.rs:29:13:29:24 | ExprStmt |  |
+| test.rs:28:9:40:9 | loop { ... } | test.rs:41:9:41:20 | ExprStmt |  |
+| test.rs:28:14:40:9 | { ... } | test.rs:29:13:29:24 | ExprStmt |  |
 | test.rs:29:13:29:13 | i | test.rs:29:17:29:20 | next |  |
 | test.rs:29:13:29:23 | ... = ... | test.rs:30:13:32:13 | ExprStmt |  |
 | test.rs:29:13:29:24 | ExprStmt | test.rs:29:13:29:13 | i |  |
 | test.rs:29:17:29:20 | next | test.rs:29:22:29:22 | i |  |
-| test.rs:29:17:29:23 | CallExpr | test.rs:29:13:29:23 | ... = ... |  |
-| test.rs:29:22:29:22 | i | test.rs:29:17:29:23 | CallExpr |  |
+| test.rs:29:17:29:23 | next(...) | test.rs:29:13:29:23 | ... = ... |  |
+| test.rs:29:22:29:22 | i | test.rs:29:17:29:23 | next(...) |  |
 | test.rs:30:13:32:13 | ExprStmt | test.rs:30:16:30:16 | i |  |
-| test.rs:30:13:32:13 | IfExpr | test.rs:33:13:35:13 | ExprStmt |  |
+| test.rs:30:13:32:13 | if ... {...} | test.rs:33:13:35:13 | ExprStmt |  |
 | test.rs:30:16:30:16 | i | test.rs:30:20:30:24 | 10000 |  |
-| test.rs:30:16:30:24 | ... > ... | test.rs:30:13:32:13 | IfExpr | false |
+| test.rs:30:16:30:24 | ... > ... | test.rs:30:13:32:13 | if ... {...} | false |
 | test.rs:30:16:30:24 | ... > ... | test.rs:31:17:31:29 | ExprStmt | true |
 | test.rs:30:20:30:24 | 10000 | test.rs:30:16:30:24 | ... > ... |  |
-| test.rs:31:17:31:28 | ReturnExpr | test.rs:26:5:42:5 | exit test_break_and_continue (normal) | return |
+| test.rs:31:17:31:28 | return false | test.rs:26:5:42:5 | exit fn test_break_and_continue (normal) | return |
 | test.rs:31:17:31:29 | ExprStmt | test.rs:31:24:31:28 | false |  |
-| test.rs:31:24:31:28 | false | test.rs:31:17:31:28 | ReturnExpr |  |
+| test.rs:31:24:31:28 | false | test.rs:31:17:31:28 | return false |  |
 | test.rs:33:13:35:13 | ExprStmt | test.rs:33:16:33:16 | i |  |
-| test.rs:33:13:35:13 | IfExpr | test.rs:36:13:38:13 | ExprStmt |  |
+| test.rs:33:13:35:13 | if ... {...} | test.rs:36:13:38:13 | ExprStmt |  |
 | test.rs:33:16:33:16 | i | test.rs:33:21:33:21 | 1 |  |
-| test.rs:33:16:33:21 | ... == ... | test.rs:33:13:35:13 | IfExpr | false |
+| test.rs:33:16:33:21 | ... == ... | test.rs:33:13:35:13 | if ... {...} | false |
 | test.rs:33:16:33:21 | ... == ... | test.rs:34:17:34:22 | ExprStmt | true |
 | test.rs:33:21:33:21 | 1 | test.rs:33:16:33:21 | ... == ... |  |
-| test.rs:34:17:34:21 | BreakExpr | test.rs:28:9:40:9 | LoopExpr | break |
-| test.rs:34:17:34:22 | ExprStmt | test.rs:34:17:34:21 | BreakExpr |  |
+| test.rs:34:17:34:21 | break | test.rs:28:9:40:9 | loop { ... } | break |
+| test.rs:34:17:34:22 | ExprStmt | test.rs:34:17:34:21 | break |  |
 | test.rs:36:13:38:13 | ExprStmt | test.rs:36:16:36:16 | i |  |
-| test.rs:36:13:38:13 | IfExpr | test.rs:39:13:39:13 | i |  |
+| test.rs:36:13:38:13 | if ... {...} | test.rs:39:13:39:13 | i |  |
 | test.rs:36:16:36:16 | i | test.rs:36:20:36:20 | 2 |  |
 | test.rs:36:16:36:20 | ... % ... | test.rs:36:25:36:25 | 0 |  |
-| test.rs:36:16:36:25 | ... != ... | test.rs:36:13:38:13 | IfExpr | false |
+| test.rs:36:16:36:25 | ... != ... | test.rs:36:13:38:13 | if ... {...} | false |
 | test.rs:36:16:36:25 | ... != ... | test.rs:37:17:37:25 | ExprStmt | true |
 | test.rs:36:20:36:20 | 2 | test.rs:36:16:36:20 | ... % ... |  |
 | test.rs:36:25:36:25 | 0 | test.rs:36:16:36:25 | ... != ... |  |
-| test.rs:37:17:37:24 | ContinueExpr | test.rs:29:13:29:24 | ExprStmt | continue |
-| test.rs:37:17:37:25 | ExprStmt | test.rs:37:17:37:24 | ContinueExpr |  |
+| test.rs:37:17:37:24 | continue | test.rs:29:13:29:24 | ExprStmt | continue |
+| test.rs:37:17:37:25 | ExprStmt | test.rs:37:17:37:24 | continue |  |
 | test.rs:39:13:39:13 | i | test.rs:39:17:39:17 | i |  |
-| test.rs:39:13:39:21 | ... = ... | test.rs:28:14:40:9 | BlockExpr |  |
+| test.rs:39:13:39:21 | ... = ... | test.rs:28:14:40:9 | { ... } |  |
 | test.rs:39:17:39:17 | i | test.rs:39:21:39:21 | 2 |  |
 | test.rs:39:17:39:21 | ... / ... | test.rs:39:13:39:21 | ... = ... |  |
 | test.rs:39:21:39:21 | 2 | test.rs:39:17:39:21 | ... / ... |  |
-| test.rs:41:9:41:19 | ReturnExpr | test.rs:26:5:42:5 | exit test_break_and_continue (normal) | return |
+| test.rs:41:9:41:19 | return true | test.rs:26:5:42:5 | exit fn test_break_and_continue (normal) | return |
 | test.rs:41:9:41:20 | ExprStmt | test.rs:41:16:41:19 | true |  |
-| test.rs:41:16:41:19 | true | test.rs:41:9:41:19 | ReturnExpr |  |
-| test.rs:44:5:56:5 | enter test_break_with_labels | test.rs:44:31:44:31 | b |  |
-| test.rs:44:5:56:5 | exit test_break_with_labels (normal) | test.rs:44:5:56:5 | exit test_break_with_labels |  |
-| test.rs:44:31:44:31 | b | test.rs:44:31:44:37 | Param | match |
-| test.rs:44:31:44:37 | Param | test.rs:45:9:54:9 | ExprStmt |  |
-| test.rs:44:48:56:5 | BlockExpr | test.rs:44:5:56:5 | exit test_break_with_labels (normal) |  |
+| test.rs:41:16:41:19 | true | test.rs:41:9:41:19 | return true |  |
+| test.rs:44:5:56:5 | enter fn test_break_with_labels | test.rs:44:31:44:31 | b |  |
+| test.rs:44:5:56:5 | exit fn test_break_with_labels (normal) | test.rs:44:5:56:5 | exit fn test_break_with_labels |  |
+| test.rs:44:31:44:31 | b | test.rs:44:31:44:37 | ...: bool | match |
+| test.rs:44:31:44:37 | ...: bool | test.rs:45:9:54:9 | ExprStmt |  |
+| test.rs:44:48:56:5 | { ... } | test.rs:44:5:56:5 | exit fn test_break_with_labels (normal) |  |
+| test.rs:45:9:54:9 | 'outer: loop { ... } | test.rs:55:9:55:12 | true |  |
 | test.rs:45:9:54:9 | ExprStmt | test.rs:47:17:51:17 | ExprStmt |  |
-| test.rs:45:9:54:9 | LoopExpr | test.rs:55:9:55:12 | true |  |
-| test.rs:45:22:54:9 | BlockExpr | test.rs:47:17:51:17 | ExprStmt |  |
-| test.rs:46:13:53:13 | LoopExpr | test.rs:45:22:54:9 | BlockExpr |  |
+| test.rs:45:22:54:9 | { ... } | test.rs:47:17:51:17 | ExprStmt |  |
+| test.rs:46:13:53:13 | 'inner: loop { ... } | test.rs:45:22:54:9 | { ... } |  |
 | test.rs:47:17:51:17 | ExprStmt | test.rs:47:20:47:20 | b |  |
-| test.rs:47:17:51:17 | IfExpr | test.rs:52:17:52:29 | ExprStmt |  |
+| test.rs:47:17:51:17 | if b {...} else {...} | test.rs:52:17:52:29 | ExprStmt |  |
 | test.rs:47:20:47:20 | b | test.rs:48:21:48:26 | ExprStmt | true |
 | test.rs:47:20:47:20 | b | test.rs:49:27:49:27 | b | false |
-| test.rs:48:21:48:25 | BreakExpr | test.rs:46:13:53:13 | LoopExpr | break |
-| test.rs:48:21:48:26 | ExprStmt | test.rs:48:21:48:25 | BreakExpr |  |
-| test.rs:49:24:51:17 | IfExpr | test.rs:47:17:51:17 | IfExpr |  |
-| test.rs:49:27:49:27 | b | test.rs:49:24:51:17 | IfExpr | false |
+| test.rs:48:21:48:25 | break | test.rs:46:13:53:13 | 'inner: loop { ... } | break |
+| test.rs:48:21:48:26 | ExprStmt | test.rs:48:21:48:25 | break |  |
+| test.rs:49:24:51:17 | if b {...} | test.rs:47:17:51:17 | if b {...} else {...} |  |
+| test.rs:49:27:49:27 | b | test.rs:49:24:51:17 | if b {...} | false |
 | test.rs:49:27:49:27 | b | test.rs:50:21:50:33 | ExprStmt | true |
-| test.rs:50:21:50:32 | BreakExpr | test.rs:45:9:54:9 | LoopExpr | break |
-| test.rs:50:21:50:33 | ExprStmt | test.rs:50:21:50:32 | BreakExpr |  |
-| test.rs:52:17:52:28 | BreakExpr | test.rs:46:13:53:13 | LoopExpr | break |
-| test.rs:52:17:52:29 | ExprStmt | test.rs:52:17:52:28 | BreakExpr |  |
-| test.rs:55:9:55:12 | true | test.rs:44:48:56:5 | BlockExpr |  |
-| test.rs:58:5:70:5 | enter test_continue_with_labels | test.rs:58:34:58:34 | b |  |
-| test.rs:58:34:58:34 | b | test.rs:58:34:58:40 | Param | match |
-| test.rs:58:34:58:40 | Param | test.rs:60:13:60:14 | ExprStmt |  |
+| test.rs:50:21:50:32 | break ''outer | test.rs:45:9:54:9 | 'outer: loop { ... } | break |
+| test.rs:50:21:50:33 | ExprStmt | test.rs:50:21:50:32 | break ''outer |  |
+| test.rs:52:17:52:28 | break ''inner | test.rs:46:13:53:13 | 'inner: loop { ... } | break |
+| test.rs:52:17:52:29 | ExprStmt | test.rs:52:17:52:28 | break ''inner |  |
+| test.rs:55:9:55:12 | true | test.rs:44:48:56:5 | { ... } |  |
+| test.rs:58:5:70:5 | enter fn test_continue_with_labels | test.rs:58:34:58:34 | b |  |
+| test.rs:58:34:58:34 | b | test.rs:58:34:58:40 | ...: bool | match |
+| test.rs:58:34:58:40 | ...: bool | test.rs:60:13:60:14 | ExprStmt |  |
 | test.rs:60:13:60:13 | 1 | test.rs:62:17:66:17 | ExprStmt |  |
 | test.rs:60:13:60:14 | ExprStmt | test.rs:60:13:60:13 | 1 |  |
 | test.rs:62:17:66:17 | ExprStmt | test.rs:62:20:62:20 | b |  |
-| test.rs:62:17:66:17 | IfExpr | test.rs:67:17:67:32 | ExprStmt |  |
+| test.rs:62:17:66:17 | if b {...} else {...} | test.rs:67:17:67:32 | ExprStmt |  |
 | test.rs:62:20:62:20 | b | test.rs:63:21:63:29 | ExprStmt | true |
 | test.rs:62:20:62:20 | b | test.rs:64:27:64:27 | b | false |
-| test.rs:63:21:63:28 | ContinueExpr | test.rs:62:17:66:17 | ExprStmt | continue |
-| test.rs:63:21:63:29 | ExprStmt | test.rs:63:21:63:28 | ContinueExpr |  |
-| test.rs:64:24:66:17 | IfExpr | test.rs:62:17:66:17 | IfExpr |  |
-| test.rs:64:27:64:27 | b | test.rs:64:24:66:17 | IfExpr | false |
+| test.rs:63:21:63:28 | continue | test.rs:62:17:66:17 | ExprStmt | continue |
+| test.rs:63:21:63:29 | ExprStmt | test.rs:63:21:63:28 | continue |  |
+| test.rs:64:24:66:17 | if b {...} | test.rs:62:17:66:17 | if b {...} else {...} |  |
+| test.rs:64:27:64:27 | b | test.rs:64:24:66:17 | if b {...} | false |
 | test.rs:64:27:64:27 | b | test.rs:65:21:65:36 | ExprStmt | true |
-| test.rs:65:21:65:35 | ContinueExpr | test.rs:60:13:60:14 | ExprStmt | continue |
-| test.rs:65:21:65:36 | ExprStmt | test.rs:65:21:65:35 | ContinueExpr |  |
-| test.rs:67:17:67:31 | ContinueExpr | test.rs:62:17:66:17 | ExprStmt | continue |
-| test.rs:67:17:67:32 | ExprStmt | test.rs:67:17:67:31 | ContinueExpr |  |
-| test.rs:72:5:84:5 | enter test_loop_label_shadowing | test.rs:72:34:72:34 | b |  |
-| test.rs:72:34:72:34 | b | test.rs:72:34:72:40 | Param | match |
-| test.rs:72:34:72:40 | Param | test.rs:74:13:74:14 | ExprStmt |  |
+| test.rs:65:21:65:35 | continue 'outer | test.rs:60:13:60:14 | ExprStmt | continue |
+| test.rs:65:21:65:36 | ExprStmt | test.rs:65:21:65:35 | continue 'outer |  |
+| test.rs:67:17:67:31 | continue 'inner | test.rs:62:17:66:17 | ExprStmt | continue |
+| test.rs:67:17:67:32 | ExprStmt | test.rs:67:17:67:31 | continue 'inner |  |
+| test.rs:72:5:84:5 | enter fn test_loop_label_shadowing | test.rs:72:34:72:34 | b |  |
+| test.rs:72:34:72:34 | b | test.rs:72:34:72:40 | ...: bool | match |
+| test.rs:72:34:72:40 | ...: bool | test.rs:74:13:74:14 | ExprStmt |  |
 | test.rs:74:13:74:13 | 1 | test.rs:76:17:80:17 | ExprStmt |  |
 | test.rs:74:13:74:14 | ExprStmt | test.rs:74:13:74:13 | 1 |  |
 | test.rs:76:17:80:17 | ExprStmt | test.rs:76:20:76:20 | b |  |
-| test.rs:76:17:80:17 | IfExpr | test.rs:81:17:81:32 | ExprStmt |  |
+| test.rs:76:17:80:17 | if b {...} else {...} | test.rs:81:17:81:32 | ExprStmt |  |
 | test.rs:76:20:76:20 | b | test.rs:77:21:77:29 | ExprStmt | true |
 | test.rs:76:20:76:20 | b | test.rs:78:27:78:27 | b | false |
-| test.rs:77:21:77:28 | ContinueExpr | test.rs:76:17:80:17 | ExprStmt | continue |
-| test.rs:77:21:77:29 | ExprStmt | test.rs:77:21:77:28 | ContinueExpr |  |
-| test.rs:78:24:80:17 | IfExpr | test.rs:76:17:80:17 | IfExpr |  |
-| test.rs:78:27:78:27 | b | test.rs:78:24:80:17 | IfExpr | false |
+| test.rs:77:21:77:28 | continue | test.rs:76:17:80:17 | ExprStmt | continue |
+| test.rs:77:21:77:29 | ExprStmt | test.rs:77:21:77:28 | continue |  |
+| test.rs:78:24:80:17 | if b {...} | test.rs:76:17:80:17 | if b {...} else {...} |  |
+| test.rs:78:27:78:27 | b | test.rs:78:24:80:17 | if b {...} | false |
 | test.rs:78:27:78:27 | b | test.rs:79:21:79:36 | ExprStmt | true |
-| test.rs:79:21:79:35 | ContinueExpr | test.rs:76:17:80:17 | ExprStmt | continue |
-| test.rs:79:21:79:36 | ExprStmt | test.rs:79:21:79:35 | ContinueExpr |  |
-| test.rs:81:17:81:31 | ContinueExpr | test.rs:76:17:80:17 | ExprStmt | continue |
-| test.rs:81:17:81:32 | ExprStmt | test.rs:81:17:81:31 | ContinueExpr |  |
-| test.rs:86:5:95:5 | enter test_while | test.rs:86:19:86:19 | i |  |
-| test.rs:86:5:95:5 | exit test_while (normal) | test.rs:86:5:95:5 | exit test_while |  |
-| test.rs:86:19:86:19 | i | test.rs:86:19:86:24 | Param | match |
-| test.rs:86:19:86:24 | Param | test.rs:87:9:87:25 | LetStmt |  |
-| test.rs:86:27:95:5 | BlockExpr | test.rs:86:5:95:5 | exit test_while (normal) |  |
-| test.rs:87:9:87:25 | LetStmt | test.rs:87:21:87:24 | true |  |
+| test.rs:79:21:79:35 | continue 'label | test.rs:76:17:80:17 | ExprStmt | continue |
+| test.rs:79:21:79:36 | ExprStmt | test.rs:79:21:79:35 | continue 'label |  |
+| test.rs:81:17:81:31 | continue 'label | test.rs:76:17:80:17 | ExprStmt | continue |
+| test.rs:81:17:81:32 | ExprStmt | test.rs:81:17:81:31 | continue 'label |  |
+| test.rs:86:5:95:5 | enter fn test_while | test.rs:86:19:86:19 | i |  |
+| test.rs:86:5:95:5 | exit fn test_while (normal) | test.rs:86:5:95:5 | exit fn test_while |  |
+| test.rs:86:19:86:19 | i | test.rs:86:19:86:24 | ...: i64 | match |
+| test.rs:86:19:86:24 | ...: i64 | test.rs:87:9:87:25 | let ... = true |  |
+| test.rs:86:27:95:5 | { ... } | test.rs:86:5:95:5 | exit fn test_while (normal) |  |
+| test.rs:87:9:87:25 | let ... = true | test.rs:87:21:87:24 | true |  |
 | test.rs:87:13:87:17 | b | test.rs:88:15:88:15 | b | match |
 | test.rs:87:21:87:24 | true | test.rs:87:13:87:17 | b |  |
-| test.rs:88:9:94:9 | WhileExpr | test.rs:86:27:95:5 | BlockExpr |  |
-| test.rs:88:15:88:15 | b | test.rs:88:9:94:9 | WhileExpr | false |
+| test.rs:88:9:94:9 | while b { ... } | test.rs:86:27:95:5 | { ... } |  |
+| test.rs:88:15:88:15 | b | test.rs:88:9:94:9 | while b { ... } | false |
 | test.rs:88:15:88:15 | b | test.rs:89:13:89:14 | ExprStmt | true |
-| test.rs:88:17:94:9 | BlockExpr | test.rs:88:15:88:15 | b |  |
+| test.rs:88:17:94:9 | { ... } | test.rs:88:15:88:15 | b |  |
 | test.rs:89:13:89:13 | 1 | test.rs:90:13:92:13 | ExprStmt |  |
 | test.rs:89:13:89:14 | ExprStmt | test.rs:89:13:89:13 | 1 |  |
 | test.rs:90:13:92:13 | ExprStmt | test.rs:90:17:90:17 | i |  |
-| test.rs:90:13:92:13 | IfExpr | test.rs:93:13:93:22 | ExprStmt |  |
+| test.rs:90:13:92:13 | if ... {...} | test.rs:93:13:93:22 | ExprStmt |  |
 | test.rs:90:17:90:17 | i | test.rs:90:21:90:21 | 0 |  |
-| test.rs:90:17:90:21 | ... > ... | test.rs:90:13:92:13 | IfExpr | false |
+| test.rs:90:17:90:21 | ... > ... | test.rs:90:13:92:13 | if ... {...} | false |
 | test.rs:90:17:90:21 | ... > ... | test.rs:91:17:91:22 | ExprStmt | true |
 | test.rs:90:21:90:21 | 0 | test.rs:90:17:90:21 | ... > ... |  |
-| test.rs:91:17:91:21 | BreakExpr | test.rs:88:9:94:9 | WhileExpr | break |
-| test.rs:91:17:91:22 | ExprStmt | test.rs:91:17:91:21 | BreakExpr |  |
+| test.rs:91:17:91:21 | break | test.rs:88:9:94:9 | while b { ... } | break |
+| test.rs:91:17:91:22 | ExprStmt | test.rs:91:17:91:21 | break |  |
 | test.rs:93:13:93:13 | b | test.rs:93:17:93:21 | false |  |
-| test.rs:93:13:93:21 | ... = ... | test.rs:88:17:94:9 | BlockExpr |  |
+| test.rs:93:13:93:21 | ... = ... | test.rs:88:17:94:9 | { ... } |  |
 | test.rs:93:13:93:22 | ExprStmt | test.rs:93:13:93:13 | b |  |
 | test.rs:93:17:93:21 | false | test.rs:93:13:93:21 | ... = ... |  |
-| test.rs:97:5:104:5 | enter test_while_let | test.rs:98:9:98:29 | LetStmt |  |
-| test.rs:97:5:104:5 | exit test_while_let (normal) | test.rs:97:5:104:5 | exit test_while_let |  |
-| test.rs:97:25:104:5 | BlockExpr | test.rs:97:5:104:5 | exit test_while_let (normal) |  |
-| test.rs:98:9:98:29 | LetStmt | test.rs:98:24:98:24 | 1 |  |
-| test.rs:98:13:98:20 | iter | test.rs:99:15:99:39 | LetExpr | match |
+| test.rs:97:5:104:5 | enter fn test_while_let | test.rs:98:9:98:29 | let ... = ... |  |
+| test.rs:97:5:104:5 | exit fn test_while_let (normal) | test.rs:97:5:104:5 | exit fn test_while_let |  |
+| test.rs:97:25:104:5 | { ... } | test.rs:97:5:104:5 | exit fn test_while_let (normal) |  |
+| test.rs:98:9:98:29 | let ... = ... | test.rs:98:24:98:24 | 1 |  |
+| test.rs:98:13:98:20 | iter | test.rs:99:15:99:39 | let ... = ... | match |
 | test.rs:98:24:98:24 | 1 | test.rs:98:27:98:28 | 10 |  |
-| test.rs:98:24:98:28 | RangeExpr | test.rs:98:13:98:20 | iter |  |
-| test.rs:98:27:98:28 | 10 | test.rs:98:24:98:28 | RangeExpr |  |
-| test.rs:99:9:103:9 | WhileExpr | test.rs:97:25:104:5 | BlockExpr |  |
-| test.rs:99:15:99:39 | LetExpr | test.rs:99:29:99:32 | iter |  |
-| test.rs:99:19:99:25 | TupleStructPat | test.rs:99:9:103:9 | WhileExpr | no-match |
-| test.rs:99:19:99:25 | TupleStructPat | test.rs:99:24:99:24 | x | match |
+| test.rs:98:24:98:28 | 1..10 | test.rs:98:13:98:20 | iter |  |
+| test.rs:98:27:98:28 | 10 | test.rs:98:24:98:28 | 1..10 |  |
+| test.rs:99:9:103:9 | while ... { ... } | test.rs:97:25:104:5 | { ... } |  |
+| test.rs:99:15:99:39 | let ... = ... | test.rs:99:29:99:32 | iter |  |
+| test.rs:99:19:99:25 | Some(...) | test.rs:99:9:103:9 | while ... { ... } | no-match |
+| test.rs:99:19:99:25 | Some(...) | test.rs:99:24:99:24 | x | match |
 | test.rs:99:24:99:24 | x | test.rs:100:17:100:17 | x | match |
 | test.rs:99:29:99:32 | iter | test.rs:99:29:99:39 | ... .next(...) |  |
-| test.rs:99:29:99:39 | ... .next(...) | test.rs:99:19:99:25 | TupleStructPat |  |
-| test.rs:99:41:103:9 | BlockExpr | test.rs:99:15:99:39 | LetExpr |  |
-| test.rs:100:13:102:13 | IfExpr | test.rs:99:41:103:9 | BlockExpr |  |
+| test.rs:99:29:99:39 | ... .next(...) | test.rs:99:19:99:25 | Some(...) |  |
+| test.rs:99:41:103:9 | { ... } | test.rs:99:15:99:39 | let ... = ... |  |
+| test.rs:100:13:102:13 | if ... {...} | test.rs:99:41:103:9 | { ... } |  |
 | test.rs:100:17:100:17 | x | test.rs:100:22:100:22 | 5 |  |
-| test.rs:100:17:100:22 | ... == ... | test.rs:100:13:102:13 | IfExpr | false |
+| test.rs:100:17:100:22 | ... == ... | test.rs:100:13:102:13 | if ... {...} | false |
 | test.rs:100:17:100:22 | ... == ... | test.rs:101:17:101:22 | ExprStmt | true |
 | test.rs:100:22:100:22 | 5 | test.rs:100:17:100:22 | ... == ... |  |
-| test.rs:101:17:101:21 | BreakExpr | test.rs:99:9:103:9 | WhileExpr | break |
-| test.rs:101:17:101:22 | ExprStmt | test.rs:101:17:101:21 | BreakExpr |  |
-| test.rs:106:5:113:5 | enter test_for | test.rs:106:17:106:17 | j |  |
-| test.rs:106:5:113:5 | exit test_for (normal) | test.rs:106:5:113:5 | exit test_for |  |
-| test.rs:106:17:106:17 | j | test.rs:106:17:106:22 | Param | match |
-| test.rs:106:17:106:22 | Param | test.rs:107:18:107:18 | 0 |  |
-| test.rs:106:25:113:5 | BlockExpr | test.rs:106:5:113:5 | exit test_for (normal) |  |
-| test.rs:107:9:112:9 | ForExpr | test.rs:106:25:113:5 | BlockExpr |  |
-| test.rs:107:13:107:13 | i | test.rs:107:9:112:9 | ForExpr | no-match |
+| test.rs:101:17:101:21 | break | test.rs:99:9:103:9 | while ... { ... } | break |
+| test.rs:101:17:101:22 | ExprStmt | test.rs:101:17:101:21 | break |  |
+| test.rs:106:5:113:5 | enter fn test_for | test.rs:106:17:106:17 | j |  |
+| test.rs:106:5:113:5 | exit fn test_for (normal) | test.rs:106:5:113:5 | exit fn test_for |  |
+| test.rs:106:17:106:17 | j | test.rs:106:17:106:22 | ...: i64 | match |
+| test.rs:106:17:106:22 | ...: i64 | test.rs:107:18:107:18 | 0 |  |
+| test.rs:106:25:113:5 | { ... } | test.rs:106:5:113:5 | exit fn test_for (normal) |  |
+| test.rs:107:9:112:9 | for ... in ... { ... } | test.rs:106:25:113:5 | { ... } |  |
+| test.rs:107:13:107:13 | i | test.rs:107:9:112:9 | for ... in ... { ... } | no-match |
 | test.rs:107:13:107:13 | i | test.rs:108:13:110:13 | ExprStmt | match |
 | test.rs:107:18:107:18 | 0 | test.rs:107:21:107:22 | 10 |  |
-| test.rs:107:18:107:22 | RangeExpr | test.rs:107:13:107:13 | i |  |
-| test.rs:107:21:107:22 | 10 | test.rs:107:18:107:22 | RangeExpr |  |
-| test.rs:107:24:112:9 | BlockExpr | test.rs:107:13:107:13 | i |  |
+| test.rs:107:18:107:22 | 0..10 | test.rs:107:13:107:13 | i |  |
+| test.rs:107:21:107:22 | 10 | test.rs:107:18:107:22 | 0..10 |  |
+| test.rs:107:24:112:9 | { ... } | test.rs:107:13:107:13 | i |  |
 | test.rs:108:13:110:13 | ExprStmt | test.rs:108:17:108:17 | i |  |
-| test.rs:108:13:110:13 | IfExpr | test.rs:111:13:111:14 | ExprStmt |  |
+| test.rs:108:13:110:13 | if ... {...} | test.rs:111:13:111:14 | ExprStmt |  |
 | test.rs:108:17:108:17 | i | test.rs:108:22:108:22 | j |  |
-| test.rs:108:17:108:22 | ... == ... | test.rs:108:13:110:13 | IfExpr | false |
+| test.rs:108:17:108:22 | ... == ... | test.rs:108:13:110:13 | if ... {...} | false |
 | test.rs:108:17:108:22 | ... == ... | test.rs:109:17:109:22 | ExprStmt | true |
 | test.rs:108:22:108:22 | j | test.rs:108:17:108:22 | ... == ... |  |
-| test.rs:109:17:109:21 | BreakExpr | test.rs:107:9:112:9 | ForExpr | break |
-| test.rs:109:17:109:22 | ExprStmt | test.rs:109:17:109:21 | BreakExpr |  |
-| test.rs:111:13:111:13 | 1 | test.rs:107:24:112:9 | BlockExpr |  |
+| test.rs:109:17:109:21 | break | test.rs:107:9:112:9 | for ... in ... { ... } | break |
+| test.rs:109:17:109:22 | ExprStmt | test.rs:109:17:109:21 | break |  |
+| test.rs:111:13:111:13 | 1 | test.rs:107:24:112:9 | { ... } |  |
 | test.rs:111:13:111:14 | ExprStmt | test.rs:111:13:111:13 | 1 |  |
-| test.rs:115:5:119:5 | enter break_with_return | test.rs:117:13:117:27 | ExprStmt |  |
-| test.rs:115:5:119:5 | exit break_with_return (normal) | test.rs:115:5:119:5 | exit break_with_return |  |
+| test.rs:115:5:119:5 | enter fn break_with_return | test.rs:117:13:117:27 | ExprStmt |  |
+| test.rs:115:5:119:5 | exit fn break_with_return (normal) | test.rs:115:5:119:5 | exit fn break_with_return |  |
 | test.rs:117:13:117:27 | ExprStmt | test.rs:117:26:117:26 | 1 |  |
-| test.rs:117:19:117:26 | ReturnExpr | test.rs:115:5:119:5 | exit break_with_return (normal) | return |
-| test.rs:117:26:117:26 | 1 | test.rs:117:19:117:26 | ReturnExpr |  |
-| test.rs:122:1:125:1 | enter test_nested_function | test.rs:122:25:122:25 | n |  |
-| test.rs:122:1:125:1 | exit test_nested_function (normal) | test.rs:122:1:125:1 | exit test_nested_function |  |
-| test.rs:122:25:122:25 | n | test.rs:122:25:122:30 | Param | match |
-| test.rs:122:25:122:30 | Param | test.rs:123:5:123:28 | LetStmt |  |
-| test.rs:122:40:125:1 | BlockExpr | test.rs:122:1:125:1 | exit test_nested_function (normal) |  |
-| test.rs:123:5:123:28 | LetStmt | test.rs:123:19:123:27 | ClosureExpr |  |
+| test.rs:117:19:117:26 | return 1 | test.rs:115:5:119:5 | exit fn break_with_return (normal) | return |
+| test.rs:117:26:117:26 | 1 | test.rs:117:19:117:26 | return 1 |  |
+| test.rs:122:1:125:1 | enter fn test_nested_function | test.rs:122:25:122:25 | n |  |
+| test.rs:122:1:125:1 | exit fn test_nested_function (normal) | test.rs:122:1:125:1 | exit fn test_nested_function |  |
+| test.rs:122:25:122:25 | n | test.rs:122:25:122:30 | ...: i64 | match |
+| test.rs:122:25:122:30 | ...: i64 | test.rs:123:5:123:28 | let ... = ... |  |
+| test.rs:122:40:125:1 | { ... } | test.rs:122:1:125:1 | exit fn test_nested_function (normal) |  |
+| test.rs:123:5:123:28 | let ... = ... | test.rs:123:19:123:27 | \|...\| ... |  |
 | test.rs:123:9:123:15 | add_one | test.rs:124:5:124:11 | add_one | match |
-| test.rs:123:19:123:27 | ClosureExpr | test.rs:123:9:123:15 | add_one |  |
-| test.rs:123:19:123:27 | enter ClosureExpr | test.rs:123:20:123:20 | i |  |
-| test.rs:123:19:123:27 | exit ClosureExpr (normal) | test.rs:123:19:123:27 | exit ClosureExpr |  |
-| test.rs:123:20:123:20 | Param | test.rs:123:23:123:23 | i |  |
-| test.rs:123:20:123:20 | i | test.rs:123:20:123:20 | Param | match |
+| test.rs:123:19:123:27 | \|...\| ... | test.rs:123:9:123:15 | add_one |  |
+| test.rs:123:19:123:27 | enter \|...\| ... | test.rs:123:20:123:20 | i |  |
+| test.rs:123:19:123:27 | exit \|...\| ... (normal) | test.rs:123:19:123:27 | exit \|...\| ... |  |
+| test.rs:123:20:123:20 | ... | test.rs:123:23:123:23 | i |  |
+| test.rs:123:20:123:20 | i | test.rs:123:20:123:20 | ... | match |
 | test.rs:123:23:123:23 | i | test.rs:123:27:123:27 | 1 |  |
-| test.rs:123:23:123:27 | ... + ... | test.rs:123:19:123:27 | exit ClosureExpr (normal) |  |
+| test.rs:123:23:123:27 | ... + ... | test.rs:123:19:123:27 | exit \|...\| ... (normal) |  |
 | test.rs:123:27:123:27 | 1 | test.rs:123:23:123:27 | ... + ... |  |
 | test.rs:124:5:124:11 | add_one | test.rs:124:13:124:19 | add_one |  |
-| test.rs:124:5:124:23 | CallExpr | test.rs:122:40:125:1 | BlockExpr |  |
+| test.rs:124:5:124:23 | add_one(...) | test.rs:122:40:125:1 | { ... } |  |
 | test.rs:124:13:124:19 | add_one | test.rs:124:21:124:21 | n |  |
-| test.rs:124:13:124:22 | CallExpr | test.rs:124:5:124:23 | CallExpr |  |
-| test.rs:124:21:124:21 | n | test.rs:124:13:124:22 | CallExpr |  |
-| test.rs:129:5:135:5 | enter test_if_else | test.rs:129:21:129:21 | n |  |
-| test.rs:129:5:135:5 | exit test_if_else (normal) | test.rs:129:5:135:5 | exit test_if_else |  |
-| test.rs:129:21:129:21 | n | test.rs:129:21:129:26 | Param | match |
-| test.rs:129:21:129:26 | Param | test.rs:130:12:130:12 | n |  |
-| test.rs:129:36:135:5 | BlockExpr | test.rs:129:5:135:5 | exit test_if_else (normal) |  |
-| test.rs:130:9:134:9 | IfExpr | test.rs:129:36:135:5 | BlockExpr |  |
+| test.rs:124:13:124:22 | add_one(...) | test.rs:124:5:124:23 | add_one(...) |  |
+| test.rs:124:21:124:21 | n | test.rs:124:13:124:22 | add_one(...) |  |
+| test.rs:129:5:135:5 | enter fn test_if_else | test.rs:129:21:129:21 | n |  |
+| test.rs:129:5:135:5 | exit fn test_if_else (normal) | test.rs:129:5:135:5 | exit fn test_if_else |  |
+| test.rs:129:21:129:21 | n | test.rs:129:21:129:26 | ...: i64 | match |
+| test.rs:129:21:129:26 | ...: i64 | test.rs:130:12:130:12 | n |  |
+| test.rs:129:36:135:5 | { ... } | test.rs:129:5:135:5 | exit fn test_if_else (normal) |  |
+| test.rs:130:9:134:9 | if ... {...} else {...} | test.rs:129:36:135:5 | { ... } |  |
 | test.rs:130:12:130:12 | n | test.rs:130:17:130:17 | 0 |  |
 | test.rs:130:12:130:17 | ... <= ... | test.rs:131:13:131:13 | 0 | true |
 | test.rs:130:12:130:17 | ... <= ... | test.rs:133:13:133:13 | n | false |
 | test.rs:130:17:130:17 | 0 | test.rs:130:12:130:17 | ... <= ... |  |
-| test.rs:130:19:132:9 | BlockExpr | test.rs:130:9:134:9 | IfExpr |  |
-| test.rs:131:13:131:13 | 0 | test.rs:130:19:132:9 | BlockExpr |  |
-| test.rs:132:16:134:9 | BlockExpr | test.rs:130:9:134:9 | IfExpr |  |
+| test.rs:130:19:132:9 | { ... } | test.rs:130:9:134:9 | if ... {...} else {...} |  |
+| test.rs:131:13:131:13 | 0 | test.rs:130:19:132:9 | { ... } |  |
+| test.rs:132:16:134:9 | { ... } | test.rs:130:9:134:9 | if ... {...} else {...} |  |
 | test.rs:133:13:133:13 | n | test.rs:133:17:133:17 | 1 |  |
-| test.rs:133:13:133:17 | ... - ... | test.rs:132:16:134:9 | BlockExpr |  |
+| test.rs:133:13:133:17 | ... - ... | test.rs:132:16:134:9 | { ... } |  |
 | test.rs:133:17:133:17 | 1 | test.rs:133:13:133:17 | ... - ... |  |
-| test.rs:137:5:143:5 | enter test_if_let_else | test.rs:137:25:137:25 | a |  |
-| test.rs:137:5:143:5 | exit test_if_let_else (normal) | test.rs:137:5:143:5 | exit test_if_let_else |  |
-| test.rs:137:25:137:25 | a | test.rs:137:25:137:38 | Param | match |
-| test.rs:137:25:137:38 | Param | test.rs:138:12:138:26 | LetExpr |  |
-| test.rs:137:48:143:5 | BlockExpr | test.rs:137:5:143:5 | exit test_if_let_else (normal) |  |
-| test.rs:138:9:142:9 | IfExpr | test.rs:137:48:143:5 | BlockExpr |  |
-| test.rs:138:12:138:26 | LetExpr | test.rs:138:26:138:26 | a |  |
-| test.rs:138:16:138:22 | TupleStructPat | test.rs:138:21:138:21 | n | match |
-| test.rs:138:16:138:22 | TupleStructPat | test.rs:141:13:141:13 | 0 | no-match |
+| test.rs:137:5:143:5 | enter fn test_if_let_else | test.rs:137:25:137:25 | a |  |
+| test.rs:137:5:143:5 | exit fn test_if_let_else (normal) | test.rs:137:5:143:5 | exit fn test_if_let_else |  |
+| test.rs:137:25:137:25 | a | test.rs:137:25:137:38 | ...: Option::<...> | match |
+| test.rs:137:25:137:38 | ...: Option::<...> | test.rs:138:12:138:26 | let ... = a |  |
+| test.rs:137:48:143:5 | { ... } | test.rs:137:5:143:5 | exit fn test_if_let_else (normal) |  |
+| test.rs:138:9:142:9 | if ... {...} else {...} | test.rs:137:48:143:5 | { ... } |  |
+| test.rs:138:12:138:26 | let ... = a | test.rs:138:26:138:26 | a |  |
+| test.rs:138:16:138:22 | Some(...) | test.rs:138:21:138:21 | n | match |
+| test.rs:138:16:138:22 | Some(...) | test.rs:141:13:141:13 | 0 | no-match |
 | test.rs:138:21:138:21 | n | test.rs:139:13:139:13 | n | match |
-| test.rs:138:26:138:26 | a | test.rs:138:16:138:22 | TupleStructPat |  |
-| test.rs:138:28:140:9 | BlockExpr | test.rs:138:9:142:9 | IfExpr |  |
-| test.rs:139:13:139:13 | n | test.rs:138:28:140:9 | BlockExpr |  |
-| test.rs:140:16:142:9 | BlockExpr | test.rs:138:9:142:9 | IfExpr |  |
-| test.rs:141:13:141:13 | 0 | test.rs:140:16:142:9 | BlockExpr |  |
-| test.rs:145:5:150:5 | enter test_if_let | test.rs:145:20:145:20 | a |  |
-| test.rs:145:5:150:5 | exit test_if_let (normal) | test.rs:145:5:150:5 | exit test_if_let |  |
-| test.rs:145:20:145:20 | a | test.rs:145:20:145:33 | Param | match |
-| test.rs:145:20:145:33 | Param | test.rs:146:9:148:9 | ExprStmt |  |
-| test.rs:145:43:150:5 | BlockExpr | test.rs:145:5:150:5 | exit test_if_let (normal) |  |
-| test.rs:146:9:148:9 | ExprStmt | test.rs:146:12:146:26 | LetExpr |  |
-| test.rs:146:9:148:9 | IfExpr | test.rs:149:9:149:9 | 0 |  |
-| test.rs:146:12:146:26 | LetExpr | test.rs:146:26:146:26 | a |  |
-| test.rs:146:16:146:22 | TupleStructPat | test.rs:146:9:148:9 | IfExpr | no-match |
-| test.rs:146:16:146:22 | TupleStructPat | test.rs:146:21:146:21 | n | match |
+| test.rs:138:26:138:26 | a | test.rs:138:16:138:22 | Some(...) |  |
+| test.rs:138:28:140:9 | { ... } | test.rs:138:9:142:9 | if ... {...} else {...} |  |
+| test.rs:139:13:139:13 | n | test.rs:138:28:140:9 | { ... } |  |
+| test.rs:140:16:142:9 | { ... } | test.rs:138:9:142:9 | if ... {...} else {...} |  |
+| test.rs:141:13:141:13 | 0 | test.rs:140:16:142:9 | { ... } |  |
+| test.rs:145:5:150:5 | enter fn test_if_let | test.rs:145:20:145:20 | a |  |
+| test.rs:145:5:150:5 | exit fn test_if_let (normal) | test.rs:145:5:150:5 | exit fn test_if_let |  |
+| test.rs:145:20:145:20 | a | test.rs:145:20:145:33 | ...: Option::<...> | match |
+| test.rs:145:20:145:33 | ...: Option::<...> | test.rs:146:9:148:9 | ExprStmt |  |
+| test.rs:145:43:150:5 | { ... } | test.rs:145:5:150:5 | exit fn test_if_let (normal) |  |
+| test.rs:146:9:148:9 | ExprStmt | test.rs:146:12:146:26 | let ... = a |  |
+| test.rs:146:9:148:9 | if ... {...} | test.rs:149:9:149:9 | 0 |  |
+| test.rs:146:12:146:26 | let ... = a | test.rs:146:26:146:26 | a |  |
+| test.rs:146:16:146:22 | Some(...) | test.rs:146:9:148:9 | if ... {...} | no-match |
+| test.rs:146:16:146:22 | Some(...) | test.rs:146:21:146:21 | n | match |
 | test.rs:146:21:146:21 | n | test.rs:147:13:147:21 | ExprStmt | match |
-| test.rs:146:26:146:26 | a | test.rs:146:16:146:22 | TupleStructPat |  |
-| test.rs:147:13:147:20 | ReturnExpr | test.rs:145:5:150:5 | exit test_if_let (normal) | return |
+| test.rs:146:26:146:26 | a | test.rs:146:16:146:22 | Some(...) |  |
+| test.rs:147:13:147:20 | return n | test.rs:145:5:150:5 | exit fn test_if_let (normal) | return |
 | test.rs:147:13:147:21 | ExprStmt | test.rs:147:20:147:20 | n |  |
-| test.rs:147:20:147:20 | n | test.rs:147:13:147:20 | ReturnExpr |  |
-| test.rs:149:9:149:9 | 0 | test.rs:145:43:150:5 | BlockExpr |  |
-| test.rs:152:5:158:5 | enter test_nested_if | test.rs:152:23:152:23 | a |  |
-| test.rs:152:5:158:5 | exit test_nested_if (normal) | test.rs:152:5:158:5 | exit test_nested_if |  |
-| test.rs:152:23:152:23 | a | test.rs:152:23:152:28 | Param | match |
-| test.rs:152:23:152:28 | Param | test.rs:153:16:153:16 | a |  |
-| test.rs:152:38:158:5 | BlockExpr | test.rs:152:5:158:5 | exit test_nested_if (normal) |  |
-| test.rs:153:9:157:9 | IfExpr | test.rs:152:38:158:5 | BlockExpr |  |
-| test.rs:153:13:153:48 | [boolean(false)] IfExpr | test.rs:156:13:156:13 | 0 | false |
-| test.rs:153:13:153:48 | [boolean(true)] IfExpr | test.rs:154:13:154:13 | 1 | true |
+| test.rs:147:20:147:20 | n | test.rs:147:13:147:20 | return n |  |
+| test.rs:149:9:149:9 | 0 | test.rs:145:43:150:5 | { ... } |  |
+| test.rs:152:5:158:5 | enter fn test_nested_if | test.rs:152:23:152:23 | a |  |
+| test.rs:152:5:158:5 | exit fn test_nested_if (normal) | test.rs:152:5:158:5 | exit fn test_nested_if |  |
+| test.rs:152:23:152:23 | a | test.rs:152:23:152:28 | ...: i64 | match |
+| test.rs:152:23:152:28 | ...: i64 | test.rs:153:16:153:16 | a |  |
+| test.rs:152:38:158:5 | { ... } | test.rs:152:5:158:5 | exit fn test_nested_if (normal) |  |
+| test.rs:153:9:157:9 | if ... {...} else {...} | test.rs:152:38:158:5 | { ... } |  |
+| test.rs:153:13:153:48 | [boolean(false)] if ... {...} else {...} | test.rs:156:13:156:13 | 0 | false |
+| test.rs:153:13:153:48 | [boolean(true)] if ... {...} else {...} | test.rs:154:13:154:13 | 1 | true |
 | test.rs:153:16:153:16 | a | test.rs:153:20:153:20 | 0 |  |
 | test.rs:153:16:153:20 | ... < ... | test.rs:153:24:153:24 | a | true |
 | test.rs:153:16:153:20 | ... < ... | test.rs:153:41:153:41 | a | false |
 | test.rs:153:20:153:20 | 0 | test.rs:153:16:153:20 | ... < ... |  |
-| test.rs:153:22:153:32 | [boolean(false)] BlockExpr | test.rs:153:13:153:48 | [boolean(false)] IfExpr | false |
-| test.rs:153:22:153:32 | [boolean(true)] BlockExpr | test.rs:153:13:153:48 | [boolean(true)] IfExpr | true |
+| test.rs:153:22:153:32 | [boolean(false)] { ... } | test.rs:153:13:153:48 | [boolean(false)] if ... {...} else {...} | false |
+| test.rs:153:22:153:32 | [boolean(true)] { ... } | test.rs:153:13:153:48 | [boolean(true)] if ... {...} else {...} | true |
 | test.rs:153:24:153:24 | a | test.rs:153:29:153:30 | 10 |  |
-| test.rs:153:24:153:30 | ... < ... | test.rs:153:22:153:32 | [boolean(false)] BlockExpr | false |
-| test.rs:153:24:153:30 | ... < ... | test.rs:153:22:153:32 | [boolean(true)] BlockExpr | true |
+| test.rs:153:24:153:30 | ... < ... | test.rs:153:22:153:32 | [boolean(false)] { ... } | false |
+| test.rs:153:24:153:30 | ... < ... | test.rs:153:22:153:32 | [boolean(true)] { ... } | true |
 | test.rs:153:28:153:30 | - ... | test.rs:153:24:153:30 | ... < ... |  |
 | test.rs:153:29:153:30 | 10 | test.rs:153:28:153:30 | - ... |  |
-| test.rs:153:39:153:48 | [boolean(false)] BlockExpr | test.rs:153:13:153:48 | [boolean(false)] IfExpr | false |
-| test.rs:153:39:153:48 | [boolean(true)] BlockExpr | test.rs:153:13:153:48 | [boolean(true)] IfExpr | true |
+| test.rs:153:39:153:48 | [boolean(false)] { ... } | test.rs:153:13:153:48 | [boolean(false)] if ... {...} else {...} | false |
+| test.rs:153:39:153:48 | [boolean(true)] { ... } | test.rs:153:13:153:48 | [boolean(true)] if ... {...} else {...} | true |
 | test.rs:153:41:153:41 | a | test.rs:153:45:153:46 | 10 |  |
-| test.rs:153:41:153:46 | ... > ... | test.rs:153:39:153:48 | [boolean(false)] BlockExpr | false |
-| test.rs:153:41:153:46 | ... > ... | test.rs:153:39:153:48 | [boolean(true)] BlockExpr | true |
+| test.rs:153:41:153:46 | ... > ... | test.rs:153:39:153:48 | [boolean(false)] { ... } | false |
+| test.rs:153:41:153:46 | ... > ... | test.rs:153:39:153:48 | [boolean(true)] { ... } | true |
 | test.rs:153:45:153:46 | 10 | test.rs:153:41:153:46 | ... > ... |  |
-| test.rs:153:51:155:9 | BlockExpr | test.rs:153:9:157:9 | IfExpr |  |
-| test.rs:154:13:154:13 | 1 | test.rs:153:51:155:9 | BlockExpr |  |
-| test.rs:155:16:157:9 | BlockExpr | test.rs:153:9:157:9 | IfExpr |  |
-| test.rs:156:13:156:13 | 0 | test.rs:155:16:157:9 | BlockExpr |  |
-| test.rs:160:5:169:5 | enter test_nested_if_match | test.rs:160:29:160:29 | a |  |
-| test.rs:160:5:169:5 | exit test_nested_if_match (normal) | test.rs:160:5:169:5 | exit test_nested_if_match |  |
-| test.rs:160:29:160:29 | a | test.rs:160:29:160:34 | Param | match |
-| test.rs:160:29:160:34 | Param | test.rs:161:19:161:19 | a |  |
-| test.rs:160:44:169:5 | BlockExpr | test.rs:160:5:169:5 | exit test_nested_if_match (normal) |  |
-| test.rs:161:9:168:9 | IfExpr | test.rs:160:44:169:5 | BlockExpr |  |
-| test.rs:161:13:164:9 | [boolean(false)] MatchExpr | test.rs:167:13:167:13 | 0 | false |
-| test.rs:161:13:164:9 | [boolean(true)] MatchExpr | test.rs:165:13:165:13 | 1 | true |
+| test.rs:153:51:155:9 | { ... } | test.rs:153:9:157:9 | if ... {...} else {...} |  |
+| test.rs:154:13:154:13 | 1 | test.rs:153:51:155:9 | { ... } |  |
+| test.rs:155:16:157:9 | { ... } | test.rs:153:9:157:9 | if ... {...} else {...} |  |
+| test.rs:156:13:156:13 | 0 | test.rs:155:16:157:9 | { ... } |  |
+| test.rs:160:5:169:5 | enter fn test_nested_if_match | test.rs:160:29:160:29 | a |  |
+| test.rs:160:5:169:5 | exit fn test_nested_if_match (normal) | test.rs:160:5:169:5 | exit fn test_nested_if_match |  |
+| test.rs:160:29:160:29 | a | test.rs:160:29:160:34 | ...: i64 | match |
+| test.rs:160:29:160:34 | ...: i64 | test.rs:161:19:161:19 | a |  |
+| test.rs:160:44:169:5 | { ... } | test.rs:160:5:169:5 | exit fn test_nested_if_match (normal) |  |
+| test.rs:161:9:168:9 | if ... {...} else {...} | test.rs:160:44:169:5 | { ... } |  |
+| test.rs:161:13:164:9 | [boolean(false)] match a { ... } | test.rs:167:13:167:13 | 0 | false |
+| test.rs:161:13:164:9 | [boolean(true)] match a { ... } | test.rs:165:13:165:13 | 1 | true |
 | test.rs:161:19:161:19 | a | test.rs:162:13:162:13 | 0 |  |
-| test.rs:162:13:162:13 | 0 | test.rs:162:13:162:13 | LiteralPat |  |
-| test.rs:162:13:162:13 | LiteralPat | test.rs:162:18:162:21 | true | match |
-| test.rs:162:13:162:13 | LiteralPat | test.rs:163:13:163:13 | WildcardPat | no-match |
-| test.rs:162:18:162:21 | true | test.rs:161:13:164:9 | [boolean(true)] MatchExpr | true |
-| test.rs:163:13:163:13 | WildcardPat | test.rs:163:18:163:22 | false | match |
-| test.rs:163:18:163:22 | false | test.rs:161:13:164:9 | [boolean(false)] MatchExpr | false |
-| test.rs:164:12:166:9 | BlockExpr | test.rs:161:9:168:9 | IfExpr |  |
-| test.rs:165:13:165:13 | 1 | test.rs:164:12:166:9 | BlockExpr |  |
-| test.rs:166:16:168:9 | BlockExpr | test.rs:161:9:168:9 | IfExpr |  |
-| test.rs:167:13:167:13 | 0 | test.rs:166:16:168:9 | BlockExpr |  |
-| test.rs:171:5:180:5 | enter test_nested_if_block | test.rs:171:29:171:29 | a |  |
-| test.rs:171:5:180:5 | exit test_nested_if_block (normal) | test.rs:171:5:180:5 | exit test_nested_if_block |  |
-| test.rs:171:29:171:29 | a | test.rs:171:29:171:34 | Param | match |
-| test.rs:171:29:171:34 | Param | test.rs:173:13:173:15 | ExprStmt |  |
-| test.rs:171:44:180:5 | BlockExpr | test.rs:171:5:180:5 | exit test_nested_if_block (normal) |  |
-| test.rs:172:9:179:9 | IfExpr | test.rs:171:44:180:5 | BlockExpr |  |
-| test.rs:172:12:175:9 | [boolean(false)] BlockExpr | test.rs:178:13:178:13 | 0 | false |
-| test.rs:172:12:175:9 | [boolean(true)] BlockExpr | test.rs:176:13:176:13 | 1 | true |
+| test.rs:162:13:162:13 | 0 | test.rs:162:13:162:13 | 0 |  |
+| test.rs:162:13:162:13 | 0 | test.rs:162:18:162:21 | true | match |
+| test.rs:162:13:162:13 | 0 | test.rs:163:13:163:13 | _ | no-match |
+| test.rs:162:18:162:21 | true | test.rs:161:13:164:9 | [boolean(true)] match a { ... } | true |
+| test.rs:163:13:163:13 | _ | test.rs:163:18:163:22 | false | match |
+| test.rs:163:18:163:22 | false | test.rs:161:13:164:9 | [boolean(false)] match a { ... } | false |
+| test.rs:164:12:166:9 | { ... } | test.rs:161:9:168:9 | if ... {...} else {...} |  |
+| test.rs:165:13:165:13 | 1 | test.rs:164:12:166:9 | { ... } |  |
+| test.rs:166:16:168:9 | { ... } | test.rs:161:9:168:9 | if ... {...} else {...} |  |
+| test.rs:167:13:167:13 | 0 | test.rs:166:16:168:9 | { ... } |  |
+| test.rs:171:5:180:5 | enter fn test_nested_if_block | test.rs:171:29:171:29 | a |  |
+| test.rs:171:5:180:5 | exit fn test_nested_if_block (normal) | test.rs:171:5:180:5 | exit fn test_nested_if_block |  |
+| test.rs:171:29:171:29 | a | test.rs:171:29:171:34 | ...: i64 | match |
+| test.rs:171:29:171:34 | ...: i64 | test.rs:173:13:173:15 | ExprStmt |  |
+| test.rs:171:44:180:5 | { ... } | test.rs:171:5:180:5 | exit fn test_nested_if_block (normal) |  |
+| test.rs:172:9:179:9 | if ... {...} else {...} | test.rs:171:44:180:5 | { ... } |  |
+| test.rs:172:12:175:9 | [boolean(false)] { ... } | test.rs:178:13:178:13 | 0 | false |
+| test.rs:172:12:175:9 | [boolean(true)] { ... } | test.rs:176:13:176:13 | 1 | true |
 | test.rs:173:13:173:14 | TupleExpr | test.rs:174:13:174:13 | a |  |
 | test.rs:173:13:173:15 | ExprStmt | test.rs:173:13:173:14 | TupleExpr |  |
 | test.rs:174:13:174:13 | a | test.rs:174:17:174:17 | 0 |  |
-| test.rs:174:13:174:17 | ... > ... | test.rs:172:12:175:9 | [boolean(false)] BlockExpr | false |
-| test.rs:174:13:174:17 | ... > ... | test.rs:172:12:175:9 | [boolean(true)] BlockExpr | true |
+| test.rs:174:13:174:17 | ... > ... | test.rs:172:12:175:9 | [boolean(false)] { ... } | false |
+| test.rs:174:13:174:17 | ... > ... | test.rs:172:12:175:9 | [boolean(true)] { ... } | true |
 | test.rs:174:17:174:17 | 0 | test.rs:174:13:174:17 | ... > ... |  |
-| test.rs:175:11:177:9 | BlockExpr | test.rs:172:9:179:9 | IfExpr |  |
-| test.rs:176:13:176:13 | 1 | test.rs:175:11:177:9 | BlockExpr |  |
-| test.rs:177:16:179:9 | BlockExpr | test.rs:172:9:179:9 | IfExpr |  |
-| test.rs:178:13:178:13 | 0 | test.rs:177:16:179:9 | BlockExpr |  |
-| test.rs:182:5:192:5 | enter test_if_assignment | test.rs:182:27:182:27 | a |  |
-| test.rs:182:5:192:5 | exit test_if_assignment (normal) | test.rs:182:5:192:5 | exit test_if_assignment |  |
-| test.rs:182:27:182:27 | a | test.rs:182:27:182:32 | Param | match |
-| test.rs:182:27:182:32 | Param | test.rs:183:9:183:26 | LetStmt |  |
-| test.rs:182:42:192:5 | BlockExpr | test.rs:182:5:192:5 | exit test_if_assignment (normal) |  |
-| test.rs:183:9:183:26 | LetStmt | test.rs:183:21:183:25 | false |  |
+| test.rs:175:11:177:9 | { ... } | test.rs:172:9:179:9 | if ... {...} else {...} |  |
+| test.rs:176:13:176:13 | 1 | test.rs:175:11:177:9 | { ... } |  |
+| test.rs:177:16:179:9 | { ... } | test.rs:172:9:179:9 | if ... {...} else {...} |  |
+| test.rs:178:13:178:13 | 0 | test.rs:177:16:179:9 | { ... } |  |
+| test.rs:182:5:192:5 | enter fn test_if_assignment | test.rs:182:27:182:27 | a |  |
+| test.rs:182:5:192:5 | exit fn test_if_assignment (normal) | test.rs:182:5:192:5 | exit fn test_if_assignment |  |
+| test.rs:182:27:182:27 | a | test.rs:182:27:182:32 | ...: i64 | match |
+| test.rs:182:27:182:32 | ...: i64 | test.rs:183:9:183:26 | let ... = false |  |
+| test.rs:182:42:192:5 | { ... } | test.rs:182:5:192:5 | exit fn test_if_assignment (normal) |  |
+| test.rs:183:9:183:26 | let ... = false | test.rs:183:21:183:25 | false |  |
 | test.rs:183:13:183:17 | x | test.rs:185:13:185:21 | ExprStmt | match |
 | test.rs:183:21:183:25 | false | test.rs:183:13:183:17 | x |  |
-| test.rs:184:9:191:9 | IfExpr | test.rs:182:42:192:5 | BlockExpr |  |
-| test.rs:184:12:187:9 | [boolean(false)] BlockExpr | test.rs:190:13:190:13 | 0 | false |
-| test.rs:184:12:187:9 | [boolean(true)] BlockExpr | test.rs:188:13:188:13 | 1 | true |
+| test.rs:184:9:191:9 | if ... {...} else {...} | test.rs:182:42:192:5 | { ... } |  |
+| test.rs:184:12:187:9 | [boolean(false)] { ... } | test.rs:190:13:190:13 | 0 | false |
+| test.rs:184:12:187:9 | [boolean(true)] { ... } | test.rs:188:13:188:13 | 1 | true |
 | test.rs:185:13:185:13 | x | test.rs:185:17:185:20 | true |  |
 | test.rs:185:13:185:20 | ... = ... | test.rs:186:13:186:13 | x |  |
 | test.rs:185:13:185:21 | ExprStmt | test.rs:185:13:185:13 | x |  |
 | test.rs:185:17:185:20 | true | test.rs:185:13:185:20 | ... = ... |  |
-| test.rs:186:13:186:13 | x | test.rs:184:12:187:9 | [boolean(false)] BlockExpr | false |
-| test.rs:186:13:186:13 | x | test.rs:184:12:187:9 | [boolean(true)] BlockExpr | true |
-| test.rs:187:11:189:9 | BlockExpr | test.rs:184:9:191:9 | IfExpr |  |
-| test.rs:188:13:188:13 | 1 | test.rs:187:11:189:9 | BlockExpr |  |
-| test.rs:189:16:191:9 | BlockExpr | test.rs:184:9:191:9 | IfExpr |  |
-| test.rs:190:13:190:13 | 0 | test.rs:189:16:191:9 | BlockExpr |  |
-| test.rs:194:5:205:5 | enter test_if_loop1 | test.rs:194:22:194:22 | a |  |
-| test.rs:194:5:205:5 | exit test_if_loop1 (normal) | test.rs:194:5:205:5 | exit test_if_loop1 |  |
-| test.rs:194:22:194:22 | a | test.rs:194:22:194:27 | Param | match |
-| test.rs:194:22:194:27 | Param | test.rs:196:13:198:14 | ExprStmt |  |
-| test.rs:194:37:205:5 | BlockExpr | test.rs:194:5:205:5 | exit test_if_loop1 (normal) |  |
-| test.rs:195:9:204:9 | IfExpr | test.rs:194:37:205:5 | BlockExpr |  |
-| test.rs:195:13:200:9 | [boolean(false)] LoopExpr | test.rs:203:13:203:13 | 0 | false |
-| test.rs:195:13:200:9 | [boolean(true)] LoopExpr | test.rs:201:13:201:13 | 1 | true |
-| test.rs:195:18:200:9 | BlockExpr | test.rs:196:13:198:14 | ExprStmt |  |
-| test.rs:196:13:198:13 | IfExpr | test.rs:199:13:199:19 | ExprStmt |  |
+| test.rs:186:13:186:13 | x | test.rs:184:12:187:9 | [boolean(false)] { ... } | false |
+| test.rs:186:13:186:13 | x | test.rs:184:12:187:9 | [boolean(true)] { ... } | true |
+| test.rs:187:11:189:9 | { ... } | test.rs:184:9:191:9 | if ... {...} else {...} |  |
+| test.rs:188:13:188:13 | 1 | test.rs:187:11:189:9 | { ... } |  |
+| test.rs:189:16:191:9 | { ... } | test.rs:184:9:191:9 | if ... {...} else {...} |  |
+| test.rs:190:13:190:13 | 0 | test.rs:189:16:191:9 | { ... } |  |
+| test.rs:194:5:205:5 | enter fn test_if_loop1 | test.rs:194:22:194:22 | a |  |
+| test.rs:194:5:205:5 | exit fn test_if_loop1 (normal) | test.rs:194:5:205:5 | exit fn test_if_loop1 |  |
+| test.rs:194:22:194:22 | a | test.rs:194:22:194:27 | ...: i64 | match |
+| test.rs:194:22:194:27 | ...: i64 | test.rs:196:13:198:14 | ExprStmt |  |
+| test.rs:194:37:205:5 | { ... } | test.rs:194:5:205:5 | exit fn test_if_loop1 (normal) |  |
+| test.rs:195:9:204:9 | if ... {...} else {...} | test.rs:194:37:205:5 | { ... } |  |
+| test.rs:195:13:200:9 | [boolean(false)] loop { ... } | test.rs:203:13:203:13 | 0 | false |
+| test.rs:195:13:200:9 | [boolean(true)] loop { ... } | test.rs:201:13:201:13 | 1 | true |
+| test.rs:195:18:200:9 | { ... } | test.rs:196:13:198:14 | ExprStmt |  |
+| test.rs:196:13:198:13 | if ... {...} | test.rs:199:13:199:19 | ExprStmt |  |
 | test.rs:196:13:198:14 | ExprStmt | test.rs:196:16:196:16 | a |  |
 | test.rs:196:16:196:16 | a | test.rs:196:20:196:20 | 0 |  |
-| test.rs:196:16:196:20 | ... > ... | test.rs:196:13:198:13 | IfExpr | false |
+| test.rs:196:16:196:20 | ... > ... | test.rs:196:13:198:13 | if ... {...} | false |
 | test.rs:196:16:196:20 | ... > ... | test.rs:197:17:197:29 | ExprStmt | true |
 | test.rs:196:20:196:20 | 0 | test.rs:196:16:196:20 | ... > ... |  |
-| test.rs:197:17:197:28 | [boolean(false)] BreakExpr | test.rs:195:13:200:9 | [boolean(false)] LoopExpr | break |
-| test.rs:197:17:197:28 | [boolean(true)] BreakExpr | test.rs:195:13:200:9 | [boolean(true)] LoopExpr | break |
+| test.rs:197:17:197:28 | [boolean(false)] break ... | test.rs:195:13:200:9 | [boolean(false)] loop { ... } | break |
+| test.rs:197:17:197:28 | [boolean(true)] break ... | test.rs:195:13:200:9 | [boolean(true)] loop { ... } | break |
 | test.rs:197:17:197:29 | ExprStmt | test.rs:197:23:197:23 | a |  |
 | test.rs:197:23:197:23 | a | test.rs:197:27:197:28 | 10 |  |
-| test.rs:197:23:197:28 | ... > ... | test.rs:197:17:197:28 | [boolean(false)] BreakExpr | false |
-| test.rs:197:23:197:28 | ... > ... | test.rs:197:17:197:28 | [boolean(true)] BreakExpr | true |
+| test.rs:197:23:197:28 | ... > ... | test.rs:197:17:197:28 | [boolean(false)] break ... | false |
+| test.rs:197:23:197:28 | ... > ... | test.rs:197:17:197:28 | [boolean(true)] break ... | true |
 | test.rs:197:27:197:28 | 10 | test.rs:197:23:197:28 | ... > ... |  |
 | test.rs:199:13:199:13 | a | test.rs:199:17:199:18 | 10 |  |
-| test.rs:199:13:199:18 | ... < ... | test.rs:195:18:200:9 | BlockExpr |  |
+| test.rs:199:13:199:18 | ... < ... | test.rs:195:18:200:9 | { ... } |  |
 | test.rs:199:13:199:19 | ExprStmt | test.rs:199:13:199:13 | a |  |
 | test.rs:199:17:199:18 | 10 | test.rs:199:13:199:18 | ... < ... |  |
-| test.rs:200:12:202:9 | BlockExpr | test.rs:195:9:204:9 | IfExpr |  |
-| test.rs:201:13:201:13 | 1 | test.rs:200:12:202:9 | BlockExpr |  |
-| test.rs:202:16:204:9 | BlockExpr | test.rs:195:9:204:9 | IfExpr |  |
-| test.rs:203:13:203:13 | 0 | test.rs:202:16:204:9 | BlockExpr |  |
-| test.rs:207:5:218:5 | enter test_if_loop2 | test.rs:207:22:207:22 | a |  |
-| test.rs:207:5:218:5 | exit test_if_loop2 (normal) | test.rs:207:5:218:5 | exit test_if_loop2 |  |
-| test.rs:207:22:207:22 | a | test.rs:207:22:207:27 | Param | match |
-| test.rs:207:22:207:27 | Param | test.rs:209:13:211:14 | ExprStmt |  |
-| test.rs:207:37:218:5 | BlockExpr | test.rs:207:5:218:5 | exit test_if_loop2 (normal) |  |
-| test.rs:208:9:217:9 | IfExpr | test.rs:207:37:218:5 | BlockExpr |  |
-| test.rs:208:13:213:9 | [boolean(false)] LoopExpr | test.rs:216:13:216:13 | 0 | false |
-| test.rs:208:13:213:9 | [boolean(true)] LoopExpr | test.rs:214:13:214:13 | 1 | true |
-| test.rs:208:26:213:9 | BlockExpr | test.rs:209:13:211:14 | ExprStmt |  |
-| test.rs:209:13:211:13 | IfExpr | test.rs:212:13:212:19 | ExprStmt |  |
+| test.rs:200:12:202:9 | { ... } | test.rs:195:9:204:9 | if ... {...} else {...} |  |
+| test.rs:201:13:201:13 | 1 | test.rs:200:12:202:9 | { ... } |  |
+| test.rs:202:16:204:9 | { ... } | test.rs:195:9:204:9 | if ... {...} else {...} |  |
+| test.rs:203:13:203:13 | 0 | test.rs:202:16:204:9 | { ... } |  |
+| test.rs:207:5:218:5 | enter fn test_if_loop2 | test.rs:207:22:207:22 | a |  |
+| test.rs:207:5:218:5 | exit fn test_if_loop2 (normal) | test.rs:207:5:218:5 | exit fn test_if_loop2 |  |
+| test.rs:207:22:207:22 | a | test.rs:207:22:207:27 | ...: i64 | match |
+| test.rs:207:22:207:27 | ...: i64 | test.rs:209:13:211:14 | ExprStmt |  |
+| test.rs:207:37:218:5 | { ... } | test.rs:207:5:218:5 | exit fn test_if_loop2 (normal) |  |
+| test.rs:208:9:217:9 | if ... {...} else {...} | test.rs:207:37:218:5 | { ... } |  |
+| test.rs:208:13:213:9 | [boolean(false)] 'label: loop { ... } | test.rs:216:13:216:13 | 0 | false |
+| test.rs:208:13:213:9 | [boolean(true)] 'label: loop { ... } | test.rs:214:13:214:13 | 1 | true |
+| test.rs:208:26:213:9 | { ... } | test.rs:209:13:211:14 | ExprStmt |  |
+| test.rs:209:13:211:13 | if ... {...} | test.rs:212:13:212:19 | ExprStmt |  |
 | test.rs:209:13:211:14 | ExprStmt | test.rs:209:16:209:16 | a |  |
 | test.rs:209:16:209:16 | a | test.rs:209:20:209:20 | 0 |  |
-| test.rs:209:16:209:20 | ... > ... | test.rs:209:13:211:13 | IfExpr | false |
+| test.rs:209:16:209:20 | ... > ... | test.rs:209:13:211:13 | if ... {...} | false |
 | test.rs:209:16:209:20 | ... > ... | test.rs:210:17:210:36 | ExprStmt | true |
 | test.rs:209:20:209:20 | 0 | test.rs:209:16:209:20 | ... > ... |  |
-| test.rs:210:17:210:35 | [boolean(false)] BreakExpr | test.rs:208:13:213:9 | [boolean(false)] LoopExpr | break |
-| test.rs:210:17:210:35 | [boolean(true)] BreakExpr | test.rs:208:13:213:9 | [boolean(true)] LoopExpr | break |
+| test.rs:210:17:210:35 | [boolean(false)] break ''label ... | test.rs:208:13:213:9 | [boolean(false)] 'label: loop { ... } | break |
+| test.rs:210:17:210:35 | [boolean(true)] break ''label ... | test.rs:208:13:213:9 | [boolean(true)] 'label: loop { ... } | break |
 | test.rs:210:17:210:36 | ExprStmt | test.rs:210:30:210:30 | a |  |
 | test.rs:210:30:210:30 | a | test.rs:210:34:210:35 | 10 |  |
-| test.rs:210:30:210:35 | ... > ... | test.rs:210:17:210:35 | [boolean(false)] BreakExpr | false |
-| test.rs:210:30:210:35 | ... > ... | test.rs:210:17:210:35 | [boolean(true)] BreakExpr | true |
+| test.rs:210:30:210:35 | ... > ... | test.rs:210:17:210:35 | [boolean(false)] break ''label ... | false |
+| test.rs:210:30:210:35 | ... > ... | test.rs:210:17:210:35 | [boolean(true)] break ''label ... | true |
 | test.rs:210:34:210:35 | 10 | test.rs:210:30:210:35 | ... > ... |  |
 | test.rs:212:13:212:13 | a | test.rs:212:17:212:18 | 10 |  |
-| test.rs:212:13:212:18 | ... < ... | test.rs:208:26:213:9 | BlockExpr |  |
+| test.rs:212:13:212:18 | ... < ... | test.rs:208:26:213:9 | { ... } |  |
 | test.rs:212:13:212:19 | ExprStmt | test.rs:212:13:212:13 | a |  |
 | test.rs:212:17:212:18 | 10 | test.rs:212:13:212:18 | ... < ... |  |
-| test.rs:213:12:215:9 | BlockExpr | test.rs:208:9:217:9 | IfExpr |  |
-| test.rs:214:13:214:13 | 1 | test.rs:213:12:215:9 | BlockExpr |  |
-| test.rs:215:16:217:9 | BlockExpr | test.rs:208:9:217:9 | IfExpr |  |
-| test.rs:216:13:216:13 | 0 | test.rs:215:16:217:9 | BlockExpr |  |
-| test.rs:220:5:228:5 | enter test_labelled_block | test.rs:220:28:220:28 | a |  |
-| test.rs:220:5:228:5 | exit test_labelled_block (normal) | test.rs:220:5:228:5 | exit test_labelled_block |  |
-| test.rs:220:28:220:28 | a | test.rs:220:28:220:33 | Param | match |
-| test.rs:220:28:220:33 | Param | test.rs:222:13:222:31 | ExprStmt |  |
-| test.rs:220:43:228:5 | BlockExpr | test.rs:220:5:228:5 | exit test_labelled_block (normal) |  |
-| test.rs:221:9:227:9 | IfExpr | test.rs:220:43:228:5 | BlockExpr |  |
-| test.rs:221:13:223:9 | [boolean(false)] BlockExpr | test.rs:226:13:226:13 | 0 | false |
-| test.rs:221:13:223:9 | [boolean(true)] BlockExpr | test.rs:224:13:224:13 | 1 | true |
-| test.rs:222:13:222:30 | [boolean(false)] BreakExpr | test.rs:221:13:223:9 | [boolean(false)] BlockExpr | break |
-| test.rs:222:13:222:30 | [boolean(true)] BreakExpr | test.rs:221:13:223:9 | [boolean(true)] BlockExpr | break |
+| test.rs:213:12:215:9 | { ... } | test.rs:208:9:217:9 | if ... {...} else {...} |  |
+| test.rs:214:13:214:13 | 1 | test.rs:213:12:215:9 | { ... } |  |
+| test.rs:215:16:217:9 | { ... } | test.rs:208:9:217:9 | if ... {...} else {...} |  |
+| test.rs:216:13:216:13 | 0 | test.rs:215:16:217:9 | { ... } |  |
+| test.rs:220:5:228:5 | enter fn test_labelled_block | test.rs:220:28:220:28 | a |  |
+| test.rs:220:5:228:5 | exit fn test_labelled_block (normal) | test.rs:220:5:228:5 | exit fn test_labelled_block |  |
+| test.rs:220:28:220:28 | a | test.rs:220:28:220:33 | ...: i64 | match |
+| test.rs:220:28:220:33 | ...: i64 | test.rs:222:13:222:31 | ExprStmt |  |
+| test.rs:220:43:228:5 | { ... } | test.rs:220:5:228:5 | exit fn test_labelled_block (normal) |  |
+| test.rs:221:9:227:9 | if ... {...} else {...} | test.rs:220:43:228:5 | { ... } |  |
+| test.rs:221:13:223:9 | [boolean(false)] 'block: { ... } | test.rs:226:13:226:13 | 0 | false |
+| test.rs:221:13:223:9 | [boolean(true)] 'block: { ... } | test.rs:224:13:224:13 | 1 | true |
+| test.rs:222:13:222:30 | [boolean(false)] break ''block ... | test.rs:221:13:223:9 | [boolean(false)] 'block: { ... } | break |
+| test.rs:222:13:222:30 | [boolean(true)] break ''block ... | test.rs:221:13:223:9 | [boolean(true)] 'block: { ... } | break |
 | test.rs:222:13:222:31 | ExprStmt | test.rs:222:26:222:26 | a |  |
 | test.rs:222:26:222:26 | a | test.rs:222:30:222:30 | 0 |  |
-| test.rs:222:26:222:30 | ... > ... | test.rs:222:13:222:30 | [boolean(false)] BreakExpr | false |
-| test.rs:222:26:222:30 | ... > ... | test.rs:222:13:222:30 | [boolean(true)] BreakExpr | true |
+| test.rs:222:26:222:30 | ... > ... | test.rs:222:13:222:30 | [boolean(false)] break ''block ... | false |
+| test.rs:222:26:222:30 | ... > ... | test.rs:222:13:222:30 | [boolean(true)] break ''block ... | true |
 | test.rs:222:30:222:30 | 0 | test.rs:222:26:222:30 | ... > ... |  |
-| test.rs:223:12:225:9 | BlockExpr | test.rs:221:9:227:9 | IfExpr |  |
-| test.rs:224:13:224:13 | 1 | test.rs:223:12:225:9 | BlockExpr |  |
-| test.rs:225:16:227:9 | BlockExpr | test.rs:221:9:227:9 | IfExpr |  |
-| test.rs:226:13:226:13 | 0 | test.rs:225:16:227:9 | BlockExpr |  |
-| test.rs:233:5:236:5 | enter test_and_operator | test.rs:233:30:233:30 | a |  |
-| test.rs:233:5:236:5 | exit test_and_operator (normal) | test.rs:233:5:236:5 | exit test_and_operator |  |
-| test.rs:233:30:233:30 | a | test.rs:233:30:233:36 | Param | match |
-| test.rs:233:30:233:36 | Param | test.rs:233:39:233:39 | b |  |
-| test.rs:233:39:233:39 | b | test.rs:233:39:233:45 | Param | match |
-| test.rs:233:39:233:45 | Param | test.rs:233:48:233:48 | c |  |
-| test.rs:233:48:233:48 | c | test.rs:233:48:233:54 | Param | match |
-| test.rs:233:48:233:54 | Param | test.rs:234:9:234:28 | LetStmt |  |
-| test.rs:233:65:236:5 | BlockExpr | test.rs:233:5:236:5 | exit test_and_operator (normal) |  |
-| test.rs:234:9:234:28 | LetStmt | test.rs:234:17:234:17 | a |  |
+| test.rs:223:12:225:9 | { ... } | test.rs:221:9:227:9 | if ... {...} else {...} |  |
+| test.rs:224:13:224:13 | 1 | test.rs:223:12:225:9 | { ... } |  |
+| test.rs:225:16:227:9 | { ... } | test.rs:221:9:227:9 | if ... {...} else {...} |  |
+| test.rs:226:13:226:13 | 0 | test.rs:225:16:227:9 | { ... } |  |
+| test.rs:233:5:236:5 | enter fn test_and_operator | test.rs:233:30:233:30 | a |  |
+| test.rs:233:5:236:5 | exit fn test_and_operator (normal) | test.rs:233:5:236:5 | exit fn test_and_operator |  |
+| test.rs:233:30:233:30 | a | test.rs:233:30:233:36 | ...: bool | match |
+| test.rs:233:30:233:36 | ...: bool | test.rs:233:39:233:39 | b |  |
+| test.rs:233:39:233:39 | b | test.rs:233:39:233:45 | ...: bool | match |
+| test.rs:233:39:233:45 | ...: bool | test.rs:233:48:233:48 | c |  |
+| test.rs:233:48:233:48 | c | test.rs:233:48:233:54 | ...: bool | match |
+| test.rs:233:48:233:54 | ...: bool | test.rs:234:9:234:28 | let ... = ... |  |
+| test.rs:233:65:236:5 | { ... } | test.rs:233:5:236:5 | exit fn test_and_operator (normal) |  |
+| test.rs:234:9:234:28 | let ... = ... | test.rs:234:17:234:17 | a |  |
 | test.rs:234:13:234:13 | d | test.rs:235:9:235:9 | d | match |
 | test.rs:234:17:234:17 | a | test.rs:234:17:234:22 | [boolean(false)] ... && ... | false |
 | test.rs:234:17:234:17 | a | test.rs:234:22:234:22 | b | true |
@@ -483,17 +483,17 @@ edges
 | test.rs:234:22:234:22 | b | test.rs:234:17:234:22 | [boolean(false)] ... && ... | false |
 | test.rs:234:22:234:22 | b | test.rs:234:17:234:22 | [boolean(true)] ... && ... | true |
 | test.rs:234:27:234:27 | c | test.rs:234:17:234:27 | ... && ... |  |
-| test.rs:235:9:235:9 | d | test.rs:233:65:236:5 | BlockExpr |  |
-| test.rs:238:5:241:5 | enter test_or_operator | test.rs:238:25:238:25 | a |  |
-| test.rs:238:5:241:5 | exit test_or_operator (normal) | test.rs:238:5:241:5 | exit test_or_operator |  |
-| test.rs:238:25:238:25 | a | test.rs:238:25:238:31 | Param | match |
-| test.rs:238:25:238:31 | Param | test.rs:238:34:238:34 | b |  |
-| test.rs:238:34:238:34 | b | test.rs:238:34:238:40 | Param | match |
-| test.rs:238:34:238:40 | Param | test.rs:238:43:238:43 | c |  |
-| test.rs:238:43:238:43 | c | test.rs:238:43:238:49 | Param | match |
-| test.rs:238:43:238:49 | Param | test.rs:239:9:239:28 | LetStmt |  |
-| test.rs:238:60:241:5 | BlockExpr | test.rs:238:5:241:5 | exit test_or_operator (normal) |  |
-| test.rs:239:9:239:28 | LetStmt | test.rs:239:17:239:17 | a |  |
+| test.rs:235:9:235:9 | d | test.rs:233:65:236:5 | { ... } |  |
+| test.rs:238:5:241:5 | enter fn test_or_operator | test.rs:238:25:238:25 | a |  |
+| test.rs:238:5:241:5 | exit fn test_or_operator (normal) | test.rs:238:5:241:5 | exit fn test_or_operator |  |
+| test.rs:238:25:238:25 | a | test.rs:238:25:238:31 | ...: bool | match |
+| test.rs:238:25:238:31 | ...: bool | test.rs:238:34:238:34 | b |  |
+| test.rs:238:34:238:34 | b | test.rs:238:34:238:40 | ...: bool | match |
+| test.rs:238:34:238:40 | ...: bool | test.rs:238:43:238:43 | c |  |
+| test.rs:238:43:238:43 | c | test.rs:238:43:238:49 | ...: bool | match |
+| test.rs:238:43:238:49 | ...: bool | test.rs:239:9:239:28 | let ... = ... |  |
+| test.rs:238:60:241:5 | { ... } | test.rs:238:5:241:5 | exit fn test_or_operator (normal) |  |
+| test.rs:239:9:239:28 | let ... = ... | test.rs:239:17:239:17 | a |  |
 | test.rs:239:13:239:13 | d | test.rs:240:9:240:9 | d | match |
 | test.rs:239:17:239:17 | a | test.rs:239:17:239:22 | [boolean(true)] ... \|\| ... | true |
 | test.rs:239:17:239:17 | a | test.rs:239:22:239:22 | b | false |
@@ -503,17 +503,17 @@ edges
 | test.rs:239:22:239:22 | b | test.rs:239:17:239:22 | [boolean(false)] ... \|\| ... | false |
 | test.rs:239:22:239:22 | b | test.rs:239:17:239:22 | [boolean(true)] ... \|\| ... | true |
 | test.rs:239:27:239:27 | c | test.rs:239:17:239:27 | ... \|\| ... |  |
-| test.rs:240:9:240:9 | d | test.rs:238:60:241:5 | BlockExpr |  |
-| test.rs:243:5:246:5 | enter test_or_operator_2 | test.rs:243:27:243:27 | a |  |
-| test.rs:243:5:246:5 | exit test_or_operator_2 (normal) | test.rs:243:5:246:5 | exit test_or_operator_2 |  |
-| test.rs:243:27:243:27 | a | test.rs:243:27:243:33 | Param | match |
-| test.rs:243:27:243:33 | Param | test.rs:243:36:243:36 | b |  |
-| test.rs:243:36:243:36 | b | test.rs:243:36:243:41 | Param | match |
-| test.rs:243:36:243:41 | Param | test.rs:243:44:243:44 | c |  |
-| test.rs:243:44:243:44 | c | test.rs:243:44:243:50 | Param | match |
-| test.rs:243:44:243:50 | Param | test.rs:244:9:244:36 | LetStmt |  |
-| test.rs:243:61:246:5 | BlockExpr | test.rs:243:5:246:5 | exit test_or_operator_2 (normal) |  |
-| test.rs:244:9:244:36 | LetStmt | test.rs:244:17:244:17 | a |  |
+| test.rs:240:9:240:9 | d | test.rs:238:60:241:5 | { ... } |  |
+| test.rs:243:5:246:5 | enter fn test_or_operator_2 | test.rs:243:27:243:27 | a |  |
+| test.rs:243:5:246:5 | exit fn test_or_operator_2 (normal) | test.rs:243:5:246:5 | exit fn test_or_operator_2 |  |
+| test.rs:243:27:243:27 | a | test.rs:243:27:243:33 | ...: bool | match |
+| test.rs:243:27:243:33 | ...: bool | test.rs:243:36:243:36 | b |  |
+| test.rs:243:36:243:36 | b | test.rs:243:36:243:41 | ...: i64 | match |
+| test.rs:243:36:243:41 | ...: i64 | test.rs:243:44:243:44 | c |  |
+| test.rs:243:44:243:44 | c | test.rs:243:44:243:50 | ...: bool | match |
+| test.rs:243:44:243:50 | ...: bool | test.rs:244:9:244:36 | let ... = ... |  |
+| test.rs:243:61:246:5 | { ... } | test.rs:243:5:246:5 | exit fn test_or_operator_2 (normal) |  |
+| test.rs:244:9:244:36 | let ... = ... | test.rs:244:17:244:17 | a |  |
 | test.rs:244:13:244:13 | d | test.rs:245:9:245:9 | d | match |
 | test.rs:244:17:244:17 | a | test.rs:244:17:244:30 | [boolean(true)] ... \|\| ... | true |
 | test.rs:244:17:244:17 | a | test.rs:244:23:244:23 | b | false |
@@ -525,27 +525,27 @@ edges
 | test.rs:244:23:244:29 | ... == ... | test.rs:244:17:244:30 | [boolean(true)] ... \|\| ... | true |
 | test.rs:244:28:244:29 | 28 | test.rs:244:23:244:29 | ... == ... |  |
 | test.rs:244:35:244:35 | c | test.rs:244:17:244:35 | ... \|\| ... |  |
-| test.rs:245:9:245:9 | d | test.rs:243:61:246:5 | BlockExpr |  |
-| test.rs:248:5:251:5 | enter test_not_operator | test.rs:248:26:248:26 | a |  |
-| test.rs:248:5:251:5 | exit test_not_operator (normal) | test.rs:248:5:251:5 | exit test_not_operator |  |
-| test.rs:248:26:248:26 | a | test.rs:248:26:248:32 | Param | match |
-| test.rs:248:26:248:32 | Param | test.rs:249:9:249:19 | LetStmt |  |
-| test.rs:248:43:251:5 | BlockExpr | test.rs:248:5:251:5 | exit test_not_operator (normal) |  |
-| test.rs:249:9:249:19 | LetStmt | test.rs:249:18:249:18 | a |  |
+| test.rs:245:9:245:9 | d | test.rs:243:61:246:5 | { ... } |  |
+| test.rs:248:5:251:5 | enter fn test_not_operator | test.rs:248:26:248:26 | a |  |
+| test.rs:248:5:251:5 | exit fn test_not_operator (normal) | test.rs:248:5:251:5 | exit fn test_not_operator |  |
+| test.rs:248:26:248:26 | a | test.rs:248:26:248:32 | ...: bool | match |
+| test.rs:248:26:248:32 | ...: bool | test.rs:249:9:249:19 | let ... = ... |  |
+| test.rs:248:43:251:5 | { ... } | test.rs:248:5:251:5 | exit fn test_not_operator (normal) |  |
+| test.rs:249:9:249:19 | let ... = ... | test.rs:249:18:249:18 | a |  |
 | test.rs:249:13:249:13 | d | test.rs:250:9:250:9 | d | match |
 | test.rs:249:17:249:18 | ! ... | test.rs:249:13:249:13 | d |  |
 | test.rs:249:18:249:18 | a | test.rs:249:17:249:18 | ! ... |  |
-| test.rs:250:9:250:9 | d | test.rs:248:43:251:5 | BlockExpr |  |
-| test.rs:253:5:259:5 | enter test_if_and_operator | test.rs:253:29:253:29 | a |  |
-| test.rs:253:5:259:5 | exit test_if_and_operator (normal) | test.rs:253:5:259:5 | exit test_if_and_operator |  |
-| test.rs:253:29:253:29 | a | test.rs:253:29:253:35 | Param | match |
-| test.rs:253:29:253:35 | Param | test.rs:253:38:253:38 | b |  |
-| test.rs:253:38:253:38 | b | test.rs:253:38:253:44 | Param | match |
-| test.rs:253:38:253:44 | Param | test.rs:253:47:253:47 | c |  |
-| test.rs:253:47:253:47 | c | test.rs:253:47:253:53 | Param | match |
-| test.rs:253:47:253:53 | Param | test.rs:254:12:254:12 | a |  |
-| test.rs:253:64:259:5 | BlockExpr | test.rs:253:5:259:5 | exit test_if_and_operator (normal) |  |
-| test.rs:254:9:258:9 | IfExpr | test.rs:253:64:259:5 | BlockExpr |  |
+| test.rs:250:9:250:9 | d | test.rs:248:43:251:5 | { ... } |  |
+| test.rs:253:5:259:5 | enter fn test_if_and_operator | test.rs:253:29:253:29 | a |  |
+| test.rs:253:5:259:5 | exit fn test_if_and_operator (normal) | test.rs:253:5:259:5 | exit fn test_if_and_operator |  |
+| test.rs:253:29:253:29 | a | test.rs:253:29:253:35 | ...: bool | match |
+| test.rs:253:29:253:35 | ...: bool | test.rs:253:38:253:38 | b |  |
+| test.rs:253:38:253:38 | b | test.rs:253:38:253:44 | ...: bool | match |
+| test.rs:253:38:253:44 | ...: bool | test.rs:253:47:253:47 | c |  |
+| test.rs:253:47:253:47 | c | test.rs:253:47:253:53 | ...: bool | match |
+| test.rs:253:47:253:53 | ...: bool | test.rs:254:12:254:12 | a |  |
+| test.rs:253:64:259:5 | { ... } | test.rs:253:5:259:5 | exit fn test_if_and_operator (normal) |  |
+| test.rs:254:9:258:9 | if ... {...} else {...} | test.rs:253:64:259:5 | { ... } |  |
 | test.rs:254:12:254:12 | a | test.rs:254:12:254:17 | [boolean(false)] ... && ... | false |
 | test.rs:254:12:254:12 | a | test.rs:254:17:254:17 | b | true |
 | test.rs:254:12:254:17 | [boolean(false)] ... && ... | test.rs:254:12:254:22 | [boolean(false)] ... && ... | false |
@@ -556,20 +556,20 @@ edges
 | test.rs:254:17:254:17 | b | test.rs:254:12:254:17 | [boolean(true)] ... && ... | true |
 | test.rs:254:22:254:22 | c | test.rs:254:12:254:22 | [boolean(false)] ... && ... | false |
 | test.rs:254:22:254:22 | c | test.rs:254:12:254:22 | [boolean(true)] ... && ... | true |
-| test.rs:254:24:256:9 | BlockExpr | test.rs:254:9:258:9 | IfExpr |  |
-| test.rs:255:13:255:16 | true | test.rs:254:24:256:9 | BlockExpr |  |
-| test.rs:256:16:258:9 | BlockExpr | test.rs:254:9:258:9 | IfExpr |  |
-| test.rs:257:13:257:17 | false | test.rs:256:16:258:9 | BlockExpr |  |
-| test.rs:261:5:267:5 | enter test_if_or_operator | test.rs:261:28:261:28 | a |  |
-| test.rs:261:5:267:5 | exit test_if_or_operator (normal) | test.rs:261:5:267:5 | exit test_if_or_operator |  |
-| test.rs:261:28:261:28 | a | test.rs:261:28:261:34 | Param | match |
-| test.rs:261:28:261:34 | Param | test.rs:261:37:261:37 | b |  |
-| test.rs:261:37:261:37 | b | test.rs:261:37:261:43 | Param | match |
-| test.rs:261:37:261:43 | Param | test.rs:261:46:261:46 | c |  |
-| test.rs:261:46:261:46 | c | test.rs:261:46:261:52 | Param | match |
-| test.rs:261:46:261:52 | Param | test.rs:262:12:262:12 | a |  |
-| test.rs:261:63:267:5 | BlockExpr | test.rs:261:5:267:5 | exit test_if_or_operator (normal) |  |
-| test.rs:262:9:266:9 | IfExpr | test.rs:261:63:267:5 | BlockExpr |  |
+| test.rs:254:24:256:9 | { ... } | test.rs:254:9:258:9 | if ... {...} else {...} |  |
+| test.rs:255:13:255:16 | true | test.rs:254:24:256:9 | { ... } |  |
+| test.rs:256:16:258:9 | { ... } | test.rs:254:9:258:9 | if ... {...} else {...} |  |
+| test.rs:257:13:257:17 | false | test.rs:256:16:258:9 | { ... } |  |
+| test.rs:261:5:267:5 | enter fn test_if_or_operator | test.rs:261:28:261:28 | a |  |
+| test.rs:261:5:267:5 | exit fn test_if_or_operator (normal) | test.rs:261:5:267:5 | exit fn test_if_or_operator |  |
+| test.rs:261:28:261:28 | a | test.rs:261:28:261:34 | ...: bool | match |
+| test.rs:261:28:261:34 | ...: bool | test.rs:261:37:261:37 | b |  |
+| test.rs:261:37:261:37 | b | test.rs:261:37:261:43 | ...: bool | match |
+| test.rs:261:37:261:43 | ...: bool | test.rs:261:46:261:46 | c |  |
+| test.rs:261:46:261:46 | c | test.rs:261:46:261:52 | ...: bool | match |
+| test.rs:261:46:261:52 | ...: bool | test.rs:262:12:262:12 | a |  |
+| test.rs:261:63:267:5 | { ... } | test.rs:261:5:267:5 | exit fn test_if_or_operator (normal) |  |
+| test.rs:262:9:266:9 | if ... {...} else {...} | test.rs:261:63:267:5 | { ... } |  |
 | test.rs:262:12:262:12 | a | test.rs:262:12:262:17 | [boolean(true)] ... \|\| ... | true |
 | test.rs:262:12:262:12 | a | test.rs:262:17:262:17 | b | false |
 | test.rs:262:12:262:17 | [boolean(false)] ... \|\| ... | test.rs:262:22:262:22 | c | false |
@@ -580,490 +580,540 @@ edges
 | test.rs:262:17:262:17 | b | test.rs:262:12:262:17 | [boolean(true)] ... \|\| ... | true |
 | test.rs:262:22:262:22 | c | test.rs:262:12:262:22 | [boolean(false)] ... \|\| ... | false |
 | test.rs:262:22:262:22 | c | test.rs:262:12:262:22 | [boolean(true)] ... \|\| ... | true |
-| test.rs:262:24:264:9 | BlockExpr | test.rs:262:9:266:9 | IfExpr |  |
-| test.rs:263:13:263:16 | true | test.rs:262:24:264:9 | BlockExpr |  |
-| test.rs:264:16:266:9 | BlockExpr | test.rs:262:9:266:9 | IfExpr |  |
-| test.rs:265:13:265:17 | false | test.rs:264:16:266:9 | BlockExpr |  |
-| test.rs:269:5:275:5 | enter test_if_not_operator | test.rs:269:29:269:29 | a |  |
-| test.rs:269:5:275:5 | exit test_if_not_operator (normal) | test.rs:269:5:275:5 | exit test_if_not_operator |  |
-| test.rs:269:29:269:29 | a | test.rs:269:29:269:35 | Param | match |
-| test.rs:269:29:269:35 | Param | test.rs:270:13:270:13 | a |  |
-| test.rs:269:46:275:5 | BlockExpr | test.rs:269:5:275:5 | exit test_if_not_operator (normal) |  |
-| test.rs:270:9:274:9 | IfExpr | test.rs:269:46:275:5 | BlockExpr |  |
+| test.rs:262:24:264:9 | { ... } | test.rs:262:9:266:9 | if ... {...} else {...} |  |
+| test.rs:263:13:263:16 | true | test.rs:262:24:264:9 | { ... } |  |
+| test.rs:264:16:266:9 | { ... } | test.rs:262:9:266:9 | if ... {...} else {...} |  |
+| test.rs:265:13:265:17 | false | test.rs:264:16:266:9 | { ... } |  |
+| test.rs:269:5:275:5 | enter fn test_if_not_operator | test.rs:269:29:269:29 | a |  |
+| test.rs:269:5:275:5 | exit fn test_if_not_operator (normal) | test.rs:269:5:275:5 | exit fn test_if_not_operator |  |
+| test.rs:269:29:269:29 | a | test.rs:269:29:269:35 | ...: bool | match |
+| test.rs:269:29:269:35 | ...: bool | test.rs:270:13:270:13 | a |  |
+| test.rs:269:46:275:5 | { ... } | test.rs:269:5:275:5 | exit fn test_if_not_operator (normal) |  |
+| test.rs:270:9:274:9 | if ... {...} else {...} | test.rs:269:46:275:5 | { ... } |  |
 | test.rs:270:12:270:13 | [boolean(false)] ! ... | test.rs:273:13:273:17 | false | false |
 | test.rs:270:12:270:13 | [boolean(true)] ! ... | test.rs:271:13:271:16 | true | true |
 | test.rs:270:13:270:13 | a | test.rs:270:12:270:13 | [boolean(false)] ! ... | true |
 | test.rs:270:13:270:13 | a | test.rs:270:12:270:13 | [boolean(true)] ! ... | false |
-| test.rs:270:15:272:9 | BlockExpr | test.rs:270:9:274:9 | IfExpr |  |
-| test.rs:271:13:271:16 | true | test.rs:270:15:272:9 | BlockExpr |  |
-| test.rs:272:16:274:9 | BlockExpr | test.rs:270:9:274:9 | IfExpr |  |
-| test.rs:273:13:273:17 | false | test.rs:272:16:274:9 | BlockExpr |  |
-| test.rs:277:5:279:5 | enter test_and_return | test.rs:277:24:277:24 | a |  |
-| test.rs:277:5:279:5 | exit test_and_return (normal) | test.rs:277:5:279:5 | exit test_and_return |  |
-| test.rs:277:24:277:24 | a | test.rs:277:24:277:30 | Param | match |
-| test.rs:277:24:277:30 | Param | test.rs:278:9:278:20 | ExprStmt |  |
-| test.rs:277:33:279:5 | BlockExpr | test.rs:277:5:279:5 | exit test_and_return (normal) |  |
+| test.rs:270:15:272:9 | { ... } | test.rs:270:9:274:9 | if ... {...} else {...} |  |
+| test.rs:271:13:271:16 | true | test.rs:270:15:272:9 | { ... } |  |
+| test.rs:272:16:274:9 | { ... } | test.rs:270:9:274:9 | if ... {...} else {...} |  |
+| test.rs:273:13:273:17 | false | test.rs:272:16:274:9 | { ... } |  |
+| test.rs:277:5:279:5 | enter fn test_and_return | test.rs:277:24:277:24 | a |  |
+| test.rs:277:5:279:5 | exit fn test_and_return (normal) | test.rs:277:5:279:5 | exit fn test_and_return |  |
+| test.rs:277:24:277:24 | a | test.rs:277:24:277:30 | ...: bool | match |
+| test.rs:277:24:277:30 | ...: bool | test.rs:278:9:278:20 | ExprStmt |  |
+| test.rs:277:33:279:5 | { ... } | test.rs:277:5:279:5 | exit fn test_and_return (normal) |  |
 | test.rs:278:9:278:9 | a | test.rs:278:9:278:19 | ... && ... | false |
-| test.rs:278:9:278:9 | a | test.rs:278:14:278:19 | ReturnExpr | true |
-| test.rs:278:9:278:19 | ... && ... | test.rs:277:33:279:5 | BlockExpr |  |
+| test.rs:278:9:278:9 | a | test.rs:278:14:278:19 | return | true |
+| test.rs:278:9:278:19 | ... && ... | test.rs:277:33:279:5 | { ... } |  |
 | test.rs:278:9:278:20 | ExprStmt | test.rs:278:9:278:9 | a |  |
-| test.rs:278:14:278:19 | ReturnExpr | test.rs:277:5:279:5 | exit test_and_return (normal) | return |
-| test.rs:285:5:287:5 | enter test_question_mark_operator_1 | test.rs:285:38:285:38 | s |  |
-| test.rs:285:5:287:5 | exit test_question_mark_operator_1 (normal) | test.rs:285:5:287:5 | exit test_question_mark_operator_1 |  |
-| test.rs:285:38:285:38 | s | test.rs:285:38:285:44 | Param | match |
-| test.rs:285:38:285:44 | Param | test.rs:286:9:286:10 | Ok |  |
-| test.rs:285:87:287:5 | BlockExpr | test.rs:285:5:287:5 | exit test_question_mark_operator_1 (normal) |  |
-| test.rs:286:9:286:10 | Ok | test.rs:286:12:286:12 | s |  |
-| test.rs:286:9:286:33 | CallExpr | test.rs:285:87:287:5 | BlockExpr |  |
-| test.rs:286:12:286:12 | s | test.rs:286:12:286:27 | ... .parse(...) |  |
-| test.rs:286:12:286:27 | ... .parse(...) | test.rs:286:12:286:28 | TryExpr |  |
-| test.rs:286:12:286:28 | TryExpr | test.rs:285:5:287:5 | exit test_question_mark_operator_1 (normal) | return |
-| test.rs:286:12:286:28 | TryExpr | test.rs:286:32:286:32 | 4 | match |
-| test.rs:286:12:286:32 | ... + ... | test.rs:286:9:286:33 | CallExpr |  |
-| test.rs:286:32:286:32 | 4 | test.rs:286:12:286:32 | ... + ... |  |
-| test.rs:289:5:294:5 | enter test_question_mark_operator_2 | test.rs:289:38:289:38 | b |  |
-| test.rs:289:5:294:5 | exit test_question_mark_operator_2 (normal) | test.rs:289:5:294:5 | exit test_question_mark_operator_2 |  |
-| test.rs:289:38:289:38 | b | test.rs:289:38:289:52 | Param | match |
-| test.rs:289:38:289:52 | Param | test.rs:290:15:290:15 | b |  |
-| test.rs:289:71:294:5 | BlockExpr | test.rs:289:5:294:5 | exit test_question_mark_operator_2 (normal) |  |
-| test.rs:290:9:293:9 | MatchExpr | test.rs:289:71:294:5 | BlockExpr |  |
-| test.rs:290:15:290:15 | b | test.rs:290:15:290:16 | TryExpr |  |
-| test.rs:290:15:290:16 | TryExpr | test.rs:289:5:294:5 | exit test_question_mark_operator_2 (normal) | return |
-| test.rs:290:15:290:16 | TryExpr | test.rs:291:13:291:16 | true | match |
-| test.rs:291:13:291:16 | LiteralPat | test.rs:291:21:291:24 | Some | match |
-| test.rs:291:13:291:16 | LiteralPat | test.rs:292:13:292:17 | false | no-match |
-| test.rs:291:13:291:16 | true | test.rs:291:13:291:16 | LiteralPat |  |
-| test.rs:291:21:291:24 | Some | test.rs:291:26:291:30 | false |  |
-| test.rs:291:21:291:31 | CallExpr | test.rs:290:9:293:9 | MatchExpr |  |
-| test.rs:291:26:291:30 | false | test.rs:291:21:291:31 | CallExpr |  |
-| test.rs:292:13:292:17 | LiteralPat | test.rs:292:22:292:25 | Some | match |
-| test.rs:292:13:292:17 | false | test.rs:292:13:292:17 | LiteralPat |  |
-| test.rs:292:22:292:25 | Some | test.rs:292:27:292:30 | true |  |
-| test.rs:292:22:292:31 | CallExpr | test.rs:290:9:293:9 | MatchExpr |  |
-| test.rs:292:27:292:30 | true | test.rs:292:22:292:31 | CallExpr |  |
-| test.rs:300:5:306:5 | enter test_match | test.rs:300:19:300:29 | maybe_digit |  |
-| test.rs:300:5:306:5 | exit test_match (normal) | test.rs:300:5:306:5 | exit test_match |  |
-| test.rs:300:19:300:29 | maybe_digit | test.rs:300:19:300:42 | Param | match |
-| test.rs:300:19:300:42 | Param | test.rs:301:15:301:25 | maybe_digit |  |
-| test.rs:300:52:306:5 | BlockExpr | test.rs:300:5:306:5 | exit test_match (normal) |  |
-| test.rs:301:9:305:9 | MatchExpr | test.rs:300:52:306:5 | BlockExpr |  |
-| test.rs:301:15:301:25 | maybe_digit | test.rs:302:13:302:27 | TupleStructPat |  |
-| test.rs:302:13:302:27 | TupleStructPat | test.rs:302:26:302:26 | x | match |
-| test.rs:302:13:302:27 | TupleStructPat | test.rs:303:13:303:27 | TupleStructPat | no-match |
-| test.rs:302:26:302:26 | x | test.rs:302:32:302:32 | x | match |
-| test.rs:302:32:302:32 | x | test.rs:302:36:302:37 | 10 |  |
-| test.rs:302:32:302:37 | ... < ... | test.rs:302:42:302:42 | x | true |
-| test.rs:302:32:302:37 | ... < ... | test.rs:303:13:303:27 | TupleStructPat | false |
-| test.rs:302:36:302:37 | 10 | test.rs:302:32:302:37 | ... < ... |  |
-| test.rs:302:42:302:42 | x | test.rs:302:46:302:46 | 5 |  |
-| test.rs:302:42:302:46 | ... + ... | test.rs:301:9:305:9 | MatchExpr |  |
-| test.rs:302:46:302:46 | 5 | test.rs:302:42:302:46 | ... + ... |  |
-| test.rs:303:13:303:27 | TupleStructPat | test.rs:303:26:303:26 | x | match |
-| test.rs:303:13:303:27 | TupleStructPat | test.rs:304:13:304:24 | PathPat | no-match |
-| test.rs:303:26:303:26 | x | test.rs:303:32:303:32 | x | match |
-| test.rs:303:32:303:32 | x | test.rs:301:9:305:9 | MatchExpr |  |
-| test.rs:304:13:304:24 | PathPat | test.rs:304:29:304:29 | 5 | match |
-| test.rs:304:29:304:29 | 5 | test.rs:301:9:305:9 | MatchExpr |  |
-| test.rs:308:5:317:5 | enter test_match_with_return_in_scrutinee | test.rs:308:44:308:54 | maybe_digit |  |
-| test.rs:308:5:317:5 | exit test_match_with_return_in_scrutinee (normal) | test.rs:308:5:317:5 | exit test_match_with_return_in_scrutinee |  |
-| test.rs:308:44:308:54 | maybe_digit | test.rs:308:44:308:67 | Param | match |
-| test.rs:308:44:308:67 | Param | test.rs:309:19:309:29 | maybe_digit |  |
-| test.rs:308:77:317:5 | BlockExpr | test.rs:308:5:317:5 | exit test_match_with_return_in_scrutinee (normal) |  |
-| test.rs:309:9:316:9 | MatchExpr | test.rs:308:77:317:5 | BlockExpr |  |
-| test.rs:309:16:313:9 | IfExpr | test.rs:314:13:314:27 | TupleStructPat |  |
-| test.rs:309:19:309:29 | maybe_digit | test.rs:309:34:309:37 | Some |  |
-| test.rs:309:19:309:40 | ... == ... | test.rs:310:13:310:21 | ExprStmt | true |
-| test.rs:309:19:309:40 | ... == ... | test.rs:312:13:312:23 | maybe_digit | false |
-| test.rs:309:34:309:37 | Some | test.rs:309:39:309:39 | 3 |  |
-| test.rs:309:34:309:40 | CallExpr | test.rs:309:19:309:40 | ... == ... |  |
-| test.rs:309:39:309:39 | 3 | test.rs:309:34:309:40 | CallExpr |  |
-| test.rs:310:13:310:20 | ReturnExpr | test.rs:308:5:317:5 | exit test_match_with_return_in_scrutinee (normal) | return |
-| test.rs:310:13:310:21 | ExprStmt | test.rs:310:20:310:20 | 3 |  |
-| test.rs:310:20:310:20 | 3 | test.rs:310:13:310:20 | ReturnExpr |  |
-| test.rs:311:16:313:9 | BlockExpr | test.rs:309:16:313:9 | IfExpr |  |
-| test.rs:312:13:312:23 | maybe_digit | test.rs:311:16:313:9 | BlockExpr |  |
-| test.rs:314:13:314:27 | TupleStructPat | test.rs:314:26:314:26 | x | match |
-| test.rs:314:13:314:27 | TupleStructPat | test.rs:315:13:315:24 | PathPat | no-match |
-| test.rs:314:26:314:26 | x | test.rs:314:32:314:32 | x | match |
-| test.rs:314:32:314:32 | x | test.rs:314:36:314:36 | 5 |  |
-| test.rs:314:32:314:36 | ... + ... | test.rs:309:9:316:9 | MatchExpr |  |
-| test.rs:314:36:314:36 | 5 | test.rs:314:32:314:36 | ... + ... |  |
-| test.rs:315:13:315:24 | PathPat | test.rs:315:29:315:29 | 5 | match |
-| test.rs:315:29:315:29 | 5 | test.rs:309:9:316:9 | MatchExpr |  |
-| test.rs:319:5:324:5 | enter test_match_and | test.rs:319:23:319:26 | cond |  |
-| test.rs:319:5:324:5 | exit test_match_and (normal) | test.rs:319:5:324:5 | exit test_match_and |  |
-| test.rs:319:23:319:26 | cond | test.rs:319:23:319:32 | Param | match |
-| test.rs:319:23:319:32 | Param | test.rs:319:35:319:35 | r |  |
-| test.rs:319:35:319:35 | r | test.rs:319:35:319:49 | Param | match |
-| test.rs:319:35:319:49 | Param | test.rs:320:16:320:16 | r |  |
-| test.rs:319:60:324:5 | BlockExpr | test.rs:319:5:324:5 | exit test_match_and (normal) |  |
-| test.rs:320:9:323:18 | ... && ... | test.rs:319:60:324:5 | BlockExpr |  |
-| test.rs:320:10:323:9 | [boolean(false)] MatchExpr | test.rs:320:9:323:18 | ... && ... | false |
-| test.rs:320:10:323:9 | [boolean(true)] MatchExpr | test.rs:323:15:323:18 | cond | true |
-| test.rs:320:16:320:16 | r | test.rs:321:13:321:19 | TupleStructPat |  |
-| test.rs:321:13:321:19 | TupleStructPat | test.rs:321:18:321:18 | a | match |
-| test.rs:321:13:321:19 | TupleStructPat | test.rs:322:13:322:13 | WildcardPat | no-match |
-| test.rs:321:18:321:18 | a | test.rs:321:24:321:24 | a | match |
-| test.rs:321:24:321:24 | a | test.rs:320:10:323:9 | [boolean(false)] MatchExpr | false |
-| test.rs:321:24:321:24 | a | test.rs:320:10:323:9 | [boolean(true)] MatchExpr | true |
-| test.rs:322:13:322:13 | WildcardPat | test.rs:322:18:322:22 | false | match |
-| test.rs:322:18:322:22 | false | test.rs:320:10:323:9 | [boolean(false)] MatchExpr | false |
-| test.rs:323:15:323:18 | cond | test.rs:320:9:323:18 | ... && ... |  |
-| test.rs:326:5:331:5 | enter test_match_with_no_arms | test.rs:326:35:326:35 | r |  |
-| test.rs:326:5:331:5 | exit test_match_with_no_arms (normal) | test.rs:326:5:331:5 | exit test_match_with_no_arms |  |
-| test.rs:326:35:326:35 | r | test.rs:326:35:326:58 | Param | match |
-| test.rs:326:35:326:58 | Param | test.rs:327:15:327:15 | r |  |
-| test.rs:326:66:331:5 | BlockExpr | test.rs:326:5:331:5 | exit test_match_with_no_arms (normal) |  |
-| test.rs:327:9:330:9 | MatchExpr | test.rs:326:66:331:5 | BlockExpr |  |
-| test.rs:327:15:327:15 | r | test.rs:328:13:328:21 | TupleStructPat |  |
-| test.rs:328:13:328:21 | TupleStructPat | test.rs:328:16:328:20 | value | match |
-| test.rs:328:13:328:21 | TupleStructPat | test.rs:329:13:329:22 | TupleStructPat | no-match |
-| test.rs:328:16:328:20 | value | test.rs:328:26:328:30 | value | match |
-| test.rs:328:26:328:30 | value | test.rs:327:9:330:9 | MatchExpr |  |
-| test.rs:329:13:329:22 | TupleStructPat | test.rs:329:17:329:21 | never | match |
-| test.rs:329:17:329:21 | never | test.rs:329:33:329:37 | never | match |
-| test.rs:329:27:329:40 | MatchExpr | test.rs:327:9:330:9 | MatchExpr |  |
-| test.rs:329:33:329:37 | never | test.rs:329:27:329:40 | MatchExpr |  |
-| test.rs:336:5:339:5 | enter test_let_match | test.rs:336:23:336:23 | a |  |
-| test.rs:336:5:339:5 | exit test_let_match (normal) | test.rs:336:5:339:5 | exit test_let_match |  |
-| test.rs:336:23:336:23 | a | test.rs:336:23:336:36 | Param | match |
-| test.rs:336:23:336:36 | Param | test.rs:337:9:337:57 | LetStmt |  |
-| test.rs:336:46:339:5 | BlockExpr | test.rs:336:5:339:5 | exit test_let_match (normal) |  |
-| test.rs:337:9:337:57 | LetStmt | test.rs:337:23:337:23 | a |  |
-| test.rs:337:13:337:19 | TupleStructPat | test.rs:337:18:337:18 | n | match |
-| test.rs:337:13:337:19 | TupleStructPat | test.rs:337:39:337:53 | MacroStmts | no-match |
-| test.rs:337:18:337:18 | n | test.rs:338:9:338:9 | n | match |
-| test.rs:337:23:337:23 | a | test.rs:337:13:337:19 | TupleStructPat |  |
-| test.rs:337:32:337:54 | $crate::panicking::panic_fmt | test.rs:337:39:337:53 | "Expected some" |  |
-| test.rs:337:32:337:54 | MacroExpr | test.rs:337:30:337:56 | BlockExpr |  |
-| test.rs:337:39:337:53 | "Expected some" | test.rs:337:39:337:53 | FormatArgsExpr |  |
-| test.rs:337:39:337:53 | BlockExpr | test.rs:337:39:337:53 | MacroExpr |  |
-| test.rs:337:39:337:53 | CallExpr | test.rs:337:39:337:53 | BlockExpr |  |
-| test.rs:337:39:337:53 | ExprStmt | test.rs:337:32:337:54 | $crate::panicking::panic_fmt |  |
-| test.rs:337:39:337:53 | FormatArgsExpr | test.rs:337:39:337:53 | MacroExpr |  |
-| test.rs:337:39:337:53 | MacroExpr | test.rs:337:32:337:54 | MacroExpr |  |
-| test.rs:337:39:337:53 | MacroExpr | test.rs:337:39:337:53 | CallExpr |  |
-| test.rs:337:39:337:53 | MacroStmts | test.rs:337:39:337:53 | ExprStmt |  |
-| test.rs:337:39:337:53 | MacroStmts | test.rs:337:39:337:53 | MacroStmts |  |
-| test.rs:338:9:338:9 | n | test.rs:336:46:339:5 | BlockExpr |  |
-| test.rs:341:5:347:5 | enter test_let_with_return | test.rs:341:29:341:29 | m |  |
-| test.rs:341:5:347:5 | exit test_let_with_return (normal) | test.rs:341:5:347:5 | exit test_let_with_return |  |
-| test.rs:341:29:341:29 | m | test.rs:341:29:341:42 | Param | match |
-| test.rs:341:29:341:42 | Param | test.rs:342:9:345:10 | LetStmt |  |
-| test.rs:341:53:347:5 | BlockExpr | test.rs:341:5:347:5 | exit test_let_with_return (normal) |  |
-| test.rs:342:9:345:10 | LetStmt | test.rs:342:25:342:25 | m |  |
-| test.rs:342:13:342:15 | ret | test.rs:346:9:346:12 | true | match |
-| test.rs:342:19:345:9 | MatchExpr | test.rs:342:13:342:15 | ret |  |
-| test.rs:342:25:342:25 | m | test.rs:343:13:343:21 | TupleStructPat |  |
-| test.rs:343:13:343:21 | TupleStructPat | test.rs:343:18:343:20 | ret | match |
-| test.rs:343:13:343:21 | TupleStructPat | test.rs:344:13:344:16 | None | no-match |
-| test.rs:343:18:343:20 | ret | test.rs:343:26:343:28 | ret | match |
-| test.rs:343:26:343:28 | ret | test.rs:342:19:345:9 | MatchExpr |  |
-| test.rs:344:13:344:16 | None | test.rs:344:28:344:32 | false | match |
-| test.rs:344:21:344:32 | ReturnExpr | test.rs:341:5:347:5 | exit test_let_with_return (normal) | return |
-| test.rs:344:28:344:32 | false | test.rs:344:21:344:32 | ReturnExpr |  |
-| test.rs:346:9:346:12 | true | test.rs:341:53:347:5 | BlockExpr |  |
-| test.rs:352:5:355:5 | enter empty_tuple_pattern | test.rs:352:28:352:31 | unit |  |
-| test.rs:352:5:355:5 | exit empty_tuple_pattern (normal) | test.rs:352:5:355:5 | exit empty_tuple_pattern |  |
-| test.rs:352:28:352:31 | unit | test.rs:352:28:352:35 | Param | match |
-| test.rs:352:28:352:35 | Param | test.rs:353:9:353:22 | LetStmt |  |
-| test.rs:353:9:353:22 | LetStmt | test.rs:353:18:353:21 | unit |  |
-| test.rs:353:13:353:14 | TuplePat | test.rs:354:9:354:15 | ExprStmt | match |
-| test.rs:353:18:353:21 | unit | test.rs:353:13:353:14 | TuplePat |  |
-| test.rs:354:9:354:14 | ReturnExpr | test.rs:352:5:355:5 | exit empty_tuple_pattern (normal) | return |
-| test.rs:354:9:354:15 | ExprStmt | test.rs:354:9:354:14 | ReturnExpr |  |
-| test.rs:359:5:363:5 | enter empty_struct_pattern | test.rs:359:29:359:30 | st |  |
-| test.rs:359:5:363:5 | exit empty_struct_pattern (normal) | test.rs:359:5:363:5 | exit empty_struct_pattern |  |
-| test.rs:359:29:359:30 | st | test.rs:359:29:359:40 | Param | match |
-| test.rs:359:29:359:40 | Param | test.rs:360:15:360:16 | st |  |
-| test.rs:359:50:363:5 | BlockExpr | test.rs:359:5:363:5 | exit empty_struct_pattern (normal) |  |
-| test.rs:360:9:362:9 | MatchExpr | test.rs:359:50:363:5 | BlockExpr |  |
-| test.rs:360:15:360:16 | st | test.rs:361:13:361:27 | RecordPat |  |
-| test.rs:361:13:361:27 | RecordPat | test.rs:361:24:361:25 | RestPat | match |
-| test.rs:361:24:361:25 | RestPat | test.rs:361:32:361:32 | 1 | match |
-| test.rs:361:32:361:32 | 1 | test.rs:360:9:362:9 | MatchExpr |  |
-| test.rs:365:5:372:5 | enter range_pattern | test.rs:366:15:366:16 | 42 |  |
-| test.rs:365:5:372:5 | exit range_pattern (normal) | test.rs:365:5:372:5 | exit range_pattern |  |
-| test.rs:365:31:372:5 | BlockExpr | test.rs:365:5:372:5 | exit range_pattern (normal) |  |
-| test.rs:366:9:371:9 | MatchExpr | test.rs:365:31:372:5 | BlockExpr |  |
-| test.rs:366:15:366:16 | 42 | test.rs:367:13:367:15 | RangePat |  |
-| test.rs:367:13:367:15 | RangePat | test.rs:367:15:367:15 | 0 | match |
-| test.rs:367:13:367:15 | RangePat | test.rs:368:13:368:16 | RangePat | no-match |
-| test.rs:367:15:367:15 | 0 | test.rs:367:15:367:15 | LiteralPat |  |
-| test.rs:367:15:367:15 | LiteralPat | test.rs:367:20:367:20 | 1 | match |
-| test.rs:367:15:367:15 | LiteralPat | test.rs:368:13:368:16 | RangePat | no-match |
-| test.rs:367:20:367:20 | 1 | test.rs:366:9:371:9 | MatchExpr |  |
-| test.rs:368:13:368:13 | 1 | test.rs:368:13:368:13 | LiteralPat |  |
-| test.rs:368:13:368:13 | LiteralPat | test.rs:368:16:368:16 | 2 | match |
-| test.rs:368:13:368:13 | LiteralPat | test.rs:369:13:369:15 | RangePat | no-match |
-| test.rs:368:13:368:16 | RangePat | test.rs:368:13:368:13 | 1 | match |
-| test.rs:368:13:368:16 | RangePat | test.rs:369:13:369:15 | RangePat | no-match |
-| test.rs:368:16:368:16 | 2 | test.rs:368:16:368:16 | LiteralPat |  |
-| test.rs:368:16:368:16 | LiteralPat | test.rs:368:21:368:21 | 2 | match |
-| test.rs:368:16:368:16 | LiteralPat | test.rs:369:13:369:15 | RangePat | no-match |
-| test.rs:368:21:368:21 | 2 | test.rs:366:9:371:9 | MatchExpr |  |
-| test.rs:369:13:369:13 | 5 | test.rs:369:13:369:13 | LiteralPat |  |
-| test.rs:369:13:369:13 | LiteralPat | test.rs:369:20:369:20 | 3 | match |
-| test.rs:369:13:369:13 | LiteralPat | test.rs:370:13:370:13 | WildcardPat | no-match |
-| test.rs:369:13:369:15 | RangePat | test.rs:369:13:369:13 | 5 | match |
-| test.rs:369:13:369:15 | RangePat | test.rs:370:13:370:13 | WildcardPat | no-match |
-| test.rs:369:20:369:20 | 3 | test.rs:366:9:371:9 | MatchExpr |  |
-| test.rs:370:13:370:13 | WildcardPat | test.rs:370:18:370:18 | 4 | match |
-| test.rs:370:18:370:18 | 4 | test.rs:366:9:371:9 | MatchExpr |  |
-| test.rs:376:5:381:5 | enter test_infinite_loop | test.rs:377:9:379:9 | ExprStmt |  |
-| test.rs:377:9:379:9 | ExprStmt | test.rs:378:13:378:14 | TupleExpr |  |
-| test.rs:377:14:379:9 | BlockExpr | test.rs:378:13:378:14 | TupleExpr |  |
-| test.rs:378:13:378:14 | TupleExpr | test.rs:377:14:379:9 | BlockExpr |  |
-| test.rs:385:5:387:5 | enter say_hello | test.rs:386:9:386:34 | ExprStmt |  |
-| test.rs:385:5:387:5 | exit say_hello (normal) | test.rs:385:5:387:5 | exit say_hello |  |
-| test.rs:385:26:387:5 | BlockExpr | test.rs:385:5:387:5 | exit say_hello (normal) |  |
-| test.rs:386:9:386:33 | $crate::io::_print | test.rs:386:18:386:32 | "hello, world!\\n" |  |
-| test.rs:386:9:386:33 | MacroExpr | test.rs:385:26:387:5 | BlockExpr |  |
-| test.rs:386:9:386:34 | ExprStmt | test.rs:386:18:386:32 | MacroStmts |  |
-| test.rs:386:18:386:32 | "hello, world!\\n" | test.rs:386:18:386:32 | FormatArgsExpr |  |
-| test.rs:386:18:386:32 | BlockExpr | test.rs:386:9:386:33 | MacroExpr |  |
-| test.rs:386:18:386:32 | CallExpr | test.rs:386:18:386:32 | BlockExpr |  |
-| test.rs:386:18:386:32 | ExprStmt | test.rs:386:9:386:33 | $crate::io::_print |  |
-| test.rs:386:18:386:32 | FormatArgsExpr | test.rs:386:18:386:32 | MacroExpr |  |
-| test.rs:386:18:386:32 | MacroExpr | test.rs:386:18:386:32 | CallExpr |  |
-| test.rs:386:18:386:32 | MacroStmts | test.rs:386:18:386:32 | ExprStmt |  |
-| test.rs:389:5:408:5 | enter async_block | test.rs:389:26:389:26 | b |  |
-| test.rs:389:5:408:5 | exit async_block (normal) | test.rs:389:5:408:5 | exit async_block |  |
-| test.rs:389:26:389:26 | b | test.rs:389:26:389:32 | Param | match |
-| test.rs:389:26:389:32 | Param | test.rs:390:9:392:10 | LetStmt |  |
-| test.rs:389:35:408:5 | BlockExpr | test.rs:389:5:408:5 | exit async_block (normal) |  |
-| test.rs:390:9:392:10 | LetStmt | test.rs:390:26:392:9 | BlockExpr |  |
-| test.rs:390:13:390:22 | say_godbye | test.rs:393:9:395:10 | LetStmt | match |
-| test.rs:390:26:392:9 | BlockExpr | test.rs:390:13:390:22 | say_godbye |  |
-| test.rs:390:26:392:9 | enter BlockExpr | test.rs:391:13:391:42 | ExprStmt |  |
-| test.rs:390:26:392:9 | exit BlockExpr (normal) | test.rs:390:26:392:9 | exit BlockExpr |  |
-| test.rs:391:13:391:41 | $crate::io::_print | test.rs:391:22:391:40 | "godbye, everyone!\\n" |  |
-| test.rs:391:13:391:41 | MacroExpr | test.rs:390:26:392:9 | exit BlockExpr (normal) |  |
-| test.rs:391:13:391:42 | ExprStmt | test.rs:391:22:391:40 | MacroStmts |  |
-| test.rs:391:22:391:40 | "godbye, everyone!\\n" | test.rs:391:22:391:40 | FormatArgsExpr |  |
-| test.rs:391:22:391:40 | BlockExpr | test.rs:391:13:391:41 | MacroExpr |  |
-| test.rs:391:22:391:40 | CallExpr | test.rs:391:22:391:40 | BlockExpr |  |
-| test.rs:391:22:391:40 | ExprStmt | test.rs:391:13:391:41 | $crate::io::_print |  |
-| test.rs:391:22:391:40 | FormatArgsExpr | test.rs:391:22:391:40 | MacroExpr |  |
-| test.rs:391:22:391:40 | MacroExpr | test.rs:391:22:391:40 | CallExpr |  |
-| test.rs:391:22:391:40 | MacroStmts | test.rs:391:22:391:40 | ExprStmt |  |
-| test.rs:393:9:395:10 | LetStmt | test.rs:393:31:395:9 | BlockExpr |  |
-| test.rs:393:13:393:27 | say_how_are_you | test.rs:396:9:396:28 | LetStmt | match |
-| test.rs:393:31:395:9 | BlockExpr | test.rs:393:13:393:27 | say_how_are_you |  |
-| test.rs:393:31:395:9 | enter BlockExpr | test.rs:394:13:394:37 | ExprStmt |  |
-| test.rs:393:31:395:9 | exit BlockExpr (normal) | test.rs:393:31:395:9 | exit BlockExpr |  |
-| test.rs:394:13:394:36 | $crate::io::_print | test.rs:394:22:394:35 | "how are you?\\n" |  |
-| test.rs:394:13:394:36 | MacroExpr | test.rs:393:31:395:9 | exit BlockExpr (normal) |  |
-| test.rs:394:13:394:37 | ExprStmt | test.rs:394:22:394:35 | MacroStmts |  |
-| test.rs:394:22:394:35 | "how are you?\\n" | test.rs:394:22:394:35 | FormatArgsExpr |  |
-| test.rs:394:22:394:35 | BlockExpr | test.rs:394:13:394:36 | MacroExpr |  |
-| test.rs:394:22:394:35 | CallExpr | test.rs:394:22:394:35 | BlockExpr |  |
-| test.rs:394:22:394:35 | ExprStmt | test.rs:394:13:394:36 | $crate::io::_print |  |
-| test.rs:394:22:394:35 | FormatArgsExpr | test.rs:394:22:394:35 | MacroExpr |  |
-| test.rs:394:22:394:35 | MacroExpr | test.rs:394:22:394:35 | CallExpr |  |
-| test.rs:394:22:394:35 | MacroStmts | test.rs:394:22:394:35 | ExprStmt |  |
-| test.rs:396:9:396:28 | LetStmt | test.rs:396:20:396:27 | BlockExpr |  |
-| test.rs:396:13:396:16 | noop | test.rs:397:9:397:26 | ExprStmt | match |
-| test.rs:396:20:396:27 | BlockExpr | test.rs:396:13:396:16 | noop |  |
-| test.rs:397:9:397:17 | say_hello | test.rs:397:9:397:19 | CallExpr |  |
-| test.rs:397:9:397:19 | CallExpr | test.rs:397:9:397:25 | AwaitExpr |  |
-| test.rs:397:9:397:25 | AwaitExpr | test.rs:398:9:398:30 | ExprStmt |  |
-| test.rs:397:9:397:26 | ExprStmt | test.rs:397:9:397:17 | say_hello |  |
-| test.rs:398:9:398:23 | say_how_are_you | test.rs:398:9:398:29 | AwaitExpr |  |
-| test.rs:398:9:398:29 | AwaitExpr | test.rs:399:9:399:25 | ExprStmt |  |
-| test.rs:398:9:398:30 | ExprStmt | test.rs:398:9:398:23 | say_how_are_you |  |
-| test.rs:399:9:399:18 | say_godbye | test.rs:399:9:399:24 | AwaitExpr |  |
-| test.rs:399:9:399:24 | AwaitExpr | test.rs:400:9:400:19 | ExprStmt |  |
-| test.rs:399:9:399:25 | ExprStmt | test.rs:399:9:399:18 | say_godbye |  |
-| test.rs:400:9:400:12 | noop | test.rs:400:9:400:18 | AwaitExpr |  |
-| test.rs:400:9:400:18 | AwaitExpr | test.rs:402:9:407:10 | LetStmt |  |
-| test.rs:400:9:400:19 | ExprStmt | test.rs:400:9:400:12 | noop |  |
-| test.rs:402:9:407:10 | LetStmt | test.rs:402:22:407:9 | ClosureExpr |  |
-| test.rs:402:13:402:18 | lambda | test.rs:389:35:408:5 | BlockExpr | match |
-| test.rs:402:22:407:9 | ClosureExpr | test.rs:402:13:402:18 | lambda |  |
-| test.rs:402:22:407:9 | enter ClosureExpr | test.rs:402:23:402:25 | foo |  |
-| test.rs:402:22:407:9 | exit ClosureExpr (normal) | test.rs:402:22:407:9 | exit ClosureExpr |  |
-| test.rs:402:23:402:25 | Param | test.rs:402:28:407:9 | BlockExpr |  |
-| test.rs:402:23:402:25 | foo | test.rs:402:23:402:25 | Param | match |
-| test.rs:402:28:407:9 | BlockExpr | test.rs:402:22:407:9 | exit ClosureExpr (normal) |  |
-| test.rs:402:28:407:9 | enter BlockExpr | test.rs:403:13:405:14 | ExprStmt |  |
-| test.rs:402:28:407:9 | exit BlockExpr (normal) | test.rs:402:28:407:9 | exit BlockExpr |  |
-| test.rs:403:13:405:13 | IfExpr | test.rs:406:13:406:15 | foo |  |
-| test.rs:403:13:405:14 | ExprStmt | test.rs:403:16:403:16 | b |  |
-| test.rs:403:16:403:16 | b | test.rs:403:13:405:13 | IfExpr | false |
-| test.rs:403:16:403:16 | b | test.rs:404:17:404:41 | ExprStmt | true |
-| test.rs:404:17:404:40 | ReturnExpr | test.rs:402:28:407:9 | exit BlockExpr (normal) | return |
-| test.rs:404:17:404:41 | ExprStmt | test.rs:404:24:404:34 | async_block |  |
-| test.rs:404:24:404:34 | async_block | test.rs:404:36:404:39 | true |  |
-| test.rs:404:24:404:40 | CallExpr | test.rs:404:17:404:40 | ReturnExpr |  |
-| test.rs:404:36:404:39 | true | test.rs:404:24:404:40 | CallExpr |  |
-| test.rs:406:13:406:15 | foo | test.rs:402:28:407:9 | exit BlockExpr (normal) |  |
-| test.rs:414:5:416:5 | enter add_two | test.rs:414:22:414:22 | n |  |
-| test.rs:414:5:416:5 | exit add_two (normal) | test.rs:414:5:416:5 | exit add_two |  |
-| test.rs:414:22:414:22 | n | test.rs:414:22:414:27 | Param | match |
-| test.rs:414:22:414:27 | Param | test.rs:415:9:415:9 | n |  |
-| test.rs:414:37:416:5 | BlockExpr | test.rs:414:5:416:5 | exit add_two (normal) |  |
-| test.rs:415:9:415:9 | n | test.rs:415:13:415:13 | 2 |  |
-| test.rs:415:9:415:13 | ... + ... | test.rs:414:37:416:5 | BlockExpr |  |
-| test.rs:415:13:415:13 | 2 | test.rs:415:9:415:13 | ... + ... |  |
-| test.rs:420:5:428:5 | enter const_block_assert | test.rs:423:9:425:9 | ExprStmt |  |
-| test.rs:420:5:428:5 | exit const_block_assert (normal) | test.rs:420:5:428:5 | exit const_block_assert |  |
-| test.rs:420:41:428:5 | BlockExpr | test.rs:420:5:428:5 | exit const_block_assert (normal) |  |
-| test.rs:423:9:425:9 | BlockExpr | test.rs:427:9:427:10 | 42 |  |
-| test.rs:423:9:425:9 | ExprStmt | test.rs:424:13:424:50 | ExprStmt |  |
-| test.rs:424:13:424:49 | $crate::panicking::panic_explicit | test.rs:424:13:424:49 | CallExpr |  |
-| test.rs:424:13:424:49 | BlockExpr | test.rs:424:13:424:49 | MacroExpr |  |
-| test.rs:424:13:424:49 | BlockExpr | test.rs:424:13:424:49 | exit panic_cold_explicit (normal) |  |
-| test.rs:424:13:424:49 | BlockExpr | test.rs:424:21:424:48 | IfExpr |  |
-| test.rs:424:13:424:49 | CallExpr | test.rs:424:13:424:49 | BlockExpr |  |
-| test.rs:424:13:424:49 | CallExpr | test.rs:424:13:424:49 | BlockExpr |  |
-| test.rs:424:13:424:49 | ExprStmt | test.rs:424:13:424:49 | MacroStmts |  |
-| test.rs:424:13:424:49 | ExprStmt | test.rs:424:13:424:49 | panic_cold_explicit |  |
-| test.rs:424:13:424:49 | MacroExpr | test.rs:423:9:425:9 | BlockExpr |  |
-| test.rs:424:13:424:49 | MacroExpr | test.rs:424:13:424:49 | BlockExpr |  |
-| test.rs:424:13:424:49 | MacroStmts | test.rs:424:13:424:49 | panic_cold_explicit |  |
-| test.rs:424:13:424:49 | enter panic_cold_explicit | test.rs:424:13:424:49 | $crate::panicking::panic_explicit |  |
-| test.rs:424:13:424:49 | exit panic_cold_explicit (normal) | test.rs:424:13:424:49 | exit panic_cold_explicit |  |
-| test.rs:424:13:424:49 | panic_cold_explicit | test.rs:424:13:424:49 | CallExpr |  |
-| test.rs:424:13:424:49 | panic_cold_explicit | test.rs:424:13:424:49 | ExprStmt |  |
-| test.rs:424:13:424:50 | ExprStmt | test.rs:424:21:424:48 | MacroStmts |  |
-| test.rs:424:21:424:42 | std::mem::size_of::<...> | test.rs:424:21:424:44 | CallExpr |  |
-| test.rs:424:21:424:44 | CallExpr | test.rs:424:48:424:48 | 0 |  |
-| test.rs:424:21:424:48 | ... > ... | test.rs:424:21:424:48 | [boolean(false)] ! ... | true |
-| test.rs:424:21:424:48 | ... > ... | test.rs:424:21:424:48 | [boolean(true)] ! ... | false |
-| test.rs:424:21:424:48 | BlockExpr | test.rs:424:13:424:49 | MacroExpr |  |
-| test.rs:424:21:424:48 | IfExpr | test.rs:424:21:424:48 | BlockExpr |  |
-| test.rs:424:21:424:48 | MacroStmts | test.rs:424:21:424:42 | std::mem::size_of::<...> |  |
-| test.rs:424:21:424:48 | [boolean(false)] ! ... | test.rs:424:21:424:48 | IfExpr | false |
-| test.rs:424:21:424:48 | [boolean(true)] ! ... | test.rs:424:13:424:49 | ExprStmt | true |
-| test.rs:424:48:424:48 | 0 | test.rs:424:21:424:48 | ... > ... |  |
-| test.rs:427:9:427:10 | 42 | test.rs:420:41:428:5 | BlockExpr |  |
-| test.rs:430:5:439:5 | enter const_block_panic | test.rs:431:9:431:30 | Const |  |
-| test.rs:430:5:439:5 | exit const_block_panic (normal) | test.rs:430:5:439:5 | exit const_block_panic |  |
-| test.rs:430:35:439:5 | BlockExpr | test.rs:430:5:439:5 | exit const_block_panic (normal) |  |
-| test.rs:431:9:431:30 | Const | test.rs:432:9:437:9 | ExprStmt |  |
-| test.rs:432:9:437:9 | ExprStmt | test.rs:432:12:432:16 | false |  |
-| test.rs:432:9:437:9 | IfExpr | test.rs:438:9:438:9 | N |  |
-| test.rs:432:12:432:16 | false | test.rs:432:9:437:9 | IfExpr | false |
-| test.rs:435:17:435:24 | $crate::panicking::panic_explicit | test.rs:435:17:435:24 | CallExpr |  |
-| test.rs:435:17:435:24 | BlockExpr | test.rs:435:17:435:24 | exit panic_cold_explicit (normal) |  |
-| test.rs:435:17:435:24 | CallExpr | test.rs:435:17:435:24 | BlockExpr |  |
-| test.rs:435:17:435:24 | enter panic_cold_explicit | test.rs:435:17:435:24 | $crate::panicking::panic_explicit |  |
-| test.rs:435:17:435:24 | exit panic_cold_explicit (normal) | test.rs:435:17:435:24 | exit panic_cold_explicit |  |
-| test.rs:438:9:438:9 | N | test.rs:430:35:439:5 | BlockExpr |  |
-| test.rs:442:1:447:1 | enter dead_code | test.rs:443:5:445:5 | ExprStmt |  |
-| test.rs:442:1:447:1 | exit dead_code (normal) | test.rs:442:1:447:1 | exit dead_code |  |
-| test.rs:443:5:445:5 | ExprStmt | test.rs:443:9:443:12 | true |  |
-| test.rs:443:9:443:12 | true | test.rs:444:9:444:17 | ExprStmt | true |
-| test.rs:444:9:444:16 | ReturnExpr | test.rs:442:1:447:1 | exit dead_code (normal) | return |
-| test.rs:444:9:444:17 | ExprStmt | test.rs:444:16:444:16 | 0 |  |
-| test.rs:444:16:444:16 | 0 | test.rs:444:9:444:16 | ReturnExpr |  |
-| test.rs:449:1:449:16 | enter do_thing | test.rs:449:15:449:16 | BlockExpr |  |
-| test.rs:449:1:449:16 | exit do_thing (normal) | test.rs:449:1:449:16 | exit do_thing |  |
-| test.rs:449:15:449:16 | BlockExpr | test.rs:449:1:449:16 | exit do_thing (normal) |  |
-| test.rs:451:1:453:1 | enter condition_not_met | test.rs:452:5:452:9 | false |  |
-| test.rs:451:1:453:1 | exit condition_not_met (normal) | test.rs:451:1:453:1 | exit condition_not_met |  |
-| test.rs:451:32:453:1 | BlockExpr | test.rs:451:1:453:1 | exit condition_not_met (normal) |  |
-| test.rs:452:5:452:9 | false | test.rs:451:32:453:1 | BlockExpr |  |
-| test.rs:455:1:455:21 | enter do_next_thing | test.rs:455:20:455:21 | BlockExpr |  |
-| test.rs:455:1:455:21 | exit do_next_thing (normal) | test.rs:455:1:455:21 | exit do_next_thing |  |
-| test.rs:455:20:455:21 | BlockExpr | test.rs:455:1:455:21 | exit do_next_thing (normal) |  |
-| test.rs:457:1:457:21 | enter do_last_thing | test.rs:457:20:457:21 | BlockExpr |  |
-| test.rs:457:1:457:21 | exit do_last_thing (normal) | test.rs:457:1:457:21 | exit do_last_thing |  |
-| test.rs:457:20:457:21 | BlockExpr | test.rs:457:1:457:21 | exit do_last_thing (normal) |  |
-| test.rs:459:1:473:1 | enter labelled_block1 | test.rs:460:5:471:6 | LetStmt |  |
-| test.rs:459:1:473:1 | exit labelled_block1 (normal) | test.rs:459:1:473:1 | exit labelled_block1 |  |
-| test.rs:459:29:473:1 | BlockExpr | test.rs:459:1:473:1 | exit labelled_block1 (normal) |  |
-| test.rs:460:5:471:6 | LetStmt | test.rs:461:9:461:19 | ExprStmt |  |
-| test.rs:460:9:460:14 | result | test.rs:472:5:472:10 | result | match |
-| test.rs:460:18:471:5 | BlockExpr | test.rs:460:9:460:14 | result |  |
-| test.rs:461:9:461:16 | do_thing | test.rs:461:9:461:18 | CallExpr |  |
-| test.rs:461:9:461:18 | CallExpr | test.rs:462:9:464:9 | ExprStmt |  |
-| test.rs:461:9:461:19 | ExprStmt | test.rs:461:9:461:16 | do_thing |  |
-| test.rs:462:9:464:9 | ExprStmt | test.rs:462:12:462:28 | condition_not_met |  |
-| test.rs:462:9:464:9 | IfExpr | test.rs:465:9:465:24 | ExprStmt |  |
-| test.rs:462:12:462:28 | condition_not_met | test.rs:462:12:462:30 | CallExpr |  |
-| test.rs:462:12:462:30 | CallExpr | test.rs:462:9:464:9 | IfExpr | false |
-| test.rs:462:12:462:30 | CallExpr | test.rs:463:13:463:27 | ExprStmt | true |
-| test.rs:463:13:463:26 | BreakExpr | test.rs:460:18:471:5 | BlockExpr | break |
-| test.rs:463:13:463:27 | ExprStmt | test.rs:463:26:463:26 | 1 |  |
-| test.rs:463:26:463:26 | 1 | test.rs:463:13:463:26 | BreakExpr |  |
-| test.rs:465:9:465:21 | do_next_thing | test.rs:465:9:465:23 | CallExpr |  |
-| test.rs:465:9:465:23 | CallExpr | test.rs:466:9:468:9 | ExprStmt |  |
-| test.rs:465:9:465:24 | ExprStmt | test.rs:465:9:465:21 | do_next_thing |  |
-| test.rs:466:9:468:9 | ExprStmt | test.rs:466:12:466:28 | condition_not_met |  |
-| test.rs:466:9:468:9 | IfExpr | test.rs:469:9:469:24 | ExprStmt |  |
-| test.rs:466:12:466:28 | condition_not_met | test.rs:466:12:466:30 | CallExpr |  |
-| test.rs:466:12:466:30 | CallExpr | test.rs:466:9:468:9 | IfExpr | false |
-| test.rs:466:12:466:30 | CallExpr | test.rs:467:13:467:27 | ExprStmt | true |
-| test.rs:467:13:467:26 | BreakExpr | test.rs:460:18:471:5 | BlockExpr | break |
-| test.rs:467:13:467:27 | ExprStmt | test.rs:467:26:467:26 | 2 |  |
-| test.rs:467:26:467:26 | 2 | test.rs:467:13:467:26 | BreakExpr |  |
-| test.rs:469:9:469:21 | do_last_thing | test.rs:469:9:469:23 | CallExpr |  |
-| test.rs:469:9:469:23 | CallExpr | test.rs:470:9:470:9 | 3 |  |
-| test.rs:469:9:469:24 | ExprStmt | test.rs:469:9:469:21 | do_last_thing |  |
-| test.rs:470:9:470:9 | 3 | test.rs:460:18:471:5 | BlockExpr |  |
-| test.rs:472:5:472:10 | result | test.rs:459:29:473:1 | BlockExpr |  |
-| test.rs:475:1:483:1 | enter labelled_block2 | test.rs:476:5:482:6 | LetStmt |  |
-| test.rs:475:1:483:1 | exit labelled_block2 (normal) | test.rs:475:1:483:1 | exit labelled_block2 |  |
-| test.rs:475:22:483:1 | BlockExpr | test.rs:475:1:483:1 | exit labelled_block2 (normal) |  |
-| test.rs:476:5:482:6 | LetStmt | test.rs:477:9:477:34 | LetStmt |  |
-| test.rs:476:9:476:14 | result | test.rs:475:22:483:1 | BlockExpr | match |
-| test.rs:476:18:482:5 | BlockExpr | test.rs:476:9:476:14 | result |  |
-| test.rs:477:9:477:34 | LetStmt | test.rs:477:30:477:33 | None |  |
-| test.rs:477:13:477:13 | x | test.rs:478:9:480:10 | LetStmt | match |
-| test.rs:477:30:477:33 | None | test.rs:477:13:477:13 | x |  |
-| test.rs:478:9:480:10 | LetStmt | test.rs:478:23:478:23 | x |  |
-| test.rs:478:13:478:19 | TupleStructPat | test.rs:478:18:478:18 | y | match |
-| test.rs:478:13:478:19 | TupleStructPat | test.rs:479:13:479:27 | ExprStmt | no-match |
-| test.rs:478:18:478:18 | y | test.rs:481:9:481:9 | 0 | match |
-| test.rs:478:23:478:23 | x | test.rs:478:13:478:19 | TupleStructPat |  |
-| test.rs:479:13:479:26 | BreakExpr | test.rs:476:18:482:5 | BlockExpr | break |
-| test.rs:479:13:479:27 | ExprStmt | test.rs:479:26:479:26 | 1 |  |
-| test.rs:479:26:479:26 | 1 | test.rs:479:13:479:26 | BreakExpr |  |
-| test.rs:481:9:481:9 | 0 | test.rs:476:18:482:5 | BlockExpr |  |
-| test.rs:485:1:491:1 | enter test_nested_function2 | test.rs:486:5:486:18 | LetStmt |  |
-| test.rs:485:1:491:1 | exit test_nested_function2 (normal) | test.rs:485:1:491:1 | exit test_nested_function2 |  |
-| test.rs:485:28:491:1 | BlockExpr | test.rs:485:1:491:1 | exit test_nested_function2 (normal) |  |
-| test.rs:486:5:486:18 | LetStmt | test.rs:486:17:486:17 | 0 |  |
-| test.rs:486:9:486:13 | x | test.rs:487:5:489:5 | nested | match |
-| test.rs:486:17:486:17 | 0 | test.rs:486:9:486:13 | x |  |
-| test.rs:487:5:489:5 | enter nested | test.rs:487:15:487:15 | x |  |
-| test.rs:487:5:489:5 | exit nested (normal) | test.rs:487:5:489:5 | exit nested |  |
-| test.rs:487:5:489:5 | nested | test.rs:490:5:490:19 | ExprStmt |  |
-| test.rs:487:15:487:15 | x | test.rs:487:15:487:25 | Param | match |
-| test.rs:487:15:487:25 | Param | test.rs:488:9:488:16 | ExprStmt |  |
-| test.rs:487:28:489:5 | BlockExpr | test.rs:487:5:489:5 | exit nested (normal) |  |
-| test.rs:488:9:488:10 | * ... | test.rs:488:15:488:15 | 1 |  |
-| test.rs:488:9:488:15 | ... += ... | test.rs:487:28:489:5 | BlockExpr |  |
-| test.rs:488:9:488:16 | ExprStmt | test.rs:488:10:488:10 | x |  |
-| test.rs:488:10:488:10 | x | test.rs:488:9:488:10 | * ... |  |
-| test.rs:488:15:488:15 | 1 | test.rs:488:9:488:15 | ... += ... |  |
-| test.rs:490:5:490:10 | nested | test.rs:490:17:490:17 | x |  |
-| test.rs:490:5:490:18 | CallExpr | test.rs:485:28:491:1 | BlockExpr |  |
-| test.rs:490:5:490:19 | ExprStmt | test.rs:490:5:490:10 | nested |  |
-| test.rs:490:12:490:17 | RefExpr | test.rs:490:5:490:18 | CallExpr |  |
-| test.rs:490:17:490:17 | x | test.rs:490:12:490:17 | RefExpr |  |
+| test.rs:278:14:278:19 | return | test.rs:277:5:279:5 | exit fn test_and_return (normal) | return |
+| test.rs:281:5:286:5 | enter fn test_and_true | test.rs:281:22:281:22 | a |  |
+| test.rs:281:5:286:5 | exit fn test_and_true (normal) | test.rs:281:5:286:5 | exit fn test_and_true |  |
+| test.rs:281:22:281:22 | a | test.rs:281:22:281:28 | ...: bool | match |
+| test.rs:281:22:281:28 | ...: bool | test.rs:282:9:284:9 | ExprStmt |  |
+| test.rs:281:38:286:5 | { ... } | test.rs:281:5:286:5 | exit fn test_and_true (normal) |  |
+| test.rs:282:9:284:9 | ExprStmt | test.rs:282:13:282:13 | a |  |
+| test.rs:282:9:284:9 | if ... {...} | test.rs:285:9:285:9 | 0 |  |
+| test.rs:282:13:282:13 | a | test.rs:282:13:282:21 | [boolean(false)] ... && ... | false |
+| test.rs:282:13:282:13 | a | test.rs:282:18:282:21 | true | true |
+| test.rs:282:13:282:21 | [boolean(false)] ... && ... | test.rs:282:9:284:9 | if ... {...} | false |
+| test.rs:282:13:282:21 | [boolean(true)] ... && ... | test.rs:283:13:283:21 | ExprStmt | true |
+| test.rs:282:18:282:21 | true | test.rs:282:13:282:21 | [boolean(true)] ... && ... | true |
+| test.rs:283:13:283:20 | return 1 | test.rs:281:5:286:5 | exit fn test_and_true (normal) | return |
+| test.rs:283:13:283:21 | ExprStmt | test.rs:283:20:283:20 | 1 |  |
+| test.rs:283:20:283:20 | 1 | test.rs:283:13:283:20 | return 1 |  |
+| test.rs:285:9:285:9 | 0 | test.rs:281:38:286:5 | { ... } |  |
+| test.rs:292:5:294:5 | enter fn test_question_mark_operator_1 | test.rs:292:38:292:38 | s |  |
+| test.rs:292:5:294:5 | exit fn test_question_mark_operator_1 (normal) | test.rs:292:5:294:5 | exit fn test_question_mark_operator_1 |  |
+| test.rs:292:38:292:38 | s | test.rs:292:38:292:44 | ...: ... | match |
+| test.rs:292:38:292:44 | ...: ... | test.rs:293:9:293:10 | Ok |  |
+| test.rs:292:87:294:5 | { ... } | test.rs:292:5:294:5 | exit fn test_question_mark_operator_1 (normal) |  |
+| test.rs:293:9:293:10 | Ok | test.rs:293:12:293:12 | s |  |
+| test.rs:293:9:293:33 | Ok(...) | test.rs:292:87:294:5 | { ... } |  |
+| test.rs:293:12:293:12 | s | test.rs:293:12:293:27 | ... .parse(...) |  |
+| test.rs:293:12:293:27 | ... .parse(...) | test.rs:293:12:293:28 | TryExpr |  |
+| test.rs:293:12:293:28 | TryExpr | test.rs:292:5:294:5 | exit fn test_question_mark_operator_1 (normal) | return |
+| test.rs:293:12:293:28 | TryExpr | test.rs:293:32:293:32 | 4 | match |
+| test.rs:293:12:293:32 | ... + ... | test.rs:293:9:293:33 | Ok(...) |  |
+| test.rs:293:32:293:32 | 4 | test.rs:293:12:293:32 | ... + ... |  |
+| test.rs:296:5:301:5 | enter fn test_question_mark_operator_2 | test.rs:296:38:296:38 | b |  |
+| test.rs:296:5:301:5 | exit fn test_question_mark_operator_2 (normal) | test.rs:296:5:301:5 | exit fn test_question_mark_operator_2 |  |
+| test.rs:296:38:296:38 | b | test.rs:296:38:296:52 | ...: Option::<...> | match |
+| test.rs:296:38:296:52 | ...: Option::<...> | test.rs:297:15:297:15 | b |  |
+| test.rs:296:71:301:5 | { ... } | test.rs:296:5:301:5 | exit fn test_question_mark_operator_2 (normal) |  |
+| test.rs:297:9:300:9 | match ... { ... } | test.rs:296:71:301:5 | { ... } |  |
+| test.rs:297:15:297:15 | b | test.rs:297:15:297:16 | TryExpr |  |
+| test.rs:297:15:297:16 | TryExpr | test.rs:296:5:301:5 | exit fn test_question_mark_operator_2 (normal) | return |
+| test.rs:297:15:297:16 | TryExpr | test.rs:298:13:298:16 | true | match |
+| test.rs:298:13:298:16 | true | test.rs:298:13:298:16 | true |  |
+| test.rs:298:13:298:16 | true | test.rs:298:21:298:24 | Some | match |
+| test.rs:298:13:298:16 | true | test.rs:299:13:299:17 | false | no-match |
+| test.rs:298:21:298:24 | Some | test.rs:298:26:298:30 | false |  |
+| test.rs:298:21:298:31 | Some(...) | test.rs:297:9:300:9 | match ... { ... } |  |
+| test.rs:298:26:298:30 | false | test.rs:298:21:298:31 | Some(...) |  |
+| test.rs:299:13:299:17 | false | test.rs:299:13:299:17 | false |  |
+| test.rs:299:13:299:17 | false | test.rs:299:22:299:25 | Some | match |
+| test.rs:299:22:299:25 | Some | test.rs:299:27:299:30 | true |  |
+| test.rs:299:22:299:31 | Some(...) | test.rs:297:9:300:9 | match ... { ... } |  |
+| test.rs:299:27:299:30 | true | test.rs:299:22:299:31 | Some(...) |  |
+| test.rs:307:5:313:5 | enter fn test_match | test.rs:307:19:307:29 | maybe_digit |  |
+| test.rs:307:5:313:5 | exit fn test_match (normal) | test.rs:307:5:313:5 | exit fn test_match |  |
+| test.rs:307:19:307:29 | maybe_digit | test.rs:307:19:307:42 | ...: Option::<...> | match |
+| test.rs:307:19:307:42 | ...: Option::<...> | test.rs:308:15:308:25 | maybe_digit |  |
+| test.rs:307:52:313:5 | { ... } | test.rs:307:5:313:5 | exit fn test_match (normal) |  |
+| test.rs:308:9:312:9 | match maybe_digit { ... } | test.rs:307:52:313:5 | { ... } |  |
+| test.rs:308:15:308:25 | maybe_digit | test.rs:309:13:309:27 | ...::Some(...) |  |
+| test.rs:309:13:309:27 | ...::Some(...) | test.rs:309:26:309:26 | x | match |
+| test.rs:309:13:309:27 | ...::Some(...) | test.rs:310:13:310:27 | ...::Some(...) | no-match |
+| test.rs:309:26:309:26 | x | test.rs:309:32:309:32 | x | match |
+| test.rs:309:32:309:32 | x | test.rs:309:36:309:37 | 10 |  |
+| test.rs:309:32:309:37 | ... < ... | test.rs:309:42:309:42 | x | true |
+| test.rs:309:32:309:37 | ... < ... | test.rs:310:13:310:27 | ...::Some(...) | false |
+| test.rs:309:36:309:37 | 10 | test.rs:309:32:309:37 | ... < ... |  |
+| test.rs:309:42:309:42 | x | test.rs:309:46:309:46 | 5 |  |
+| test.rs:309:42:309:46 | ... + ... | test.rs:308:9:312:9 | match maybe_digit { ... } |  |
+| test.rs:309:46:309:46 | 5 | test.rs:309:42:309:46 | ... + ... |  |
+| test.rs:310:13:310:27 | ...::Some(...) | test.rs:310:26:310:26 | x | match |
+| test.rs:310:13:310:27 | ...::Some(...) | test.rs:311:13:311:24 | ...::None | no-match |
+| test.rs:310:26:310:26 | x | test.rs:310:32:310:32 | x | match |
+| test.rs:310:32:310:32 | x | test.rs:308:9:312:9 | match maybe_digit { ... } |  |
+| test.rs:311:13:311:24 | ...::None | test.rs:311:29:311:29 | 5 | match |
+| test.rs:311:29:311:29 | 5 | test.rs:308:9:312:9 | match maybe_digit { ... } |  |
+| test.rs:315:5:324:5 | enter fn test_match_with_return_in_scrutinee | test.rs:315:44:315:54 | maybe_digit |  |
+| test.rs:315:5:324:5 | exit fn test_match_with_return_in_scrutinee (normal) | test.rs:315:5:324:5 | exit fn test_match_with_return_in_scrutinee |  |
+| test.rs:315:44:315:54 | maybe_digit | test.rs:315:44:315:67 | ...: Option::<...> | match |
+| test.rs:315:44:315:67 | ...: Option::<...> | test.rs:316:19:316:29 | maybe_digit |  |
+| test.rs:315:77:324:5 | { ... } | test.rs:315:5:324:5 | exit fn test_match_with_return_in_scrutinee (normal) |  |
+| test.rs:316:9:323:9 | match ... { ... } | test.rs:315:77:324:5 | { ... } |  |
+| test.rs:316:16:320:9 | if ... {...} else {...} | test.rs:321:13:321:27 | ...::Some(...) |  |
+| test.rs:316:19:316:29 | maybe_digit | test.rs:316:34:316:37 | Some |  |
+| test.rs:316:19:316:40 | ... == ... | test.rs:317:13:317:21 | ExprStmt | true |
+| test.rs:316:19:316:40 | ... == ... | test.rs:319:13:319:23 | maybe_digit | false |
+| test.rs:316:34:316:37 | Some | test.rs:316:39:316:39 | 3 |  |
+| test.rs:316:34:316:40 | Some(...) | test.rs:316:19:316:40 | ... == ... |  |
+| test.rs:316:39:316:39 | 3 | test.rs:316:34:316:40 | Some(...) |  |
+| test.rs:317:13:317:20 | return 3 | test.rs:315:5:324:5 | exit fn test_match_with_return_in_scrutinee (normal) | return |
+| test.rs:317:13:317:21 | ExprStmt | test.rs:317:20:317:20 | 3 |  |
+| test.rs:317:20:317:20 | 3 | test.rs:317:13:317:20 | return 3 |  |
+| test.rs:318:16:320:9 | { ... } | test.rs:316:16:320:9 | if ... {...} else {...} |  |
+| test.rs:319:13:319:23 | maybe_digit | test.rs:318:16:320:9 | { ... } |  |
+| test.rs:321:13:321:27 | ...::Some(...) | test.rs:321:26:321:26 | x | match |
+| test.rs:321:13:321:27 | ...::Some(...) | test.rs:322:13:322:24 | ...::None | no-match |
+| test.rs:321:26:321:26 | x | test.rs:321:32:321:32 | x | match |
+| test.rs:321:32:321:32 | x | test.rs:321:36:321:36 | 5 |  |
+| test.rs:321:32:321:36 | ... + ... | test.rs:316:9:323:9 | match ... { ... } |  |
+| test.rs:321:36:321:36 | 5 | test.rs:321:32:321:36 | ... + ... |  |
+| test.rs:322:13:322:24 | ...::None | test.rs:322:29:322:29 | 5 | match |
+| test.rs:322:29:322:29 | 5 | test.rs:316:9:323:9 | match ... { ... } |  |
+| test.rs:326:5:331:5 | enter fn test_match_and | test.rs:326:23:326:26 | cond |  |
+| test.rs:326:5:331:5 | exit fn test_match_and (normal) | test.rs:326:5:331:5 | exit fn test_match_and |  |
+| test.rs:326:23:326:26 | cond | test.rs:326:23:326:32 | ...: bool | match |
+| test.rs:326:23:326:32 | ...: bool | test.rs:326:35:326:35 | r |  |
+| test.rs:326:35:326:35 | r | test.rs:326:35:326:49 | ...: Option::<...> | match |
+| test.rs:326:35:326:49 | ...: Option::<...> | test.rs:327:16:327:16 | r |  |
+| test.rs:326:60:331:5 | { ... } | test.rs:326:5:331:5 | exit fn test_match_and (normal) |  |
+| test.rs:327:9:330:18 | ... && ... | test.rs:326:60:331:5 | { ... } |  |
+| test.rs:327:10:330:9 | [boolean(false)] match r { ... } | test.rs:327:9:330:18 | ... && ... | false |
+| test.rs:327:10:330:9 | [boolean(true)] match r { ... } | test.rs:330:15:330:18 | cond | true |
+| test.rs:327:16:327:16 | r | test.rs:328:13:328:19 | Some(...) |  |
+| test.rs:328:13:328:19 | Some(...) | test.rs:328:18:328:18 | a | match |
+| test.rs:328:13:328:19 | Some(...) | test.rs:329:13:329:13 | _ | no-match |
+| test.rs:328:18:328:18 | a | test.rs:328:24:328:24 | a | match |
+| test.rs:328:24:328:24 | a | test.rs:327:10:330:9 | [boolean(false)] match r { ... } | false |
+| test.rs:328:24:328:24 | a | test.rs:327:10:330:9 | [boolean(true)] match r { ... } | true |
+| test.rs:329:13:329:13 | _ | test.rs:329:18:329:22 | false | match |
+| test.rs:329:18:329:22 | false | test.rs:327:10:330:9 | [boolean(false)] match r { ... } | false |
+| test.rs:330:15:330:18 | cond | test.rs:327:9:330:18 | ... && ... |  |
+| test.rs:333:5:338:5 | enter fn test_match_with_no_arms | test.rs:333:35:333:35 | r |  |
+| test.rs:333:5:338:5 | exit fn test_match_with_no_arms (normal) | test.rs:333:5:338:5 | exit fn test_match_with_no_arms |  |
+| test.rs:333:35:333:35 | r | test.rs:333:35:333:58 | ...: Result::<...> | match |
+| test.rs:333:35:333:58 | ...: Result::<...> | test.rs:334:15:334:15 | r |  |
+| test.rs:333:66:338:5 | { ... } | test.rs:333:5:338:5 | exit fn test_match_with_no_arms (normal) |  |
+| test.rs:334:9:337:9 | match r { ... } | test.rs:333:66:338:5 | { ... } |  |
+| test.rs:334:15:334:15 | r | test.rs:335:13:335:21 | Ok(...) |  |
+| test.rs:335:13:335:21 | Ok(...) | test.rs:335:16:335:20 | value | match |
+| test.rs:335:13:335:21 | Ok(...) | test.rs:336:13:336:22 | Err(...) | no-match |
+| test.rs:335:16:335:20 | value | test.rs:335:26:335:30 | value | match |
+| test.rs:335:26:335:30 | value | test.rs:334:9:337:9 | match r { ... } |  |
+| test.rs:336:13:336:22 | Err(...) | test.rs:336:17:336:21 | never | match |
+| test.rs:336:17:336:21 | never | test.rs:336:33:336:37 | never | match |
+| test.rs:336:27:336:40 | match never { ... } | test.rs:334:9:337:9 | match r { ... } |  |
+| test.rs:336:33:336:37 | never | test.rs:336:27:336:40 | match never { ... } |  |
+| test.rs:343:5:346:5 | enter fn test_let_match | test.rs:343:23:343:23 | a |  |
+| test.rs:343:5:346:5 | exit fn test_let_match (normal) | test.rs:343:5:346:5 | exit fn test_let_match |  |
+| test.rs:343:23:343:23 | a | test.rs:343:23:343:36 | ...: Option::<...> | match |
+| test.rs:343:23:343:36 | ...: Option::<...> | test.rs:344:9:344:57 | let ... = a else {...} |  |
+| test.rs:343:46:346:5 | { ... } | test.rs:343:5:346:5 | exit fn test_let_match (normal) |  |
+| test.rs:344:9:344:57 | let ... = a else {...} | test.rs:344:23:344:23 | a |  |
+| test.rs:344:13:344:19 | Some(...) | test.rs:344:18:344:18 | n | match |
+| test.rs:344:13:344:19 | Some(...) | test.rs:344:39:344:53 | MacroStmts | no-match |
+| test.rs:344:18:344:18 | n | test.rs:345:9:345:9 | n | match |
+| test.rs:344:23:344:23 | a | test.rs:344:13:344:19 | Some(...) |  |
+| test.rs:344:32:344:54 | ...::panic_fmt | test.rs:344:39:344:53 | "Expected some" |  |
+| test.rs:344:32:344:54 | MacroExpr | test.rs:344:30:344:56 | { ... } |  |
+| test.rs:344:39:344:53 | "Expected some" | test.rs:344:39:344:53 | FormatArgsExpr |  |
+| test.rs:344:39:344:53 | ...::panic_fmt(...) | test.rs:344:39:344:53 | { ... } |  |
+| test.rs:344:39:344:53 | ExprStmt | test.rs:344:32:344:54 | ...::panic_fmt |  |
+| test.rs:344:39:344:53 | FormatArgsExpr | test.rs:344:39:344:53 | MacroExpr |  |
+| test.rs:344:39:344:53 | MacroExpr | test.rs:344:32:344:54 | MacroExpr |  |
+| test.rs:344:39:344:53 | MacroExpr | test.rs:344:39:344:53 | ...::panic_fmt(...) |  |
+| test.rs:344:39:344:53 | MacroStmts | test.rs:344:39:344:53 | ExprStmt |  |
+| test.rs:344:39:344:53 | MacroStmts | test.rs:344:39:344:53 | MacroStmts |  |
+| test.rs:344:39:344:53 | { ... } | test.rs:344:39:344:53 | MacroExpr |  |
+| test.rs:345:9:345:9 | n | test.rs:343:46:346:5 | { ... } |  |
+| test.rs:348:5:354:5 | enter fn test_let_with_return | test.rs:348:29:348:29 | m |  |
+| test.rs:348:5:354:5 | exit fn test_let_with_return (normal) | test.rs:348:5:354:5 | exit fn test_let_with_return |  |
+| test.rs:348:29:348:29 | m | test.rs:348:29:348:42 | ...: Option::<...> | match |
+| test.rs:348:29:348:42 | ...: Option::<...> | test.rs:349:9:352:10 | let ... = ... |  |
+| test.rs:348:53:354:5 | { ... } | test.rs:348:5:354:5 | exit fn test_let_with_return (normal) |  |
+| test.rs:349:9:352:10 | let ... = ... | test.rs:349:25:349:25 | m |  |
+| test.rs:349:13:349:15 | ret | test.rs:353:9:353:12 | true | match |
+| test.rs:349:19:352:9 | match m { ... } | test.rs:349:13:349:15 | ret |  |
+| test.rs:349:25:349:25 | m | test.rs:350:13:350:21 | Some(...) |  |
+| test.rs:350:13:350:21 | Some(...) | test.rs:350:18:350:20 | ret | match |
+| test.rs:350:13:350:21 | Some(...) | test.rs:351:13:351:16 | None | no-match |
+| test.rs:350:18:350:20 | ret | test.rs:350:26:350:28 | ret | match |
+| test.rs:350:26:350:28 | ret | test.rs:349:19:352:9 | match m { ... } |  |
+| test.rs:351:13:351:16 | None | test.rs:351:28:351:32 | false | match |
+| test.rs:351:21:351:32 | return false | test.rs:348:5:354:5 | exit fn test_let_with_return (normal) | return |
+| test.rs:351:28:351:32 | false | test.rs:351:21:351:32 | return false |  |
+| test.rs:353:9:353:12 | true | test.rs:348:53:354:5 | { ... } |  |
+| test.rs:359:5:362:5 | enter fn empty_tuple_pattern | test.rs:359:28:359:31 | unit |  |
+| test.rs:359:5:362:5 | exit fn empty_tuple_pattern (normal) | test.rs:359:5:362:5 | exit fn empty_tuple_pattern |  |
+| test.rs:359:28:359:31 | unit | test.rs:359:28:359:35 | ...: ... | match |
+| test.rs:359:28:359:35 | ...: ... | test.rs:360:9:360:22 | let ... = unit |  |
+| test.rs:360:9:360:22 | let ... = unit | test.rs:360:18:360:21 | unit |  |
+| test.rs:360:13:360:14 | TuplePat | test.rs:361:9:361:15 | ExprStmt | match |
+| test.rs:360:18:360:21 | unit | test.rs:360:13:360:14 | TuplePat |  |
+| test.rs:361:9:361:14 | return | test.rs:359:5:362:5 | exit fn empty_tuple_pattern (normal) | return |
+| test.rs:361:9:361:15 | ExprStmt | test.rs:361:9:361:14 | return |  |
+| test.rs:366:5:370:5 | enter fn empty_struct_pattern | test.rs:366:29:366:30 | st |  |
+| test.rs:366:5:370:5 | exit fn empty_struct_pattern (normal) | test.rs:366:5:370:5 | exit fn empty_struct_pattern |  |
+| test.rs:366:29:366:30 | st | test.rs:366:29:366:40 | ...: MyStruct | match |
+| test.rs:366:29:366:40 | ...: MyStruct | test.rs:367:15:367:16 | st |  |
+| test.rs:366:50:370:5 | { ... } | test.rs:366:5:370:5 | exit fn empty_struct_pattern (normal) |  |
+| test.rs:367:9:369:9 | match st { ... } | test.rs:366:50:370:5 | { ... } |  |
+| test.rs:367:15:367:16 | st | test.rs:368:13:368:27 | MyStruct {...} |  |
+| test.rs:368:13:368:27 | MyStruct {...} | test.rs:368:24:368:25 | .. | match |
+| test.rs:368:24:368:25 | .. | test.rs:368:32:368:32 | 1 | match |
+| test.rs:368:32:368:32 | 1 | test.rs:367:9:369:9 | match st { ... } |  |
+| test.rs:372:5:379:5 | enter fn range_pattern | test.rs:373:15:373:16 | 42 |  |
+| test.rs:372:5:379:5 | exit fn range_pattern (normal) | test.rs:372:5:379:5 | exit fn range_pattern |  |
+| test.rs:372:31:379:5 | { ... } | test.rs:372:5:379:5 | exit fn range_pattern (normal) |  |
+| test.rs:373:9:378:9 | match 42 { ... } | test.rs:372:31:379:5 | { ... } |  |
+| test.rs:373:15:373:16 | 42 | test.rs:374:13:374:15 | RangePat |  |
+| test.rs:374:13:374:15 | RangePat | test.rs:374:15:374:15 | 0 | match |
+| test.rs:374:13:374:15 | RangePat | test.rs:375:13:375:16 | RangePat | no-match |
+| test.rs:374:15:374:15 | 0 | test.rs:374:15:374:15 | 0 |  |
+| test.rs:374:15:374:15 | 0 | test.rs:374:20:374:20 | 1 | match |
+| test.rs:374:15:374:15 | 0 | test.rs:375:13:375:16 | RangePat | no-match |
+| test.rs:374:20:374:20 | 1 | test.rs:373:9:378:9 | match 42 { ... } |  |
+| test.rs:375:13:375:13 | 1 | test.rs:375:13:375:13 | 1 |  |
+| test.rs:375:13:375:13 | 1 | test.rs:375:16:375:16 | 2 | match |
+| test.rs:375:13:375:13 | 1 | test.rs:376:13:376:15 | RangePat | no-match |
+| test.rs:375:13:375:16 | RangePat | test.rs:375:13:375:13 | 1 | match |
+| test.rs:375:13:375:16 | RangePat | test.rs:376:13:376:15 | RangePat | no-match |
+| test.rs:375:16:375:16 | 2 | test.rs:375:16:375:16 | 2 |  |
+| test.rs:375:16:375:16 | 2 | test.rs:375:21:375:21 | 2 | match |
+| test.rs:375:16:375:16 | 2 | test.rs:376:13:376:15 | RangePat | no-match |
+| test.rs:375:21:375:21 | 2 | test.rs:373:9:378:9 | match 42 { ... } |  |
+| test.rs:376:13:376:13 | 5 | test.rs:376:13:376:13 | 5 |  |
+| test.rs:376:13:376:13 | 5 | test.rs:376:20:376:20 | 3 | match |
+| test.rs:376:13:376:13 | 5 | test.rs:377:13:377:13 | _ | no-match |
+| test.rs:376:13:376:15 | RangePat | test.rs:376:13:376:13 | 5 | match |
+| test.rs:376:13:376:15 | RangePat | test.rs:377:13:377:13 | _ | no-match |
+| test.rs:376:20:376:20 | 3 | test.rs:373:9:378:9 | match 42 { ... } |  |
+| test.rs:377:13:377:13 | _ | test.rs:377:18:377:18 | 4 | match |
+| test.rs:377:18:377:18 | 4 | test.rs:373:9:378:9 | match 42 { ... } |  |
+| test.rs:383:5:388:5 | enter fn test_infinite_loop | test.rs:384:9:386:9 | ExprStmt |  |
+| test.rs:384:9:386:9 | ExprStmt | test.rs:385:13:385:14 | TupleExpr |  |
+| test.rs:384:14:386:9 | { ... } | test.rs:385:13:385:14 | TupleExpr |  |
+| test.rs:385:13:385:14 | TupleExpr | test.rs:384:14:386:9 | { ... } |  |
+| test.rs:392:5:394:5 | enter fn say_hello | test.rs:393:9:393:34 | ExprStmt |  |
+| test.rs:392:5:394:5 | exit fn say_hello (normal) | test.rs:392:5:394:5 | exit fn say_hello |  |
+| test.rs:392:26:394:5 | { ... } | test.rs:392:5:394:5 | exit fn say_hello (normal) |  |
+| test.rs:393:9:393:33 | ...::_print | test.rs:393:18:393:32 | "hello, world!\\n" |  |
+| test.rs:393:9:393:33 | MacroExpr | test.rs:392:26:394:5 | { ... } |  |
+| test.rs:393:9:393:34 | ExprStmt | test.rs:393:18:393:32 | MacroStmts |  |
+| test.rs:393:18:393:32 | "hello, world!\\n" | test.rs:393:18:393:32 | FormatArgsExpr |  |
+| test.rs:393:18:393:32 | ...::_print(...) | test.rs:393:18:393:32 | { ... } |  |
+| test.rs:393:18:393:32 | ExprStmt | test.rs:393:9:393:33 | ...::_print |  |
+| test.rs:393:18:393:32 | FormatArgsExpr | test.rs:393:18:393:32 | MacroExpr |  |
+| test.rs:393:18:393:32 | MacroExpr | test.rs:393:18:393:32 | ...::_print(...) |  |
+| test.rs:393:18:393:32 | MacroStmts | test.rs:393:18:393:32 | ExprStmt |  |
+| test.rs:393:18:393:32 | { ... } | test.rs:393:9:393:33 | MacroExpr |  |
+| test.rs:396:5:415:5 | enter fn async_block | test.rs:396:26:396:26 | b |  |
+| test.rs:396:5:415:5 | exit fn async_block (normal) | test.rs:396:5:415:5 | exit fn async_block |  |
+| test.rs:396:26:396:26 | b | test.rs:396:26:396:32 | ...: bool | match |
+| test.rs:396:26:396:32 | ...: bool | test.rs:397:9:399:10 | let ... = ... |  |
+| test.rs:396:35:415:5 | { ... } | test.rs:396:5:415:5 | exit fn async_block (normal) |  |
+| test.rs:397:9:399:10 | let ... = ... | test.rs:397:26:399:9 | { ... } |  |
+| test.rs:397:13:397:22 | say_godbye | test.rs:400:9:402:10 | let ... = ... | match |
+| test.rs:397:26:399:9 | enter { ... } | test.rs:398:13:398:42 | ExprStmt |  |
+| test.rs:397:26:399:9 | exit { ... } (normal) | test.rs:397:26:399:9 | exit { ... } |  |
+| test.rs:397:26:399:9 | { ... } | test.rs:397:13:397:22 | say_godbye |  |
+| test.rs:398:13:398:41 | ...::_print | test.rs:398:22:398:40 | "godbye, everyone!\\n" |  |
+| test.rs:398:13:398:41 | MacroExpr | test.rs:397:26:399:9 | exit { ... } (normal) |  |
+| test.rs:398:13:398:42 | ExprStmt | test.rs:398:22:398:40 | MacroStmts |  |
+| test.rs:398:22:398:40 | "godbye, everyone!\\n" | test.rs:398:22:398:40 | FormatArgsExpr |  |
+| test.rs:398:22:398:40 | ...::_print(...) | test.rs:398:22:398:40 | { ... } |  |
+| test.rs:398:22:398:40 | ExprStmt | test.rs:398:13:398:41 | ...::_print |  |
+| test.rs:398:22:398:40 | FormatArgsExpr | test.rs:398:22:398:40 | MacroExpr |  |
+| test.rs:398:22:398:40 | MacroExpr | test.rs:398:22:398:40 | ...::_print(...) |  |
+| test.rs:398:22:398:40 | MacroStmts | test.rs:398:22:398:40 | ExprStmt |  |
+| test.rs:398:22:398:40 | { ... } | test.rs:398:13:398:41 | MacroExpr |  |
+| test.rs:400:9:402:10 | let ... = ... | test.rs:400:31:402:9 | { ... } |  |
+| test.rs:400:13:400:27 | say_how_are_you | test.rs:403:9:403:28 | let ... = ... | match |
+| test.rs:400:31:402:9 | enter { ... } | test.rs:401:13:401:37 | ExprStmt |  |
+| test.rs:400:31:402:9 | exit { ... } (normal) | test.rs:400:31:402:9 | exit { ... } |  |
+| test.rs:400:31:402:9 | { ... } | test.rs:400:13:400:27 | say_how_are_you |  |
+| test.rs:401:13:401:36 | ...::_print | test.rs:401:22:401:35 | "how are you?\\n" |  |
+| test.rs:401:13:401:36 | MacroExpr | test.rs:400:31:402:9 | exit { ... } (normal) |  |
+| test.rs:401:13:401:37 | ExprStmt | test.rs:401:22:401:35 | MacroStmts |  |
+| test.rs:401:22:401:35 | "how are you?\\n" | test.rs:401:22:401:35 | FormatArgsExpr |  |
+| test.rs:401:22:401:35 | ...::_print(...) | test.rs:401:22:401:35 | { ... } |  |
+| test.rs:401:22:401:35 | ExprStmt | test.rs:401:13:401:36 | ...::_print |  |
+| test.rs:401:22:401:35 | FormatArgsExpr | test.rs:401:22:401:35 | MacroExpr |  |
+| test.rs:401:22:401:35 | MacroExpr | test.rs:401:22:401:35 | ...::_print(...) |  |
+| test.rs:401:22:401:35 | MacroStmts | test.rs:401:22:401:35 | ExprStmt |  |
+| test.rs:401:22:401:35 | { ... } | test.rs:401:13:401:36 | MacroExpr |  |
+| test.rs:403:9:403:28 | let ... = ... | test.rs:403:20:403:27 | { ... } |  |
+| test.rs:403:13:403:16 | noop | test.rs:404:9:404:26 | ExprStmt | match |
+| test.rs:403:20:403:27 | { ... } | test.rs:403:13:403:16 | noop |  |
+| test.rs:404:9:404:17 | say_hello | test.rs:404:9:404:19 | say_hello(...) |  |
+| test.rs:404:9:404:19 | say_hello(...) | test.rs:404:9:404:25 | await ... |  |
+| test.rs:404:9:404:25 | await ... | test.rs:405:9:405:30 | ExprStmt |  |
+| test.rs:404:9:404:26 | ExprStmt | test.rs:404:9:404:17 | say_hello |  |
+| test.rs:405:9:405:23 | say_how_are_you | test.rs:405:9:405:29 | await say_how_are_you |  |
+| test.rs:405:9:405:29 | await say_how_are_you | test.rs:406:9:406:25 | ExprStmt |  |
+| test.rs:405:9:405:30 | ExprStmt | test.rs:405:9:405:23 | say_how_are_you |  |
+| test.rs:406:9:406:18 | say_godbye | test.rs:406:9:406:24 | await say_godbye |  |
+| test.rs:406:9:406:24 | await say_godbye | test.rs:407:9:407:19 | ExprStmt |  |
+| test.rs:406:9:406:25 | ExprStmt | test.rs:406:9:406:18 | say_godbye |  |
+| test.rs:407:9:407:12 | noop | test.rs:407:9:407:18 | await noop |  |
+| test.rs:407:9:407:18 | await noop | test.rs:409:9:414:10 | let ... = ... |  |
+| test.rs:407:9:407:19 | ExprStmt | test.rs:407:9:407:12 | noop |  |
+| test.rs:409:9:414:10 | let ... = ... | test.rs:409:22:414:9 | \|...\| ... |  |
+| test.rs:409:13:409:18 | lambda | test.rs:396:35:415:5 | { ... } | match |
+| test.rs:409:22:414:9 | \|...\| ... | test.rs:409:13:409:18 | lambda |  |
+| test.rs:409:22:414:9 | enter \|...\| ... | test.rs:409:23:409:25 | foo |  |
+| test.rs:409:22:414:9 | exit \|...\| ... (normal) | test.rs:409:22:414:9 | exit \|...\| ... |  |
+| test.rs:409:23:409:25 | ... | test.rs:409:28:414:9 | { ... } |  |
+| test.rs:409:23:409:25 | foo | test.rs:409:23:409:25 | ... | match |
+| test.rs:409:28:414:9 | enter { ... } | test.rs:410:13:412:14 | ExprStmt |  |
+| test.rs:409:28:414:9 | exit { ... } (normal) | test.rs:409:28:414:9 | exit { ... } |  |
+| test.rs:409:28:414:9 | { ... } | test.rs:409:22:414:9 | exit \|...\| ... (normal) |  |
+| test.rs:410:13:412:13 | if b {...} | test.rs:413:13:413:15 | foo |  |
+| test.rs:410:13:412:14 | ExprStmt | test.rs:410:16:410:16 | b |  |
+| test.rs:410:16:410:16 | b | test.rs:410:13:412:13 | if b {...} | false |
+| test.rs:410:16:410:16 | b | test.rs:411:17:411:41 | ExprStmt | true |
+| test.rs:411:17:411:40 | return ... | test.rs:409:28:414:9 | exit { ... } (normal) | return |
+| test.rs:411:17:411:41 | ExprStmt | test.rs:411:24:411:34 | async_block |  |
+| test.rs:411:24:411:34 | async_block | test.rs:411:36:411:39 | true |  |
+| test.rs:411:24:411:40 | async_block(...) | test.rs:411:17:411:40 | return ... |  |
+| test.rs:411:36:411:39 | true | test.rs:411:24:411:40 | async_block(...) |  |
+| test.rs:413:13:413:15 | foo | test.rs:409:28:414:9 | exit { ... } (normal) |  |
+| test.rs:421:5:423:5 | enter fn add_two | test.rs:421:22:421:22 | n |  |
+| test.rs:421:5:423:5 | exit fn add_two (normal) | test.rs:421:5:423:5 | exit fn add_two |  |
+| test.rs:421:22:421:22 | n | test.rs:421:22:421:27 | ...: i64 | match |
+| test.rs:421:22:421:27 | ...: i64 | test.rs:422:9:422:9 | n |  |
+| test.rs:421:37:423:5 | { ... } | test.rs:421:5:423:5 | exit fn add_two (normal) |  |
+| test.rs:422:9:422:9 | n | test.rs:422:13:422:13 | 2 |  |
+| test.rs:422:9:422:13 | ... + ... | test.rs:421:37:423:5 | { ... } |  |
+| test.rs:422:13:422:13 | 2 | test.rs:422:9:422:13 | ... + ... |  |
+| test.rs:427:5:435:5 | enter fn const_block_assert | test.rs:430:9:432:9 | ExprStmt |  |
+| test.rs:427:5:435:5 | exit fn const_block_assert (normal) | test.rs:427:5:435:5 | exit fn const_block_assert |  |
+| test.rs:427:41:435:5 | { ... } | test.rs:427:5:435:5 | exit fn const_block_assert (normal) |  |
+| test.rs:430:9:432:9 | ExprStmt | test.rs:431:13:431:50 | ExprStmt |  |
+| test.rs:430:9:432:9 | { ... } | test.rs:434:9:434:10 | 42 |  |
+| test.rs:431:13:431:49 | ...::panic_explicit | test.rs:431:13:431:49 | ...::panic_explicit(...) |  |
+| test.rs:431:13:431:49 | ...::panic_explicit(...) | test.rs:431:13:431:49 | { ... } |  |
+| test.rs:431:13:431:49 | ExprStmt | test.rs:431:13:431:49 | MacroStmts |  |
+| test.rs:431:13:431:49 | ExprStmt | test.rs:431:13:431:49 | panic_cold_explicit |  |
+| test.rs:431:13:431:49 | MacroExpr | test.rs:430:9:432:9 | { ... } |  |
+| test.rs:431:13:431:49 | MacroExpr | test.rs:431:13:431:49 | { ... } |  |
+| test.rs:431:13:431:49 | MacroStmts | test.rs:431:13:431:49 | fn panic_cold_explicit |  |
+| test.rs:431:13:431:49 | enter fn panic_cold_explicit | test.rs:431:13:431:49 | ...::panic_explicit |  |
+| test.rs:431:13:431:49 | exit fn panic_cold_explicit (normal) | test.rs:431:13:431:49 | exit fn panic_cold_explicit |  |
+| test.rs:431:13:431:49 | fn panic_cold_explicit | test.rs:431:13:431:49 | ExprStmt |  |
+| test.rs:431:13:431:49 | panic_cold_explicit | test.rs:431:13:431:49 | panic_cold_explicit(...) |  |
+| test.rs:431:13:431:49 | panic_cold_explicit(...) | test.rs:431:13:431:49 | { ... } |  |
+| test.rs:431:13:431:49 | { ... } | test.rs:431:13:431:49 | MacroExpr |  |
+| test.rs:431:13:431:49 | { ... } | test.rs:431:13:431:49 | exit fn panic_cold_explicit (normal) |  |
+| test.rs:431:13:431:49 | { ... } | test.rs:431:21:431:48 | if ... {...} |  |
+| test.rs:431:13:431:50 | ExprStmt | test.rs:431:21:431:48 | MacroStmts |  |
+| test.rs:431:21:431:42 | ...::size_of::<...> | test.rs:431:21:431:44 | ...::size_of::<...>(...) |  |
+| test.rs:431:21:431:44 | ...::size_of::<...>(...) | test.rs:431:48:431:48 | 0 |  |
+| test.rs:431:21:431:48 | ... > ... | test.rs:431:21:431:48 | [boolean(false)] ! ... | true |
+| test.rs:431:21:431:48 | ... > ... | test.rs:431:21:431:48 | [boolean(true)] ! ... | false |
+| test.rs:431:21:431:48 | MacroStmts | test.rs:431:21:431:42 | ...::size_of::<...> |  |
+| test.rs:431:21:431:48 | [boolean(false)] ! ... | test.rs:431:21:431:48 | if ... {...} | false |
+| test.rs:431:21:431:48 | [boolean(true)] ! ... | test.rs:431:13:431:49 | ExprStmt | true |
+| test.rs:431:21:431:48 | if ... {...} | test.rs:431:21:431:48 | { ... } |  |
+| test.rs:431:21:431:48 | { ... } | test.rs:431:13:431:49 | MacroExpr |  |
+| test.rs:431:48:431:48 | 0 | test.rs:431:21:431:48 | ... > ... |  |
+| test.rs:434:9:434:10 | 42 | test.rs:427:41:435:5 | { ... } |  |
+| test.rs:437:5:446:5 | enter fn const_block_panic | test.rs:438:9:438:30 | Const |  |
+| test.rs:437:5:446:5 | exit fn const_block_panic (normal) | test.rs:437:5:446:5 | exit fn const_block_panic |  |
+| test.rs:437:35:446:5 | { ... } | test.rs:437:5:446:5 | exit fn const_block_panic (normal) |  |
+| test.rs:438:9:438:30 | Const | test.rs:439:9:444:9 | ExprStmt |  |
+| test.rs:439:9:444:9 | ExprStmt | test.rs:439:12:439:16 | false |  |
+| test.rs:439:9:444:9 | if false {...} | test.rs:445:9:445:9 | N |  |
+| test.rs:439:12:439:16 | false | test.rs:439:9:444:9 | if false {...} | false |
+| test.rs:442:17:442:24 | ...::panic_explicit | test.rs:442:17:442:24 | ...::panic_explicit(...) |  |
+| test.rs:442:17:442:24 | ...::panic_explicit(...) | test.rs:442:17:442:24 | { ... } |  |
+| test.rs:442:17:442:24 | enter fn panic_cold_explicit | test.rs:442:17:442:24 | ...::panic_explicit |  |
+| test.rs:442:17:442:24 | exit fn panic_cold_explicit (normal) | test.rs:442:17:442:24 | exit fn panic_cold_explicit |  |
+| test.rs:442:17:442:24 | { ... } | test.rs:442:17:442:24 | exit fn panic_cold_explicit (normal) |  |
+| test.rs:445:9:445:9 | N | test.rs:437:35:446:5 | { ... } |  |
+| test.rs:449:1:454:1 | enter fn dead_code | test.rs:450:5:452:5 | ExprStmt |  |
+| test.rs:449:1:454:1 | exit fn dead_code (normal) | test.rs:449:1:454:1 | exit fn dead_code |  |
+| test.rs:450:5:452:5 | ExprStmt | test.rs:450:9:450:12 | true |  |
+| test.rs:450:9:450:12 | true | test.rs:451:9:451:17 | ExprStmt | true |
+| test.rs:451:9:451:16 | return 0 | test.rs:449:1:454:1 | exit fn dead_code (normal) | return |
+| test.rs:451:9:451:17 | ExprStmt | test.rs:451:16:451:16 | 0 |  |
+| test.rs:451:16:451:16 | 0 | test.rs:451:9:451:16 | return 0 |  |
+| test.rs:456:1:456:16 | enter fn do_thing | test.rs:456:15:456:16 | { ... } |  |
+| test.rs:456:1:456:16 | exit fn do_thing (normal) | test.rs:456:1:456:16 | exit fn do_thing |  |
+| test.rs:456:15:456:16 | { ... } | test.rs:456:1:456:16 | exit fn do_thing (normal) |  |
+| test.rs:458:1:460:1 | enter fn condition_not_met | test.rs:459:5:459:9 | false |  |
+| test.rs:458:1:460:1 | exit fn condition_not_met (normal) | test.rs:458:1:460:1 | exit fn condition_not_met |  |
+| test.rs:458:32:460:1 | { ... } | test.rs:458:1:460:1 | exit fn condition_not_met (normal) |  |
+| test.rs:459:5:459:9 | false | test.rs:458:32:460:1 | { ... } |  |
+| test.rs:462:1:462:21 | enter fn do_next_thing | test.rs:462:20:462:21 | { ... } |  |
+| test.rs:462:1:462:21 | exit fn do_next_thing (normal) | test.rs:462:1:462:21 | exit fn do_next_thing |  |
+| test.rs:462:20:462:21 | { ... } | test.rs:462:1:462:21 | exit fn do_next_thing (normal) |  |
+| test.rs:464:1:464:21 | enter fn do_last_thing | test.rs:464:20:464:21 | { ... } |  |
+| test.rs:464:1:464:21 | exit fn do_last_thing (normal) | test.rs:464:1:464:21 | exit fn do_last_thing |  |
+| test.rs:464:20:464:21 | { ... } | test.rs:464:1:464:21 | exit fn do_last_thing (normal) |  |
+| test.rs:466:1:480:1 | enter fn labelled_block1 | test.rs:467:5:478:6 | let ... = ... |  |
+| test.rs:466:1:480:1 | exit fn labelled_block1 (normal) | test.rs:466:1:480:1 | exit fn labelled_block1 |  |
+| test.rs:466:29:480:1 | { ... } | test.rs:466:1:480:1 | exit fn labelled_block1 (normal) |  |
+| test.rs:467:5:478:6 | let ... = ... | test.rs:468:9:468:19 | ExprStmt |  |
+| test.rs:467:9:467:14 | result | test.rs:479:5:479:10 | result | match |
+| test.rs:467:18:478:5 | 'block: { ... } | test.rs:467:9:467:14 | result |  |
+| test.rs:468:9:468:16 | do_thing | test.rs:468:9:468:18 | do_thing(...) |  |
+| test.rs:468:9:468:18 | do_thing(...) | test.rs:469:9:471:9 | ExprStmt |  |
+| test.rs:468:9:468:19 | ExprStmt | test.rs:468:9:468:16 | do_thing |  |
+| test.rs:469:9:471:9 | ExprStmt | test.rs:469:12:469:28 | condition_not_met |  |
+| test.rs:469:9:471:9 | if ... {...} | test.rs:472:9:472:24 | ExprStmt |  |
+| test.rs:469:12:469:28 | condition_not_met | test.rs:469:12:469:30 | condition_not_met(...) |  |
+| test.rs:469:12:469:30 | condition_not_met(...) | test.rs:469:9:471:9 | if ... {...} | false |
+| test.rs:469:12:469:30 | condition_not_met(...) | test.rs:470:13:470:27 | ExprStmt | true |
+| test.rs:470:13:470:26 | break ''block 1 | test.rs:467:18:478:5 | 'block: { ... } | break |
+| test.rs:470:13:470:27 | ExprStmt | test.rs:470:26:470:26 | 1 |  |
+| test.rs:470:26:470:26 | 1 | test.rs:470:13:470:26 | break ''block 1 |  |
+| test.rs:472:9:472:21 | do_next_thing | test.rs:472:9:472:23 | do_next_thing(...) |  |
+| test.rs:472:9:472:23 | do_next_thing(...) | test.rs:473:9:475:9 | ExprStmt |  |
+| test.rs:472:9:472:24 | ExprStmt | test.rs:472:9:472:21 | do_next_thing |  |
+| test.rs:473:9:475:9 | ExprStmt | test.rs:473:12:473:28 | condition_not_met |  |
+| test.rs:473:9:475:9 | if ... {...} | test.rs:476:9:476:24 | ExprStmt |  |
+| test.rs:473:12:473:28 | condition_not_met | test.rs:473:12:473:30 | condition_not_met(...) |  |
+| test.rs:473:12:473:30 | condition_not_met(...) | test.rs:473:9:475:9 | if ... {...} | false |
+| test.rs:473:12:473:30 | condition_not_met(...) | test.rs:474:13:474:27 | ExprStmt | true |
+| test.rs:474:13:474:26 | break ''block 2 | test.rs:467:18:478:5 | 'block: { ... } | break |
+| test.rs:474:13:474:27 | ExprStmt | test.rs:474:26:474:26 | 2 |  |
+| test.rs:474:26:474:26 | 2 | test.rs:474:13:474:26 | break ''block 2 |  |
+| test.rs:476:9:476:21 | do_last_thing | test.rs:476:9:476:23 | do_last_thing(...) |  |
+| test.rs:476:9:476:23 | do_last_thing(...) | test.rs:477:9:477:9 | 3 |  |
+| test.rs:476:9:476:24 | ExprStmt | test.rs:476:9:476:21 | do_last_thing |  |
+| test.rs:477:9:477:9 | 3 | test.rs:467:18:478:5 | 'block: { ... } |  |
+| test.rs:479:5:479:10 | result | test.rs:466:29:480:1 | { ... } |  |
+| test.rs:482:1:490:1 | enter fn labelled_block2 | test.rs:483:5:489:6 | let ... = ... |  |
+| test.rs:482:1:490:1 | exit fn labelled_block2 (normal) | test.rs:482:1:490:1 | exit fn labelled_block2 |  |
+| test.rs:482:22:490:1 | { ... } | test.rs:482:1:490:1 | exit fn labelled_block2 (normal) |  |
+| test.rs:483:5:489:6 | let ... = ... | test.rs:484:9:484:34 | let ... = None |  |
+| test.rs:483:9:483:14 | result | test.rs:482:22:490:1 | { ... } | match |
+| test.rs:483:18:489:5 | 'block: { ... } | test.rs:483:9:483:14 | result |  |
+| test.rs:484:9:484:34 | let ... = None | test.rs:484:30:484:33 | None |  |
+| test.rs:484:13:484:13 | x | test.rs:485:9:487:10 | let ... = x else {...} | match |
+| test.rs:484:30:484:33 | None | test.rs:484:13:484:13 | x |  |
+| test.rs:485:9:487:10 | let ... = x else {...} | test.rs:485:23:485:23 | x |  |
+| test.rs:485:13:485:19 | Some(...) | test.rs:485:18:485:18 | y | match |
+| test.rs:485:13:485:19 | Some(...) | test.rs:486:13:486:27 | ExprStmt | no-match |
+| test.rs:485:18:485:18 | y | test.rs:488:9:488:9 | 0 | match |
+| test.rs:485:23:485:23 | x | test.rs:485:13:485:19 | Some(...) |  |
+| test.rs:486:13:486:26 | break ''block 1 | test.rs:483:18:489:5 | 'block: { ... } | break |
+| test.rs:486:13:486:27 | ExprStmt | test.rs:486:26:486:26 | 1 |  |
+| test.rs:486:26:486:26 | 1 | test.rs:486:13:486:26 | break ''block 1 |  |
+| test.rs:488:9:488:9 | 0 | test.rs:483:18:489:5 | 'block: { ... } |  |
+| test.rs:492:1:498:1 | enter fn test_nested_function2 | test.rs:493:5:493:18 | let ... = 0 |  |
+| test.rs:492:1:498:1 | exit fn test_nested_function2 (normal) | test.rs:492:1:498:1 | exit fn test_nested_function2 |  |
+| test.rs:492:28:498:1 | { ... } | test.rs:492:1:498:1 | exit fn test_nested_function2 (normal) |  |
+| test.rs:493:5:493:18 | let ... = 0 | test.rs:493:17:493:17 | 0 |  |
+| test.rs:493:9:493:13 | x | test.rs:494:5:496:5 | fn nested | match |
+| test.rs:493:17:493:17 | 0 | test.rs:493:9:493:13 | x |  |
+| test.rs:494:5:496:5 | enter fn nested | test.rs:494:15:494:15 | x |  |
+| test.rs:494:5:496:5 | exit fn nested (normal) | test.rs:494:5:496:5 | exit fn nested |  |
+| test.rs:494:5:496:5 | fn nested | test.rs:497:5:497:19 | ExprStmt |  |
+| test.rs:494:15:494:15 | x | test.rs:494:15:494:25 | ...: ... | match |
+| test.rs:494:15:494:25 | ...: ... | test.rs:495:9:495:16 | ExprStmt |  |
+| test.rs:494:28:496:5 | { ... } | test.rs:494:5:496:5 | exit fn nested (normal) |  |
+| test.rs:495:9:495:10 | * ... | test.rs:495:15:495:15 | 1 |  |
+| test.rs:495:9:495:15 | ... += ... | test.rs:494:28:496:5 | { ... } |  |
+| test.rs:495:9:495:16 | ExprStmt | test.rs:495:10:495:10 | x |  |
+| test.rs:495:10:495:10 | x | test.rs:495:9:495:10 | * ... |  |
+| test.rs:495:15:495:15 | 1 | test.rs:495:9:495:15 | ... += ... |  |
+| test.rs:497:5:497:10 | nested | test.rs:497:17:497:17 | x |  |
+| test.rs:497:5:497:18 | nested(...) | test.rs:492:28:498:1 | { ... } |  |
+| test.rs:497:5:497:19 | ExprStmt | test.rs:497:5:497:10 | nested |  |
+| test.rs:497:12:497:17 | &mut x | test.rs:497:5:497:18 | nested(...) |  |
+| test.rs:497:17:497:17 | x | test.rs:497:12:497:17 | &mut x |  |
+| test.rs:509:5:511:5 | enter fn new | test.rs:509:12:509:12 | a |  |
+| test.rs:509:5:511:5 | exit fn new (normal) | test.rs:509:5:511:5 | exit fn new |  |
+| test.rs:509:12:509:12 | a | test.rs:509:12:509:17 | ...: i64 | match |
+| test.rs:509:12:509:17 | ...: i64 | test.rs:510:23:510:23 | a |  |
+| test.rs:509:28:511:5 | { ... } | test.rs:509:5:511:5 | exit fn new (normal) |  |
+| test.rs:510:9:510:25 | MyNumber {...} | test.rs:509:28:511:5 | { ... } |  |
+| test.rs:510:23:510:23 | a | test.rs:510:9:510:25 | MyNumber {...} |  |
+| test.rs:513:5:515:5 | enter fn negated | test.rs:513:16:513:19 | self |  |
+| test.rs:513:5:515:5 | exit fn negated (normal) | test.rs:513:5:515:5 | exit fn negated |  |
+| test.rs:513:16:513:19 | SelfParam | test.rs:514:23:514:26 | self |  |
+| test.rs:513:16:513:19 | self | test.rs:513:16:513:19 | SelfParam |  |
+| test.rs:513:30:515:5 | { ... } | test.rs:513:5:515:5 | exit fn negated (normal) |  |
+| test.rs:514:9:514:30 | MyNumber {...} | test.rs:513:30:515:5 | { ... } |  |
+| test.rs:514:23:514:26 | self | test.rs:514:23:514:28 | self.n |  |
+| test.rs:514:23:514:28 | self.n | test.rs:514:9:514:30 | MyNumber {...} |  |
+| test.rs:517:5:519:5 | enter fn multifly_add | test.rs:517:26:517:29 | self |  |
+| test.rs:517:5:519:5 | exit fn multifly_add (normal) | test.rs:517:5:519:5 | exit fn multifly_add |  |
+| test.rs:517:21:517:29 | SelfParam | test.rs:517:32:517:32 | a |  |
+| test.rs:517:26:517:29 | self | test.rs:517:21:517:29 | SelfParam |  |
+| test.rs:517:32:517:32 | a | test.rs:517:32:517:37 | ...: i64 | match |
+| test.rs:517:32:517:37 | ...: i64 | test.rs:517:40:517:40 | b |  |
+| test.rs:517:40:517:40 | b | test.rs:517:40:517:45 | ...: i64 | match |
+| test.rs:517:40:517:45 | ...: i64 | test.rs:518:9:518:34 | ExprStmt |  |
+| test.rs:517:48:519:5 | { ... } | test.rs:517:5:519:5 | exit fn multifly_add (normal) |  |
+| test.rs:518:9:518:12 | self | test.rs:518:9:518:14 | self.n |  |
+| test.rs:518:9:518:14 | self.n | test.rs:518:19:518:22 | self |  |
+| test.rs:518:9:518:33 | ... = ... | test.rs:517:48:519:5 | { ... } |  |
+| test.rs:518:9:518:34 | ExprStmt | test.rs:518:9:518:12 | self |  |
+| test.rs:518:18:518:33 | ... + ... | test.rs:518:9:518:33 | ... = ... |  |
+| test.rs:518:19:518:22 | self | test.rs:518:19:518:24 | self.n |  |
+| test.rs:518:19:518:24 | self.n | test.rs:518:28:518:28 | a |  |
+| test.rs:518:19:518:28 | ... * ... | test.rs:518:33:518:33 | b |  |
+| test.rs:518:28:518:28 | a | test.rs:518:19:518:28 | ... * ... |  |
+| test.rs:518:33:518:33 | b | test.rs:518:18:518:33 | ... + ... |  |
 breakTarget
-| test.rs:34:17:34:21 | BreakExpr | test.rs:28:9:40:9 | LoopExpr |
-| test.rs:48:21:48:25 | BreakExpr | test.rs:46:13:53:13 | LoopExpr |
-| test.rs:50:21:50:32 | BreakExpr | test.rs:45:9:54:9 | LoopExpr |
-| test.rs:52:17:52:28 | BreakExpr | test.rs:46:13:53:13 | LoopExpr |
-| test.rs:91:17:91:21 | BreakExpr | test.rs:88:9:94:9 | WhileExpr |
-| test.rs:101:17:101:21 | BreakExpr | test.rs:99:9:103:9 | WhileExpr |
-| test.rs:109:17:109:21 | BreakExpr | test.rs:107:9:112:9 | ForExpr |
-| test.rs:117:13:117:26 | BreakExpr | test.rs:116:9:118:9 | LoopExpr |
-| test.rs:197:17:197:28 | BreakExpr | test.rs:195:13:200:9 | LoopExpr |
-| test.rs:210:17:210:35 | BreakExpr | test.rs:208:13:213:9 | LoopExpr |
-| test.rs:222:13:222:30 | BreakExpr | test.rs:221:13:223:9 | BlockExpr |
-| test.rs:463:13:463:26 | BreakExpr | test.rs:460:18:471:5 | BlockExpr |
-| test.rs:467:13:467:26 | BreakExpr | test.rs:460:18:471:5 | BlockExpr |
-| test.rs:479:13:479:26 | BreakExpr | test.rs:476:18:482:5 | BlockExpr |
+| test.rs:34:17:34:21 | break | test.rs:28:9:40:9 | loop { ... } |
+| test.rs:48:21:48:25 | break | test.rs:46:13:53:13 | 'inner: loop { ... } |
+| test.rs:50:21:50:32 | break ''outer | test.rs:45:9:54:9 | 'outer: loop { ... } |
+| test.rs:52:17:52:28 | break ''inner | test.rs:46:13:53:13 | 'inner: loop { ... } |
+| test.rs:91:17:91:21 | break | test.rs:88:9:94:9 | while b { ... } |
+| test.rs:101:17:101:21 | break | test.rs:99:9:103:9 | while ... { ... } |
+| test.rs:109:17:109:21 | break | test.rs:107:9:112:9 | for ... in ... { ... } |
+| test.rs:117:13:117:26 | break ... | test.rs:116:9:118:9 | loop { ... } |
+| test.rs:197:17:197:28 | break ... | test.rs:195:13:200:9 | loop { ... } |
+| test.rs:210:17:210:35 | break ''label ... | test.rs:208:13:213:9 | 'label: loop { ... } |
+| test.rs:222:13:222:30 | break ''block ... | test.rs:221:13:223:9 | 'block: { ... } |
+| test.rs:470:13:470:26 | break ''block 1 | test.rs:467:18:478:5 | 'block: { ... } |
+| test.rs:474:13:474:26 | break ''block 2 | test.rs:467:18:478:5 | 'block: { ... } |
+| test.rs:486:13:486:26 | break ''block 1 | test.rs:483:18:489:5 | 'block: { ... } |
 continueTarget
-| test.rs:37:17:37:24 | ContinueExpr | test.rs:28:9:40:9 | LoopExpr |
-| test.rs:63:21:63:28 | ContinueExpr | test.rs:61:13:68:13 | LoopExpr |
-| test.rs:65:21:65:35 | ContinueExpr | test.rs:59:9:69:9 | LoopExpr |
-| test.rs:67:17:67:31 | ContinueExpr | test.rs:61:13:68:13 | LoopExpr |
-| test.rs:77:21:77:28 | ContinueExpr | test.rs:75:13:82:13 | LoopExpr |
-| test.rs:79:21:79:35 | ContinueExpr | test.rs:75:13:82:13 | LoopExpr |
-| test.rs:81:17:81:31 | ContinueExpr | test.rs:75:13:82:13 | LoopExpr |
+| test.rs:37:17:37:24 | continue | test.rs:28:9:40:9 | loop { ... } |
+| test.rs:63:21:63:28 | continue | test.rs:61:13:68:13 | 'inner: loop { ... } |
+| test.rs:65:21:65:35 | continue 'outer | test.rs:59:9:69:9 | 'outer: loop { ... } |
+| test.rs:67:17:67:31 | continue 'inner | test.rs:61:13:68:13 | 'inner: loop { ... } |
+| test.rs:77:21:77:28 | continue | test.rs:75:13:82:13 | 'label: loop { ... } |
+| test.rs:79:21:79:35 | continue 'label | test.rs:75:13:82:13 | 'label: loop { ... } |
+| test.rs:81:17:81:31 | continue 'label | test.rs:75:13:82:13 | 'label: loop { ... } |
diff --git a/rust/ql/test/library-tests/controlflow/test.rs b/rust/ql/test/library-tests/controlflow/test.rs
index e1d59618806..42285f42b71 100644
--- a/rust/ql/test/library-tests/controlflow/test.rs
+++ b/rust/ql/test/library-tests/controlflow/test.rs
@@ -277,6 +277,13 @@ mod logical_operators {
     fn test_and_return(a: bool) {
         a && return;
     }
+
+    fn test_and_true(a: bool) -> i64 {
+        if (a && true) {
+            return 1;
+        }
+        0
+    }
 }
 
 mod question_mark_operator {
@@ -493,3 +500,21 @@ fn test_nested_function2() {
 trait MyFrom<T> {
     fn my_from(x: T) -> Self;
 }
+
+struct MyNumber {
+    n: i64,
+}
+
+impl MyNumber {
+    fn new(a: i64) -> Self {
+        MyNumber { n: a }
+    }
+
+    fn negated(self) -> Self {
+        MyNumber { n: self.n }
+    }
+
+    fn multifly_add(&mut self, a: i64, b: i64) {
+        self.n = (self.n * a) + b;
+    }
+}
diff --git a/rust/ql/test/library-tests/dataflow/barrier/inline-flow.expected b/rust/ql/test/library-tests/dataflow/barrier/inline-flow.expected
index a54c75d0c17..7df553b65a0 100644
--- a/rust/ql/test/library-tests/dataflow/barrier/inline-flow.expected
+++ b/rust/ql/test/library-tests/dataflow/barrier/inline-flow.expected
@@ -1,16 +1,29 @@
 models
 edges
-| main.rs:21:13:21:21 | CallExpr : unit | main.rs:22:10:22:10 | s | provenance |  |
-| main.rs:32:13:32:21 | CallExpr : unit | main.rs:33:10:33:10 | s | provenance |  |
+| main.rs:9:13:9:19 | ...: ... | main.rs:9:30:14:1 | { ... } | provenance |  |
+| main.rs:21:13:21:21 | source(...) | main.rs:22:10:22:10 | s | provenance |  |
+| main.rs:26:13:26:21 | source(...) | main.rs:27:22:27:22 | s | provenance |  |
+| main.rs:27:13:27:23 | sanitize(...) | main.rs:28:10:28:10 | s | provenance |  |
+| main.rs:27:22:27:22 | s | main.rs:9:13:9:19 | ...: ... | provenance |  |
+| main.rs:27:22:27:22 | s | main.rs:27:13:27:23 | sanitize(...) | provenance |  |
+| main.rs:32:13:32:21 | source(...) | main.rs:33:10:33:10 | s | provenance |  |
 nodes
-| main.rs:17:10:17:18 | CallExpr | semmle.label | CallExpr |
-| main.rs:21:13:21:21 | CallExpr : unit | semmle.label | CallExpr : unit |
+| main.rs:9:13:9:19 | ...: ... | semmle.label | ...: ... |
+| main.rs:9:30:14:1 | { ... } | semmle.label | { ... } |
+| main.rs:17:10:17:18 | source(...) | semmle.label | source(...) |
+| main.rs:21:13:21:21 | source(...) | semmle.label | source(...) |
 | main.rs:22:10:22:10 | s | semmle.label | s |
-| main.rs:32:13:32:21 | CallExpr : unit | semmle.label | CallExpr : unit |
+| main.rs:26:13:26:21 | source(...) | semmle.label | source(...) |
+| main.rs:27:13:27:23 | sanitize(...) | semmle.label | sanitize(...) |
+| main.rs:27:22:27:22 | s | semmle.label | s |
+| main.rs:28:10:28:10 | s | semmle.label | s |
+| main.rs:32:13:32:21 | source(...) | semmle.label | source(...) |
 | main.rs:33:10:33:10 | s | semmle.label | s |
 subpaths
+| main.rs:27:22:27:22 | s | main.rs:9:13:9:19 | ...: ... | main.rs:9:30:14:1 | { ... } | main.rs:27:13:27:23 | sanitize(...) |
 testFailures
 #select
-| main.rs:17:10:17:18 | CallExpr | main.rs:17:10:17:18 | CallExpr | main.rs:17:10:17:18 | CallExpr | $@ | main.rs:17:10:17:18 | CallExpr | CallExpr |
-| main.rs:22:10:22:10 | s | main.rs:21:13:21:21 | CallExpr : unit | main.rs:22:10:22:10 | s | $@ | main.rs:21:13:21:21 | CallExpr : unit | CallExpr : unit |
-| main.rs:33:10:33:10 | s | main.rs:32:13:32:21 | CallExpr : unit | main.rs:33:10:33:10 | s | $@ | main.rs:32:13:32:21 | CallExpr : unit | CallExpr : unit |
+| main.rs:17:10:17:18 | source(...) | main.rs:17:10:17:18 | source(...) | main.rs:17:10:17:18 | source(...) | $@ | main.rs:17:10:17:18 | source(...) | source(...) |
+| main.rs:22:10:22:10 | s | main.rs:21:13:21:21 | source(...) | main.rs:22:10:22:10 | s | $@ | main.rs:21:13:21:21 | source(...) | source(...) |
+| main.rs:28:10:28:10 | s | main.rs:26:13:26:21 | source(...) | main.rs:28:10:28:10 | s | $@ | main.rs:26:13:26:21 | source(...) | source(...) |
+| main.rs:33:10:33:10 | s | main.rs:32:13:32:21 | source(...) | main.rs:33:10:33:10 | s | $@ | main.rs:32:13:32:21 | source(...) | source(...) |
diff --git a/rust/ql/test/library-tests/dataflow/barrier/main.rs b/rust/ql/test/library-tests/dataflow/barrier/main.rs
index 8a0a7bc2be6..14935f0f328 100644
--- a/rust/ql/test/library-tests/dataflow/barrier/main.rs
+++ b/rust/ql/test/library-tests/dataflow/barrier/main.rs
@@ -9,7 +9,7 @@ fn sink(s: &str) {
 fn sanitize(s: &str) -> &str {
     match s {
         "dangerous" => "",
-        s => s
+        s => s,
     }
 }
 
@@ -25,7 +25,7 @@ fn through_variable() {
 fn with_barrier() {
     let s = source(1);
     let s = sanitize(s);
-    sink(s);
+    sink(s); // $ SPURIOUS: hasValueFlow=1
 }
 
 fn main() {
diff --git a/rust/ql/test/library-tests/dataflow/global/inline-flow.expected b/rust/ql/test/library-tests/dataflow/global/inline-flow.expected
new file mode 100644
index 00000000000..89fa0442293
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/global/inline-flow.expected
@@ -0,0 +1,74 @@
+models
+edges
+| main.rs:12:28:14:1 | { ... } | main.rs:17:13:17:23 | get_data(...) | provenance |  |
+| main.rs:13:5:13:13 | source(...) | main.rs:12:28:14:1 | { ... } | provenance |  |
+| main.rs:17:13:17:23 | get_data(...) | main.rs:18:10:18:10 | a | provenance |  |
+| main.rs:21:12:21:17 | ...: i64 | main.rs:22:10:22:10 | n | provenance |  |
+| main.rs:26:13:26:21 | source(...) | main.rs:27:13:27:13 | a | provenance |  |
+| main.rs:27:13:27:13 | a | main.rs:21:12:21:17 | ...: i64 | provenance |  |
+| main.rs:30:17:30:22 | ...: i64 | main.rs:30:32:32:1 | { ... } | provenance |  |
+| main.rs:35:13:35:21 | source(...) | main.rs:36:26:36:26 | a | provenance |  |
+| main.rs:36:13:36:27 | pass_through(...) | main.rs:37:10:37:10 | b | provenance |  |
+| main.rs:36:26:36:26 | a | main.rs:30:17:30:22 | ...: i64 | provenance |  |
+| main.rs:36:26:36:26 | a | main.rs:36:13:36:27 | pass_through(...) | provenance |  |
+| main.rs:41:13:44:6 | pass_through(...) | main.rs:45:10:45:10 | a | provenance |  |
+| main.rs:41:26:44:5 | { ... } | main.rs:30:17:30:22 | ...: i64 | provenance |  |
+| main.rs:41:26:44:5 | { ... } | main.rs:41:13:44:6 | pass_through(...) | provenance |  |
+| main.rs:43:9:43:18 | source(...) | main.rs:41:26:44:5 | { ... } | provenance |  |
+| main.rs:56:23:56:28 | ...: i64 | main.rs:57:14:57:14 | n | provenance |  |
+| main.rs:59:31:65:5 | { ... } | main.rs:77:13:77:25 | ... .get_data(...) | provenance |  |
+| main.rs:63:13:63:21 | source(...) | main.rs:59:31:65:5 | { ... } | provenance |  |
+| main.rs:66:28:66:33 | ...: i64 | main.rs:66:43:72:5 | { ... } | provenance |  |
+| main.rs:77:13:77:25 | ... .get_data(...) | main.rs:78:10:78:10 | a | provenance |  |
+| main.rs:83:13:83:21 | source(...) | main.rs:84:16:84:16 | a | provenance |  |
+| main.rs:84:16:84:16 | a | main.rs:56:23:56:28 | ...: i64 | provenance |  |
+| main.rs:89:13:89:21 | source(...) | main.rs:90:29:90:29 | a | provenance |  |
+| main.rs:90:13:90:30 | ... .data_through(...) | main.rs:91:10:91:10 | b | provenance |  |
+| main.rs:90:29:90:29 | a | main.rs:66:28:66:33 | ...: i64 | provenance |  |
+| main.rs:90:29:90:29 | a | main.rs:90:13:90:30 | ... .data_through(...) | provenance |  |
+nodes
+| main.rs:12:28:14:1 | { ... } | semmle.label | { ... } |
+| main.rs:13:5:13:13 | source(...) | semmle.label | source(...) |
+| main.rs:17:13:17:23 | get_data(...) | semmle.label | get_data(...) |
+| main.rs:18:10:18:10 | a | semmle.label | a |
+| main.rs:21:12:21:17 | ...: i64 | semmle.label | ...: i64 |
+| main.rs:22:10:22:10 | n | semmle.label | n |
+| main.rs:26:13:26:21 | source(...) | semmle.label | source(...) |
+| main.rs:27:13:27:13 | a | semmle.label | a |
+| main.rs:30:17:30:22 | ...: i64 | semmle.label | ...: i64 |
+| main.rs:30:32:32:1 | { ... } | semmle.label | { ... } |
+| main.rs:35:13:35:21 | source(...) | semmle.label | source(...) |
+| main.rs:36:13:36:27 | pass_through(...) | semmle.label | pass_through(...) |
+| main.rs:36:26:36:26 | a | semmle.label | a |
+| main.rs:37:10:37:10 | b | semmle.label | b |
+| main.rs:41:13:44:6 | pass_through(...) | semmle.label | pass_through(...) |
+| main.rs:41:26:44:5 | { ... } | semmle.label | { ... } |
+| main.rs:43:9:43:18 | source(...) | semmle.label | source(...) |
+| main.rs:45:10:45:10 | a | semmle.label | a |
+| main.rs:56:23:56:28 | ...: i64 | semmle.label | ...: i64 |
+| main.rs:57:14:57:14 | n | semmle.label | n |
+| main.rs:59:31:65:5 | { ... } | semmle.label | { ... } |
+| main.rs:63:13:63:21 | source(...) | semmle.label | source(...) |
+| main.rs:66:28:66:33 | ...: i64 | semmle.label | ...: i64 |
+| main.rs:66:43:72:5 | { ... } | semmle.label | { ... } |
+| main.rs:77:13:77:25 | ... .get_data(...) | semmle.label | ... .get_data(...) |
+| main.rs:78:10:78:10 | a | semmle.label | a |
+| main.rs:83:13:83:21 | source(...) | semmle.label | source(...) |
+| main.rs:84:16:84:16 | a | semmle.label | a |
+| main.rs:89:13:89:21 | source(...) | semmle.label | source(...) |
+| main.rs:90:13:90:30 | ... .data_through(...) | semmle.label | ... .data_through(...) |
+| main.rs:90:29:90:29 | a | semmle.label | a |
+| main.rs:91:10:91:10 | b | semmle.label | b |
+subpaths
+| main.rs:36:26:36:26 | a | main.rs:30:17:30:22 | ...: i64 | main.rs:30:32:32:1 | { ... } | main.rs:36:13:36:27 | pass_through(...) |
+| main.rs:41:26:44:5 | { ... } | main.rs:30:17:30:22 | ...: i64 | main.rs:30:32:32:1 | { ... } | main.rs:41:13:44:6 | pass_through(...) |
+| main.rs:90:29:90:29 | a | main.rs:66:28:66:33 | ...: i64 | main.rs:66:43:72:5 | { ... } | main.rs:90:13:90:30 | ... .data_through(...) |
+testFailures
+#select
+| main.rs:18:10:18:10 | a | main.rs:13:5:13:13 | source(...) | main.rs:18:10:18:10 | a | $@ | main.rs:13:5:13:13 | source(...) | source(...) |
+| main.rs:22:10:22:10 | n | main.rs:26:13:26:21 | source(...) | main.rs:22:10:22:10 | n | $@ | main.rs:26:13:26:21 | source(...) | source(...) |
+| main.rs:37:10:37:10 | b | main.rs:35:13:35:21 | source(...) | main.rs:37:10:37:10 | b | $@ | main.rs:35:13:35:21 | source(...) | source(...) |
+| main.rs:45:10:45:10 | a | main.rs:43:9:43:18 | source(...) | main.rs:45:10:45:10 | a | $@ | main.rs:43:9:43:18 | source(...) | source(...) |
+| main.rs:57:14:57:14 | n | main.rs:83:13:83:21 | source(...) | main.rs:57:14:57:14 | n | $@ | main.rs:83:13:83:21 | source(...) | source(...) |
+| main.rs:78:10:78:10 | a | main.rs:63:13:63:21 | source(...) | main.rs:78:10:78:10 | a | $@ | main.rs:63:13:63:21 | source(...) | source(...) |
+| main.rs:91:10:91:10 | b | main.rs:89:13:89:21 | source(...) | main.rs:91:10:91:10 | b | $@ | main.rs:89:13:89:21 | source(...) | source(...) |
diff --git a/rust/ql/test/library-tests/dataflow/global/inline-flow.ql b/rust/ql/test/library-tests/dataflow/global/inline-flow.ql
new file mode 100644
index 00000000000..ad553fe548d
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/global/inline-flow.ql
@@ -0,0 +1,12 @@
+/**
+ * @kind path-problem
+ */
+
+import rust
+import utils.InlineFlowTest
+import DefaultFlowTest
+import ValueFlow::PathGraph
+
+from ValueFlow::PathNode source, ValueFlow::PathNode sink
+where ValueFlow::flowPath(source, sink)
+select sink, source, sink, "$@", source, source.toString()
diff --git a/rust/ql/test/library-tests/dataflow/global/main.rs b/rust/ql/test/library-tests/dataflow/global/main.rs
index eb3a5985692..77c37a945b8 100644
--- a/rust/ql/test/library-tests/dataflow/global/main.rs
+++ b/rust/ql/test/library-tests/dataflow/global/main.rs
@@ -19,7 +19,7 @@ fn data_out_of_call() {
 }
 
 fn data_in(n: i64) {
-    sink(n + 7); // $ hasValueFlow
+    sink(n); // $ hasValueFlow=3
 }
 
 fn data_in_to_call() {
@@ -37,6 +37,14 @@ fn data_through_call() {
     sink(b); // $ hasValueFlow=1
 }
 
+fn block_expression_as_argument() {
+    let a = pass_through({
+        println!("Hello");
+        source(14)
+    });
+    sink(a); // $ hasValueFlow=14
+}
+
 // -----------------------------------------------------------------------------
 // Data flow in, out, and through method.
 
@@ -67,7 +75,7 @@ impl MyFlag {
 fn data_out_of_method() {
     let mn = MyFlag { flag: true };
     let a = mn.get_data();
-    sink(a);
+    sink(a); // $ hasValueFlow=2
 }
 
 fn data_in_to_method_call() {
@@ -79,8 +87,8 @@ fn data_in_to_method_call() {
 fn data_through_method() {
     let mn = MyFlag { flag: true };
     let a = source(4);
-    mn.data_through(a);
-    sink(a); // $ hasValueFlow=4
+    let b = mn.data_through(a);
+    sink(b); // $ hasValueFlow=4
 }
 
 fn main() {
diff --git a/rust/ql/test/library-tests/dataflow/global/viableCallable.expected b/rust/ql/test/library-tests/dataflow/global/viableCallable.expected
index 6a15bb25249..eaf4a7b14d9 100644
--- a/rust/ql/test/library-tests/dataflow/global/viableCallable.expected
+++ b/rust/ql/test/library-tests/dataflow/global/viableCallable.expected
@@ -1,24 +1,27 @@
-| main.rs:13:5:13:13 | CallExpr | main.rs:1:1:3:1 | source |
-| main.rs:17:13:17:23 | CallExpr | main.rs:12:1:14:1 | get_data |
-| main.rs:18:5:18:11 | CallExpr | main.rs:5:1:7:1 | sink |
-| main.rs:22:5:22:15 | CallExpr | main.rs:5:1:7:1 | sink |
-| main.rs:26:13:26:21 | CallExpr | main.rs:1:1:3:1 | source |
-| main.rs:27:5:27:14 | CallExpr | main.rs:21:1:23:1 | data_in |
-| main.rs:35:13:35:21 | CallExpr | main.rs:1:1:3:1 | source |
-| main.rs:36:13:36:27 | CallExpr | main.rs:30:1:32:1 | pass_through |
-| main.rs:37:5:37:11 | CallExpr | main.rs:5:1:7:1 | sink |
-| main.rs:49:9:49:15 | CallExpr | main.rs:5:1:7:1 | sink |
-| main.rs:55:13:55:21 | CallExpr | main.rs:1:1:3:1 | source |
-| main.rs:69:13:69:25 | ... .get_data(...) | main.rs:51:5:57:5 | get_data |
-| main.rs:70:5:70:11 | CallExpr | main.rs:5:1:7:1 | sink |
-| main.rs:75:13:75:21 | CallExpr | main.rs:1:1:3:1 | source |
-| main.rs:76:5:76:17 | ... .data_in(...) | main.rs:48:5:50:5 | data_in |
-| main.rs:81:13:81:21 | CallExpr | main.rs:1:1:3:1 | source |
-| main.rs:82:5:82:22 | ... .data_through(...) | main.rs:58:5:64:5 | data_through |
-| main.rs:83:5:83:11 | CallExpr | main.rs:5:1:7:1 | sink |
-| main.rs:87:5:87:22 | CallExpr | main.rs:16:1:19:1 | data_out_of_call |
-| main.rs:88:5:88:21 | CallExpr | main.rs:25:1:28:1 | data_in_to_call |
-| main.rs:89:5:89:23 | CallExpr | main.rs:34:1:38:1 | data_through_call |
-| main.rs:91:5:91:24 | CallExpr | main.rs:67:1:71:1 | data_out_of_method |
-| main.rs:92:5:92:28 | CallExpr | main.rs:73:1:77:1 | data_in_to_method_call |
-| main.rs:93:5:93:25 | CallExpr | main.rs:79:1:84:1 | data_through_method |
+| main.rs:13:5:13:13 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:17:13:17:23 | get_data(...) | main.rs:12:1:14:1 | fn get_data |
+| main.rs:18:5:18:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:22:5:22:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:26:13:26:21 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:27:5:27:14 | data_in(...) | main.rs:21:1:23:1 | fn data_in |
+| main.rs:35:13:35:21 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:36:13:36:27 | pass_through(...) | main.rs:30:1:32:1 | fn pass_through |
+| main.rs:37:5:37:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:41:13:44:6 | pass_through(...) | main.rs:30:1:32:1 | fn pass_through |
+| main.rs:43:9:43:18 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:45:5:45:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:57:9:57:15 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:63:13:63:21 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:77:13:77:25 | ... .get_data(...) | main.rs:59:5:65:5 | fn get_data |
+| main.rs:78:5:78:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:83:13:83:21 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:84:5:84:17 | ... .data_in(...) | main.rs:56:5:58:5 | fn data_in |
+| main.rs:89:13:89:21 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:90:13:90:30 | ... .data_through(...) | main.rs:66:5:72:5 | fn data_through |
+| main.rs:91:5:91:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:95:5:95:22 | data_out_of_call(...) | main.rs:16:1:19:1 | fn data_out_of_call |
+| main.rs:96:5:96:21 | data_in_to_call(...) | main.rs:25:1:28:1 | fn data_in_to_call |
+| main.rs:97:5:97:23 | data_through_call(...) | main.rs:34:1:38:1 | fn data_through_call |
+| main.rs:99:5:99:24 | data_out_of_method(...) | main.rs:75:1:79:1 | fn data_out_of_method |
+| main.rs:100:5:100:28 | data_in_to_method_call(...) | main.rs:81:1:85:1 | fn data_in_to_method_call |
+| main.rs:101:5:101:25 | data_through_method(...) | main.rs:87:1:92:1 | fn data_through_method |
diff --git a/rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected b/rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected
index 8cc12598f62..b85a5ff1504 100644
--- a/rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected
+++ b/rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected
@@ -1,85 +1,526 @@
+localStep
 | main.rs:3:11:3:11 | [SSA] i | main.rs:4:12:4:12 | i |
 | main.rs:3:11:3:11 | i | main.rs:3:11:3:11 | [SSA] i |
-| main.rs:4:5:4:12 | ... + ... | main.rs:3:26:5:1 | BlockExpr |
+| main.rs:3:11:3:16 | ...: i64 | main.rs:3:11:3:11 | i |
+| main.rs:4:5:4:12 | ... + ... | main.rs:3:26:5:1 | { ... } |
 | main.rs:7:9:7:9 | [SSA] s | main.rs:8:20:8:20 | s |
 | main.rs:7:9:7:9 | s | main.rs:7:9:7:9 | [SSA] s |
+| main.rs:7:9:7:14 | ...: i64 | main.rs:7:9:7:9 | s |
 | main.rs:19:9:19:9 | [SSA] s | main.rs:20:10:20:10 | s |
 | main.rs:19:9:19:9 | s | main.rs:19:9:19:9 | [SSA] s |
-| main.rs:19:13:19:21 | CallExpr | main.rs:19:9:19:9 | s |
+| main.rs:19:13:19:21 | source(...) | main.rs:19:9:19:9 | s |
 | main.rs:23:18:23:21 | [SSA] cond | main.rs:26:16:26:19 | cond |
 | main.rs:23:18:23:21 | cond | main.rs:23:18:23:21 | [SSA] cond |
+| main.rs:23:18:23:27 | ...: bool | main.rs:23:18:23:21 | cond |
 | main.rs:24:9:24:9 | [SSA] a | main.rs:26:23:26:23 | a |
 | main.rs:24:9:24:9 | a | main.rs:24:9:24:9 | [SSA] a |
-| main.rs:24:13:24:21 | CallExpr | main.rs:24:9:24:9 | a |
+| main.rs:24:13:24:21 | source(...) | main.rs:24:9:24:9 | a |
 | main.rs:25:9:25:9 | [SSA] b | main.rs:26:34:26:34 | b |
 | main.rs:25:9:25:9 | b | main.rs:25:9:25:9 | [SSA] b |
 | main.rs:25:13:25:13 | 2 | main.rs:25:9:25:9 | b |
 | main.rs:26:9:26:9 | [SSA] c | main.rs:27:10:27:10 | c |
 | main.rs:26:9:26:9 | c | main.rs:26:9:26:9 | [SSA] c |
-| main.rs:26:13:26:36 | IfExpr | main.rs:26:9:26:9 | c |
-| main.rs:26:21:26:25 | BlockExpr | main.rs:26:13:26:36 | IfExpr |
-| main.rs:26:23:26:23 | a | main.rs:26:21:26:25 | BlockExpr |
-| main.rs:26:32:26:36 | BlockExpr | main.rs:26:13:26:36 | IfExpr |
-| main.rs:26:34:26:34 | b | main.rs:26:32:26:36 | BlockExpr |
+| main.rs:26:13:26:36 | if cond {...} else {...} | main.rs:26:9:26:9 | c |
+| main.rs:26:21:26:25 | { ... } | main.rs:26:13:26:36 | if cond {...} else {...} |
+| main.rs:26:23:26:23 | a | main.rs:26:21:26:25 | { ... } |
+| main.rs:26:32:26:36 | { ... } | main.rs:26:13:26:36 | if cond {...} else {...} |
+| main.rs:26:34:26:34 | b | main.rs:26:32:26:36 | { ... } |
 | main.rs:30:21:30:21 | [SSA] m | main.rs:32:19:32:19 | m |
 | main.rs:30:21:30:21 | m | main.rs:30:21:30:21 | [SSA] m |
+| main.rs:30:21:30:34 | ...: Option::<...> | main.rs:30:21:30:21 | m |
 | main.rs:31:9:31:9 | [SSA] a | main.rs:33:20:33:20 | a |
 | main.rs:31:9:31:9 | a | main.rs:31:9:31:9 | [SSA] a |
-| main.rs:31:13:31:21 | CallExpr | main.rs:31:9:31:9 | a |
+| main.rs:31:13:31:21 | source(...) | main.rs:31:9:31:9 | a |
 | main.rs:32:9:32:9 | [SSA] b | main.rs:36:10:36:10 | b |
 | main.rs:32:9:32:9 | b | main.rs:32:9:32:9 | [SSA] b |
-| main.rs:32:13:35:5 | MatchExpr | main.rs:32:9:32:9 | b |
-| main.rs:33:20:33:20 | a | main.rs:32:13:35:5 | MatchExpr |
-| main.rs:34:17:34:17 | 0 | main.rs:32:13:35:5 | MatchExpr |
+| main.rs:32:13:35:5 | match m { ... } | main.rs:32:9:32:9 | b |
+| main.rs:32:19:32:19 | m | main.rs:33:9:33:15 | Some(...) |
+| main.rs:32:19:32:19 | m | main.rs:34:9:34:12 | None |
+| main.rs:33:20:33:20 | a | main.rs:32:13:35:5 | match m { ... } |
+| main.rs:34:17:34:17 | 0 | main.rs:32:13:35:5 | match m { ... } |
 | main.rs:40:9:40:9 | [SSA] a | main.rs:43:10:43:10 | a |
 | main.rs:40:9:40:9 | a | main.rs:40:9:40:9 | [SSA] a |
-| main.rs:40:13:42:5 | LoopExpr | main.rs:40:9:40:9 | a |
-| main.rs:41:9:41:15 | BreakExpr | main.rs:40:13:42:5 | LoopExpr |
-| main.rs:41:15:41:15 | 1 | main.rs:41:9:41:15 | BreakExpr |
+| main.rs:40:13:42:5 | loop { ... } | main.rs:40:9:40:9 | a |
+| main.rs:41:9:41:15 | break 1 | main.rs:40:13:42:5 | loop { ... } |
+| main.rs:41:15:41:15 | 1 | main.rs:41:9:41:15 | break 1 |
 | main.rs:44:9:44:9 | [SSA] b | main.rs:47:10:47:10 | b |
 | main.rs:44:9:44:9 | b | main.rs:44:9:44:9 | [SSA] b |
-| main.rs:44:13:46:5 | LoopExpr | main.rs:44:9:44:9 | b |
-| main.rs:45:9:45:23 | BreakExpr | main.rs:44:13:46:5 | LoopExpr |
-| main.rs:45:15:45:23 | CallExpr | main.rs:45:9:45:23 | BreakExpr |
+| main.rs:44:13:46:5 | loop { ... } | main.rs:44:9:44:9 | b |
+| main.rs:45:9:45:23 | break ... | main.rs:44:13:46:5 | loop { ... } |
+| main.rs:45:15:45:23 | source(...) | main.rs:45:9:45:23 | break ... |
 | main.rs:51:9:51:13 | [SSA] i | main.rs:52:10:52:10 | i |
 | main.rs:51:9:51:13 | i | main.rs:51:9:51:13 | [SSA] i |
 | main.rs:51:17:51:17 | 1 | main.rs:51:9:51:13 | i |
 | main.rs:53:5:53:5 | [SSA] i | main.rs:54:10:54:10 | i |
 | main.rs:53:5:53:5 | i | main.rs:53:5:53:5 | [SSA] i |
-| main.rs:61:9:61:9 | [SSA] i | main.rs:62:11:62:11 | i |
-| main.rs:61:9:61:9 | i | main.rs:61:9:61:9 | [SSA] i |
-| main.rs:61:13:61:31 | CallExpr | main.rs:61:9:61:9 | i |
-| main.rs:66:9:66:9 | [SSA] a | main.rs:67:10:67:10 | a |
-| main.rs:66:9:66:9 | a | main.rs:66:9:66:9 | [SSA] a |
-| main.rs:66:13:66:26 | TupleExpr | main.rs:66:9:66:9 | a |
-| main.rs:67:10:67:10 | a | main.rs:68:10:68:10 | a |
-| main.rs:78:9:78:9 | [SSA] p | main.rs:83:10:83:10 | p |
-| main.rs:78:9:78:9 | p | main.rs:78:9:78:9 | [SSA] p |
-| main.rs:78:13:82:5 | RecordExpr | main.rs:78:9:78:9 | p |
-| main.rs:83:10:83:10 | p | main.rs:84:10:84:10 | p |
-| main.rs:84:10:84:10 | p | main.rs:85:10:85:10 | p |
-| main.rs:92:9:92:9 | [SSA] p | main.rs:97:38:97:38 | p |
-| main.rs:92:9:92:9 | p | main.rs:92:9:92:9 | [SSA] p |
-| main.rs:92:13:96:5 | RecordExpr | main.rs:92:9:92:9 | p |
-| main.rs:97:20:97:20 | [SSA] a | main.rs:98:10:98:10 | a |
-| main.rs:97:20:97:20 | a | main.rs:97:20:97:20 | [SSA] a |
-| main.rs:97:26:97:26 | [SSA] b | main.rs:99:10:99:10 | b |
-| main.rs:97:26:97:26 | b | main.rs:97:26:97:26 | [SSA] b |
-| main.rs:97:32:97:32 | [SSA] c | main.rs:100:10:100:10 | c |
-| main.rs:97:32:97:32 | c | main.rs:97:32:97:32 | [SSA] c |
-| main.rs:97:38:97:38 | p | main.rs:97:9:97:34 | RecordPat |
-| main.rs:104:9:104:10 | [SSA] s1 | main.rs:106:11:106:12 | s1 |
-| main.rs:104:9:104:10 | s1 | main.rs:104:9:104:10 | [SSA] s1 |
-| main.rs:104:14:104:28 | CallExpr | main.rs:104:9:104:10 | s1 |
-| main.rs:105:9:105:10 | [SSA] s2 | main.rs:110:11:110:12 | s2 |
-| main.rs:105:9:105:10 | s2 | main.rs:105:9:105:10 | [SSA] s2 |
-| main.rs:105:14:105:20 | CallExpr | main.rs:105:9:105:10 | s2 |
-| main.rs:107:14:107:14 | [SSA] n | main.rs:107:25:107:25 | n |
-| main.rs:107:14:107:14 | n | main.rs:107:14:107:14 | [SSA] n |
-| main.rs:107:20:107:26 | CallExpr | main.rs:106:5:109:5 | MatchExpr |
-| main.rs:108:17:108:23 | CallExpr | main.rs:106:5:109:5 | MatchExpr |
-| main.rs:110:5:113:5 | MatchExpr | main.rs:103:27:114:1 | BlockExpr |
-| main.rs:111:14:111:14 | [SSA] n | main.rs:111:25:111:25 | n |
-| main.rs:111:14:111:14 | n | main.rs:111:14:111:14 | [SSA] n |
-| main.rs:111:20:111:26 | CallExpr | main.rs:110:5:113:5 | MatchExpr |
-| main.rs:112:17:112:23 | CallExpr | main.rs:110:5:113:5 | MatchExpr |
+| main.rs:53:9:53:17 | source(...) | main.rs:53:5:53:5 | i |
+| main.rs:58:9:58:9 | [SSA] a | main.rs:59:5:59:5 | a |
+| main.rs:58:9:58:9 | a | main.rs:58:9:58:9 | [SSA] a |
+| main.rs:58:13:58:17 | { ... } | main.rs:58:9:58:9 | a |
+| main.rs:58:15:58:15 | 0 | main.rs:58:13:58:17 | { ... } |
+| main.rs:59:5:59:5 | a | main.rs:57:31:60:1 | { ... } |
+| main.rs:62:22:62:22 | [SSA] b | main.rs:64:12:64:12 | b |
+| main.rs:62:22:62:22 | b | main.rs:62:22:62:22 | [SSA] b |
+| main.rs:62:22:62:28 | ...: bool | main.rs:62:22:62:22 | b |
+| main.rs:63:9:63:9 | [SSA] a | main.rs:69:5:69:5 | a |
+| main.rs:63:9:63:9 | a | main.rs:63:9:63:9 | [SSA] a |
+| main.rs:63:13:68:5 | 'block: { ... } | main.rs:63:9:63:9 | a |
+| main.rs:65:13:65:26 | break ''block 1 | main.rs:63:13:68:5 | 'block: { ... } |
+| main.rs:65:26:65:26 | 1 | main.rs:65:13:65:26 | break ''block 1 |
+| main.rs:67:9:67:9 | 2 | main.rs:63:13:68:5 | 'block: { ... } |
+| main.rs:69:5:69:5 | a | main.rs:62:38:70:1 | { ... } |
+| main.rs:72:22:72:22 | [SSA] b | main.rs:74:12:74:12 | b |
+| main.rs:72:22:72:22 | b | main.rs:72:22:72:22 | [SSA] b |
+| main.rs:72:22:72:28 | ...: bool | main.rs:72:22:72:22 | b |
+| main.rs:73:9:73:9 | [SSA] a | main.rs:79:5:79:5 | a |
+| main.rs:73:9:73:9 | a | main.rs:73:9:73:9 | [SSA] a |
+| main.rs:73:13:78:5 | 'block: { ... } | main.rs:73:9:73:9 | a |
+| main.rs:75:13:75:26 | break ''block 1 | main.rs:73:13:78:5 | 'block: { ... } |
+| main.rs:75:26:75:26 | 1 | main.rs:75:13:75:26 | break ''block 1 |
+| main.rs:77:9:77:22 | break ''block 2 | main.rs:73:13:78:5 | 'block: { ... } |
+| main.rs:77:22:77:22 | 2 | main.rs:77:9:77:22 | break ''block 2 |
+| main.rs:79:5:79:5 | a | main.rs:72:38:80:1 | { ... } |
+| main.rs:86:9:86:9 | [SSA] i | main.rs:87:11:87:11 | i |
+| main.rs:86:9:86:9 | i | main.rs:86:9:86:9 | [SSA] i |
+| main.rs:86:13:86:31 | ...::new(...) | main.rs:86:9:86:9 | i |
+| main.rs:94:9:94:9 | [SSA] a | main.rs:95:10:95:10 | a |
+| main.rs:94:9:94:9 | a | main.rs:94:9:94:9 | [SSA] a |
+| main.rs:94:13:94:26 | TupleExpr | main.rs:94:9:94:9 | a |
+| main.rs:95:10:95:10 | [post] a | main.rs:96:10:96:10 | a |
+| main.rs:95:10:95:10 | a | main.rs:96:10:96:10 | a |
+| main.rs:100:9:100:9 | [SSA] a | main.rs:101:24:101:24 | a |
+| main.rs:100:9:100:9 | a | main.rs:100:9:100:9 | [SSA] a |
+| main.rs:100:13:100:30 | TupleExpr | main.rs:100:9:100:9 | a |
+| main.rs:101:10:101:11 | [SSA] a0 | main.rs:102:10:102:11 | a0 |
+| main.rs:101:10:101:11 | a0 | main.rs:101:10:101:11 | [SSA] a0 |
+| main.rs:101:14:101:15 | [SSA] a1 | main.rs:103:10:103:11 | a1 |
+| main.rs:101:14:101:15 | a1 | main.rs:101:14:101:15 | [SSA] a1 |
+| main.rs:101:18:101:19 | [SSA] a2 | main.rs:104:10:104:11 | a2 |
+| main.rs:101:18:101:19 | a2 | main.rs:101:18:101:19 | [SSA] a2 |
+| main.rs:101:24:101:24 | a | main.rs:101:9:101:20 | TuplePat |
+| main.rs:108:9:108:13 | [SSA] a | main.rs:109:10:109:10 | a |
+| main.rs:108:9:108:13 | a | main.rs:108:9:108:13 | [SSA] a |
+| main.rs:108:17:108:31 | TupleExpr | main.rs:108:9:108:13 | a |
+| main.rs:109:10:109:10 | [post] a | main.rs:110:10:110:10 | a |
+| main.rs:109:10:109:10 | a | main.rs:110:10:110:10 | a |
+| main.rs:110:10:110:10 | [post] a | main.rs:111:5:111:5 | a |
+| main.rs:110:10:110:10 | a | main.rs:111:5:111:5 | a |
+| main.rs:111:5:111:5 | [post] a | main.rs:112:5:112:5 | a |
+| main.rs:111:5:111:5 | a | main.rs:112:5:112:5 | a |
+| main.rs:111:11:111:20 | source(...) | main.rs:111:5:111:7 | a.0 |
+| main.rs:112:5:112:5 | [post] a | main.rs:113:10:113:10 | a |
+| main.rs:112:5:112:5 | a | main.rs:113:10:113:10 | a |
+| main.rs:112:11:112:11 | 2 | main.rs:112:5:112:7 | a.1 |
+| main.rs:113:10:113:10 | [post] a | main.rs:114:10:114:10 | a |
+| main.rs:113:10:113:10 | a | main.rs:114:10:114:10 | a |
+| main.rs:118:9:118:9 | [SSA] a | main.rs:119:14:119:14 | a |
+| main.rs:118:9:118:9 | a | main.rs:118:9:118:9 | [SSA] a |
+| main.rs:118:13:118:27 | TupleExpr | main.rs:118:9:118:9 | a |
+| main.rs:119:9:119:9 | [SSA] b | main.rs:120:10:120:10 | b |
+| main.rs:119:9:119:9 | b | main.rs:119:9:119:9 | [SSA] b |
+| main.rs:119:13:119:18 | TupleExpr | main.rs:119:9:119:9 | b |
+| main.rs:120:10:120:10 | [post] b | main.rs:121:10:121:10 | b |
+| main.rs:120:10:120:10 | b | main.rs:121:10:121:10 | b |
+| main.rs:121:10:121:10 | [post] b | main.rs:122:10:122:10 | b |
+| main.rs:121:10:121:10 | b | main.rs:122:10:122:10 | b |
+| main.rs:134:9:134:9 | [SSA] p | main.rs:135:10:135:10 | p |
+| main.rs:134:9:134:9 | p | main.rs:134:9:134:9 | [SSA] p |
+| main.rs:134:13:134:40 | Point {...} | main.rs:134:9:134:9 | p |
+| main.rs:135:10:135:10 | [post] p | main.rs:136:10:136:10 | p |
+| main.rs:135:10:135:10 | p | main.rs:136:10:136:10 | p |
+| main.rs:140:9:140:13 | [SSA] p | main.rs:141:10:141:10 | p |
+| main.rs:140:9:140:13 | p | main.rs:140:9:140:13 | [SSA] p |
+| main.rs:140:17:140:44 | Point {...} | main.rs:140:9:140:13 | p |
+| main.rs:141:10:141:10 | [post] p | main.rs:142:5:142:5 | p |
+| main.rs:141:10:141:10 | p | main.rs:142:5:142:5 | p |
+| main.rs:142:5:142:5 | [post] p | main.rs:143:10:143:10 | p |
+| main.rs:142:5:142:5 | p | main.rs:143:10:143:10 | p |
+| main.rs:142:11:142:20 | source(...) | main.rs:142:5:142:7 | p.y |
+| main.rs:147:9:147:9 | [SSA] p | main.rs:151:32:151:32 | p |
+| main.rs:147:9:147:9 | p | main.rs:147:9:147:9 | [SSA] p |
+| main.rs:147:13:150:5 | Point {...} | main.rs:147:9:147:9 | p |
+| main.rs:151:20:151:20 | [SSA] a | main.rs:152:10:152:10 | a |
+| main.rs:151:20:151:20 | a | main.rs:151:20:151:20 | [SSA] a |
+| main.rs:151:26:151:26 | [SSA] b | main.rs:153:10:153:10 | b |
+| main.rs:151:26:151:26 | b | main.rs:151:26:151:26 | [SSA] b |
+| main.rs:151:32:151:32 | p | main.rs:151:9:151:28 | Point {...} |
+| main.rs:162:9:162:9 | [SSA] p | main.rs:169:10:169:10 | p |
+| main.rs:162:9:162:9 | p | main.rs:162:9:162:9 | [SSA] p |
+| main.rs:162:13:168:5 | Point3D {...} | main.rs:162:9:162:9 | p |
+| main.rs:169:10:169:10 | [post] p | main.rs:170:10:170:10 | p |
+| main.rs:169:10:169:10 | p | main.rs:170:10:170:10 | p |
+| main.rs:170:10:170:10 | [post] p | main.rs:171:10:171:10 | p |
+| main.rs:170:10:170:10 | p | main.rs:171:10:171:10 | p |
+| main.rs:175:9:175:9 | [SSA] p | main.rs:182:11:182:11 | p |
+| main.rs:175:9:175:9 | p | main.rs:175:9:175:9 | [SSA] p |
+| main.rs:175:13:181:5 | Point3D {...} | main.rs:175:9:175:9 | p |
+| main.rs:182:5:191:5 | match p { ... } | main.rs:174:26:192:1 | { ... } |
+| main.rs:182:11:182:11 | p | main.rs:183:9:186:9 | Point3D {...} |
+| main.rs:184:28:184:28 | [SSA] x | main.rs:187:18:187:18 | x |
+| main.rs:184:28:184:28 | x | main.rs:184:28:184:28 | [SSA] x |
+| main.rs:184:31:184:31 | [SSA] y | main.rs:188:18:188:18 | y |
+| main.rs:184:31:184:31 | y | main.rs:184:31:184:31 | [SSA] y |
+| main.rs:185:13:185:13 | [SSA] z | main.rs:189:18:189:18 | z |
+| main.rs:185:13:185:13 | z | main.rs:185:13:185:13 | [SSA] z |
+| main.rs:186:14:190:9 | { ... } | main.rs:182:5:191:5 | match p { ... } |
+| main.rs:198:9:198:10 | [SSA] s1 | main.rs:200:11:200:12 | s1 |
+| main.rs:198:9:198:10 | s1 | main.rs:198:9:198:10 | [SSA] s1 |
+| main.rs:198:14:198:37 | ...::Some(...) | main.rs:198:9:198:10 | s1 |
+| main.rs:199:9:199:10 | [SSA] s2 | main.rs:204:11:204:12 | s2 |
+| main.rs:199:9:199:10 | s2 | main.rs:199:9:199:10 | [SSA] s2 |
+| main.rs:199:14:199:28 | ...::Some(...) | main.rs:199:9:199:10 | s2 |
+| main.rs:200:11:200:12 | s1 | main.rs:201:9:201:23 | ...::Some(...) |
+| main.rs:200:11:200:12 | s1 | main.rs:202:9:202:20 | ...::None |
+| main.rs:201:22:201:22 | [SSA] n | main.rs:201:33:201:33 | n |
+| main.rs:201:22:201:22 | n | main.rs:201:22:201:22 | [SSA] n |
+| main.rs:201:28:201:34 | sink(...) | main.rs:200:5:203:5 | match s1 { ... } |
+| main.rs:202:25:202:31 | sink(...) | main.rs:200:5:203:5 | match s1 { ... } |
+| main.rs:204:5:207:5 | match s2 { ... } | main.rs:197:37:208:1 | { ... } |
+| main.rs:204:11:204:12 | s2 | main.rs:205:9:205:23 | ...::Some(...) |
+| main.rs:204:11:204:12 | s2 | main.rs:206:9:206:20 | ...::None |
+| main.rs:205:22:205:22 | [SSA] n | main.rs:205:33:205:33 | n |
+| main.rs:205:22:205:22 | n | main.rs:205:22:205:22 | [SSA] n |
+| main.rs:205:28:205:34 | sink(...) | main.rs:204:5:207:5 | match s2 { ... } |
+| main.rs:206:25:206:31 | sink(...) | main.rs:204:5:207:5 | match s2 { ... } |
+| main.rs:211:9:211:10 | [SSA] s1 | main.rs:213:11:213:12 | s1 |
+| main.rs:211:9:211:10 | s1 | main.rs:211:9:211:10 | [SSA] s1 |
+| main.rs:211:14:211:29 | Some(...) | main.rs:211:9:211:10 | s1 |
+| main.rs:212:9:212:10 | [SSA] s2 | main.rs:217:11:217:12 | s2 |
+| main.rs:212:9:212:10 | s2 | main.rs:212:9:212:10 | [SSA] s2 |
+| main.rs:212:14:212:20 | Some(...) | main.rs:212:9:212:10 | s2 |
+| main.rs:213:11:213:12 | s1 | main.rs:214:9:214:15 | Some(...) |
+| main.rs:213:11:213:12 | s1 | main.rs:215:9:215:12 | None |
+| main.rs:214:14:214:14 | [SSA] n | main.rs:214:25:214:25 | n |
+| main.rs:214:14:214:14 | n | main.rs:214:14:214:14 | [SSA] n |
+| main.rs:214:20:214:26 | sink(...) | main.rs:213:5:216:5 | match s1 { ... } |
+| main.rs:215:17:215:23 | sink(...) | main.rs:213:5:216:5 | match s1 { ... } |
+| main.rs:217:5:220:5 | match s2 { ... } | main.rs:210:39:221:1 | { ... } |
+| main.rs:217:11:217:12 | s2 | main.rs:218:9:218:15 | Some(...) |
+| main.rs:217:11:217:12 | s2 | main.rs:219:9:219:12 | None |
+| main.rs:218:14:218:14 | [SSA] n | main.rs:218:25:218:25 | n |
+| main.rs:218:14:218:14 | n | main.rs:218:14:218:14 | [SSA] n |
+| main.rs:218:20:218:26 | sink(...) | main.rs:217:5:220:5 | match s2 { ... } |
+| main.rs:219:17:219:23 | sink(...) | main.rs:217:5:220:5 | match s2 { ... } |
+| main.rs:224:9:224:10 | [SSA] s1 | main.rs:225:10:225:11 | s1 |
+| main.rs:224:9:224:10 | s1 | main.rs:224:9:224:10 | [SSA] s1 |
+| main.rs:224:14:224:29 | Some(...) | main.rs:224:9:224:10 | s1 |
+| main.rs:229:9:229:10 | [SSA] s1 | main.rs:231:14:231:15 | s1 |
+| main.rs:229:9:229:10 | s1 | main.rs:229:9:229:10 | [SSA] s1 |
+| main.rs:229:14:229:29 | Some(...) | main.rs:229:9:229:10 | s1 |
+| main.rs:230:9:230:10 | [SSA] s2 | main.rs:233:10:233:11 | s2 |
+| main.rs:230:9:230:10 | s2 | main.rs:230:9:230:10 | [SSA] s2 |
+| main.rs:230:14:230:20 | Some(...) | main.rs:230:9:230:10 | s2 |
+| main.rs:231:9:231:10 | [SSA] i1 | main.rs:232:10:232:11 | i1 |
+| main.rs:231:9:231:10 | i1 | main.rs:231:9:231:10 | [SSA] i1 |
+| main.rs:231:14:231:16 | TryExpr | main.rs:231:9:231:10 | i1 |
+| main.rs:234:5:234:11 | Some(...) | main.rs:228:41:235:1 | { ... } |
+| main.rs:238:9:238:10 | [SSA] s1 | main.rs:241:14:241:15 | s1 |
+| main.rs:238:9:238:10 | s1 | main.rs:238:9:238:10 | [SSA] s1 |
+| main.rs:238:32:238:45 | Ok(...) | main.rs:238:9:238:10 | s1 |
+| main.rs:239:9:239:10 | [SSA] s2 | main.rs:242:14:242:15 | s2 |
+| main.rs:239:9:239:10 | s2 | main.rs:239:9:239:10 | [SSA] s2 |
+| main.rs:239:32:239:36 | Ok(...) | main.rs:239:9:239:10 | s2 |
+| main.rs:240:9:240:10 | [SSA] s3 | main.rs:245:14:245:15 | s3 |
+| main.rs:240:9:240:10 | s3 | main.rs:240:9:240:10 | [SSA] s3 |
+| main.rs:240:32:240:46 | Err(...) | main.rs:240:9:240:10 | s3 |
+| main.rs:241:9:241:10 | [SSA] i1 | main.rs:243:10:243:11 | i1 |
+| main.rs:241:9:241:10 | i1 | main.rs:241:9:241:10 | [SSA] i1 |
+| main.rs:241:14:241:16 | TryExpr | main.rs:241:9:241:10 | i1 |
+| main.rs:242:9:242:10 | [SSA] i2 | main.rs:244:10:244:11 | i2 |
+| main.rs:242:9:242:10 | i2 | main.rs:242:9:242:10 | [SSA] i2 |
+| main.rs:242:14:242:16 | TryExpr | main.rs:242:9:242:10 | i2 |
+| main.rs:245:9:245:10 | [SSA] i3 | main.rs:246:10:246:11 | i3 |
+| main.rs:245:9:245:10 | i3 | main.rs:245:9:245:10 | [SSA] i3 |
+| main.rs:245:14:245:16 | TryExpr | main.rs:245:9:245:10 | i3 |
+| main.rs:247:5:247:9 | Ok(...) | main.rs:237:46:248:1 | { ... } |
+| main.rs:256:9:256:10 | [SSA] s1 | main.rs:258:11:258:12 | s1 |
+| main.rs:256:9:256:10 | s1 | main.rs:256:9:256:10 | [SSA] s1 |
+| main.rs:256:14:256:39 | ...::A(...) | main.rs:256:9:256:10 | s1 |
+| main.rs:257:9:257:10 | [SSA] s2 | main.rs:265:11:265:12 | s2 |
+| main.rs:257:9:257:10 | s2 | main.rs:257:9:257:10 | [SSA] s2 |
+| main.rs:257:14:257:30 | ...::B(...) | main.rs:257:9:257:10 | s2 |
+| main.rs:258:11:258:12 | s1 | main.rs:259:9:259:25 | ...::A(...) |
+| main.rs:258:11:258:12 | s1 | main.rs:260:9:260:25 | ...::B(...) |
+| main.rs:258:11:258:12 | s1 | main.rs:262:11:262:12 | s1 |
+| main.rs:259:24:259:24 | [SSA] n | main.rs:259:35:259:35 | n |
+| main.rs:259:24:259:24 | n | main.rs:259:24:259:24 | [SSA] n |
+| main.rs:259:30:259:36 | sink(...) | main.rs:258:5:261:5 | match s1 { ... } |
+| main.rs:260:24:260:24 | [SSA] n | main.rs:260:35:260:35 | n |
+| main.rs:260:24:260:24 | n | main.rs:260:24:260:24 | [SSA] n |
+| main.rs:260:30:260:36 | sink(...) | main.rs:258:5:261:5 | match s1 { ... } |
+| main.rs:262:11:262:12 | s1 | main.rs:263:9:263:45 | ... \| ... |
+| main.rs:263:9:263:45 | ... \| ... | main.rs:263:9:263:25 | ...::A(...) |
+| main.rs:263:9:263:45 | ... \| ... | main.rs:263:29:263:45 | ...::B(...) |
+| main.rs:263:9:263:45 | [SSA] [match(true)] phi | main.rs:263:55:263:55 | n |
+| main.rs:263:24:263:24 | [SSA] [input] [match(true)] phi | main.rs:263:9:263:45 | [SSA] [match(true)] phi |
+| main.rs:263:24:263:24 | [SSA] n | main.rs:263:24:263:24 | [SSA] [input] [match(true)] phi |
+| main.rs:263:24:263:24 | n | main.rs:263:24:263:24 | [SSA] n |
+| main.rs:263:44:263:44 | [SSA] [input] [match(true)] phi | main.rs:263:9:263:45 | [SSA] [match(true)] phi |
+| main.rs:263:44:263:44 | [SSA] n | main.rs:263:44:263:44 | [SSA] [input] [match(true)] phi |
+| main.rs:263:44:263:44 | n | main.rs:263:44:263:44 | [SSA] n |
+| main.rs:263:50:263:56 | sink(...) | main.rs:262:5:264:5 | match s1 { ... } |
+| main.rs:265:5:268:5 | match s2 { ... } | main.rs:255:48:269:1 | { ... } |
+| main.rs:265:11:265:12 | s2 | main.rs:266:9:266:25 | ...::A(...) |
+| main.rs:265:11:265:12 | s2 | main.rs:267:9:267:25 | ...::B(...) |
+| main.rs:266:24:266:24 | [SSA] n | main.rs:266:35:266:35 | n |
+| main.rs:266:24:266:24 | n | main.rs:266:24:266:24 | [SSA] n |
+| main.rs:266:30:266:36 | sink(...) | main.rs:265:5:268:5 | match s2 { ... } |
+| main.rs:267:24:267:24 | [SSA] n | main.rs:267:35:267:35 | n |
+| main.rs:267:24:267:24 | n | main.rs:267:24:267:24 | [SSA] n |
+| main.rs:267:30:267:36 | sink(...) | main.rs:265:5:268:5 | match s2 { ... } |
+| main.rs:274:9:274:10 | [SSA] s1 | main.rs:276:11:276:12 | s1 |
+| main.rs:274:9:274:10 | s1 | main.rs:274:9:274:10 | [SSA] s1 |
+| main.rs:274:14:274:26 | A(...) | main.rs:274:9:274:10 | s1 |
+| main.rs:275:9:275:10 | [SSA] s2 | main.rs:283:11:283:12 | s2 |
+| main.rs:275:9:275:10 | s2 | main.rs:275:9:275:10 | [SSA] s2 |
+| main.rs:275:14:275:17 | B(...) | main.rs:275:9:275:10 | s2 |
+| main.rs:276:11:276:12 | s1 | main.rs:277:9:277:12 | A(...) |
+| main.rs:276:11:276:12 | s1 | main.rs:278:9:278:12 | B(...) |
+| main.rs:276:11:276:12 | s1 | main.rs:280:11:280:12 | s1 |
+| main.rs:277:11:277:11 | [SSA] n | main.rs:277:22:277:22 | n |
+| main.rs:277:11:277:11 | n | main.rs:277:11:277:11 | [SSA] n |
+| main.rs:277:17:277:23 | sink(...) | main.rs:276:5:279:5 | match s1 { ... } |
+| main.rs:278:11:278:11 | [SSA] n | main.rs:278:22:278:22 | n |
+| main.rs:278:11:278:11 | n | main.rs:278:11:278:11 | [SSA] n |
+| main.rs:278:17:278:23 | sink(...) | main.rs:276:5:279:5 | match s1 { ... } |
+| main.rs:280:11:280:12 | s1 | main.rs:281:9:281:19 | ... \| ... |
+| main.rs:281:9:281:19 | ... \| ... | main.rs:281:9:281:12 | A(...) |
+| main.rs:281:9:281:19 | ... \| ... | main.rs:281:16:281:19 | B(...) |
+| main.rs:281:9:281:19 | [SSA] [match(true)] phi | main.rs:281:29:281:29 | n |
+| main.rs:281:11:281:11 | [SSA] [input] [match(true)] phi | main.rs:281:9:281:19 | [SSA] [match(true)] phi |
+| main.rs:281:11:281:11 | [SSA] n | main.rs:281:11:281:11 | [SSA] [input] [match(true)] phi |
+| main.rs:281:11:281:11 | n | main.rs:281:11:281:11 | [SSA] n |
+| main.rs:281:18:281:18 | [SSA] [input] [match(true)] phi | main.rs:281:9:281:19 | [SSA] [match(true)] phi |
+| main.rs:281:18:281:18 | [SSA] n | main.rs:281:18:281:18 | [SSA] [input] [match(true)] phi |
+| main.rs:281:18:281:18 | n | main.rs:281:18:281:18 | [SSA] n |
+| main.rs:281:24:281:30 | sink(...) | main.rs:280:5:282:5 | match s1 { ... } |
+| main.rs:283:5:286:5 | match s2 { ... } | main.rs:273:50:287:1 | { ... } |
+| main.rs:283:11:283:12 | s2 | main.rs:284:9:284:12 | A(...) |
+| main.rs:283:11:283:12 | s2 | main.rs:285:9:285:12 | B(...) |
+| main.rs:284:11:284:11 | [SSA] n | main.rs:284:22:284:22 | n |
+| main.rs:284:11:284:11 | n | main.rs:284:11:284:11 | [SSA] n |
+| main.rs:284:17:284:23 | sink(...) | main.rs:283:5:286:5 | match s2 { ... } |
+| main.rs:285:11:285:11 | [SSA] n | main.rs:285:22:285:22 | n |
+| main.rs:285:11:285:11 | n | main.rs:285:11:285:11 | [SSA] n |
+| main.rs:285:17:285:23 | sink(...) | main.rs:283:5:286:5 | match s2 { ... } |
+| main.rs:295:9:295:10 | [SSA] s1 | main.rs:299:11:299:12 | s1 |
+| main.rs:295:9:295:10 | s1 | main.rs:295:9:295:10 | [SSA] s1 |
+| main.rs:295:14:297:5 | ...::C {...} | main.rs:295:9:295:10 | s1 |
+| main.rs:298:9:298:10 | [SSA] s2 | main.rs:306:11:306:12 | s2 |
+| main.rs:298:9:298:10 | s2 | main.rs:298:9:298:10 | [SSA] s2 |
+| main.rs:298:14:298:43 | ...::D {...} | main.rs:298:9:298:10 | s2 |
+| main.rs:299:11:299:12 | s1 | main.rs:300:9:300:38 | ...::C {...} |
+| main.rs:299:11:299:12 | s1 | main.rs:301:9:301:38 | ...::D {...} |
+| main.rs:299:11:299:12 | s1 | main.rs:303:11:303:12 | s1 |
+| main.rs:300:36:300:36 | [SSA] n | main.rs:300:48:300:48 | n |
+| main.rs:300:36:300:36 | n | main.rs:300:36:300:36 | [SSA] n |
+| main.rs:300:43:300:49 | sink(...) | main.rs:299:5:302:5 | match s1 { ... } |
+| main.rs:301:36:301:36 | [SSA] n | main.rs:301:48:301:48 | n |
+| main.rs:301:36:301:36 | n | main.rs:301:36:301:36 | [SSA] n |
+| main.rs:301:43:301:49 | sink(...) | main.rs:299:5:302:5 | match s1 { ... } |
+| main.rs:303:11:303:12 | s1 | main.rs:304:9:304:71 | ... \| ... |
+| main.rs:304:9:304:71 | ... \| ... | main.rs:304:9:304:38 | ...::C {...} |
+| main.rs:304:9:304:71 | ... \| ... | main.rs:304:42:304:71 | ...::D {...} |
+| main.rs:304:9:304:71 | [SSA] [match(true)] phi | main.rs:304:81:304:81 | n |
+| main.rs:304:36:304:36 | [SSA] [input] [match(true)] phi | main.rs:304:9:304:71 | [SSA] [match(true)] phi |
+| main.rs:304:36:304:36 | [SSA] n | main.rs:304:36:304:36 | [SSA] [input] [match(true)] phi |
+| main.rs:304:36:304:36 | n | main.rs:304:36:304:36 | [SSA] n |
+| main.rs:304:69:304:69 | [SSA] [input] [match(true)] phi | main.rs:304:9:304:71 | [SSA] [match(true)] phi |
+| main.rs:304:69:304:69 | [SSA] n | main.rs:304:69:304:69 | [SSA] [input] [match(true)] phi |
+| main.rs:304:69:304:69 | n | main.rs:304:69:304:69 | [SSA] n |
+| main.rs:304:76:304:82 | sink(...) | main.rs:303:5:305:5 | match s1 { ... } |
+| main.rs:306:5:309:5 | match s2 { ... } | main.rs:294:49:310:1 | { ... } |
+| main.rs:306:11:306:12 | s2 | main.rs:307:9:307:38 | ...::C {...} |
+| main.rs:306:11:306:12 | s2 | main.rs:308:9:308:38 | ...::D {...} |
+| main.rs:307:36:307:36 | [SSA] n | main.rs:307:48:307:48 | n |
+| main.rs:307:36:307:36 | n | main.rs:307:36:307:36 | [SSA] n |
+| main.rs:307:43:307:49 | sink(...) | main.rs:306:5:309:5 | match s2 { ... } |
+| main.rs:308:36:308:36 | [SSA] n | main.rs:308:48:308:48 | n |
+| main.rs:308:36:308:36 | n | main.rs:308:36:308:36 | [SSA] n |
+| main.rs:308:43:308:49 | sink(...) | main.rs:306:5:309:5 | match s2 { ... } |
+| main.rs:315:9:315:10 | [SSA] s1 | main.rs:319:11:319:12 | s1 |
+| main.rs:315:9:315:10 | s1 | main.rs:315:9:315:10 | [SSA] s1 |
+| main.rs:315:14:317:5 | C {...} | main.rs:315:9:315:10 | s1 |
+| main.rs:318:9:318:10 | [SSA] s2 | main.rs:326:11:326:12 | s2 |
+| main.rs:318:9:318:10 | s2 | main.rs:318:9:318:10 | [SSA] s2 |
+| main.rs:318:14:318:29 | D {...} | main.rs:318:9:318:10 | s2 |
+| main.rs:319:11:319:12 | s1 | main.rs:320:9:320:24 | C {...} |
+| main.rs:319:11:319:12 | s1 | main.rs:321:9:321:24 | D {...} |
+| main.rs:319:11:319:12 | s1 | main.rs:323:11:323:12 | s1 |
+| main.rs:320:22:320:22 | [SSA] n | main.rs:320:34:320:34 | n |
+| main.rs:320:22:320:22 | n | main.rs:320:22:320:22 | [SSA] n |
+| main.rs:320:29:320:35 | sink(...) | main.rs:319:5:322:5 | match s1 { ... } |
+| main.rs:321:22:321:22 | [SSA] n | main.rs:321:34:321:34 | n |
+| main.rs:321:22:321:22 | n | main.rs:321:22:321:22 | [SSA] n |
+| main.rs:321:29:321:35 | sink(...) | main.rs:319:5:322:5 | match s1 { ... } |
+| main.rs:323:11:323:12 | s1 | main.rs:324:9:324:43 | ... \| ... |
+| main.rs:324:9:324:43 | ... \| ... | main.rs:324:9:324:24 | C {...} |
+| main.rs:324:9:324:43 | ... \| ... | main.rs:324:28:324:43 | D {...} |
+| main.rs:324:9:324:43 | [SSA] [match(true)] phi | main.rs:324:53:324:53 | n |
+| main.rs:324:22:324:22 | [SSA] [input] [match(true)] phi | main.rs:324:9:324:43 | [SSA] [match(true)] phi |
+| main.rs:324:22:324:22 | [SSA] n | main.rs:324:22:324:22 | [SSA] [input] [match(true)] phi |
+| main.rs:324:22:324:22 | n | main.rs:324:22:324:22 | [SSA] n |
+| main.rs:324:41:324:41 | [SSA] [input] [match(true)] phi | main.rs:324:9:324:43 | [SSA] [match(true)] phi |
+| main.rs:324:41:324:41 | [SSA] n | main.rs:324:41:324:41 | [SSA] [input] [match(true)] phi |
+| main.rs:324:41:324:41 | n | main.rs:324:41:324:41 | [SSA] n |
+| main.rs:324:48:324:54 | sink(...) | main.rs:323:5:325:5 | match s1 { ... } |
+| main.rs:326:5:329:5 | match s2 { ... } | main.rs:314:51:330:1 | { ... } |
+| main.rs:326:11:326:12 | s2 | main.rs:327:9:327:24 | C {...} |
+| main.rs:326:11:326:12 | s2 | main.rs:328:9:328:24 | D {...} |
+| main.rs:327:22:327:22 | [SSA] n | main.rs:327:34:327:34 | n |
+| main.rs:327:22:327:22 | n | main.rs:327:22:327:22 | [SSA] n |
+| main.rs:327:29:327:35 | sink(...) | main.rs:326:5:329:5 | match s2 { ... } |
+| main.rs:328:22:328:22 | [SSA] n | main.rs:328:34:328:34 | n |
+| main.rs:328:22:328:22 | n | main.rs:328:22:328:22 | [SSA] n |
+| main.rs:328:29:328:35 | sink(...) | main.rs:326:5:329:5 | match s2 { ... } |
+| main.rs:336:9:336:9 | [SSA] f | main.rs:337:10:337:10 | f |
+| main.rs:336:9:336:9 | f | main.rs:336:9:336:9 | [SSA] f |
+| main.rs:336:13:336:52 | \|...\| ... | main.rs:336:9:336:9 | f |
+| main.rs:336:14:336:17 | ... | main.rs:336:14:336:17 | cond |
+| main.rs:336:14:336:17 | [SSA] cond | main.rs:336:23:336:26 | cond |
+| main.rs:336:14:336:17 | cond | main.rs:336:14:336:17 | [SSA] cond |
+| main.rs:336:28:336:41 | { ... } | main.rs:336:20:336:52 | if cond {...} else {...} |
+| main.rs:336:30:336:39 | source(...) | main.rs:336:28:336:41 | { ... } |
+| main.rs:336:48:336:52 | { ... } | main.rs:336:20:336:52 | if cond {...} else {...} |
+| main.rs:336:50:336:50 | 0 | main.rs:336:48:336:52 | { ... } |
+| main.rs:341:9:341:9 | [SSA] f | main.rs:348:5:348:5 | f |
+| main.rs:341:9:341:9 | f | main.rs:341:9:341:9 | [SSA] f |
+| main.rs:341:13:346:9 | \|...\| ... | main.rs:341:9:341:9 | f |
+| main.rs:341:14:341:17 | ... | main.rs:341:14:341:17 | cond |
+| main.rs:341:14:341:17 | [SSA] cond | main.rs:342:12:342:15 | cond |
+| main.rs:341:14:341:17 | cond | main.rs:341:14:341:17 | [SSA] cond |
+| main.rs:341:20:341:23 | ... | main.rs:341:20:341:23 | data |
+| main.rs:341:20:341:23 | [SSA] data | main.rs:343:18:343:21 | data |
+| main.rs:341:20:341:23 | data | main.rs:341:20:341:23 | [SSA] data |
+| main.rs:342:17:344:9 | { ... } | main.rs:342:9:346:9 | if cond {...} else {...} |
+| main.rs:344:16:346:9 | { ... } | main.rs:342:9:346:9 | if cond {...} else {...} |
+| main.rs:345:13:345:19 | sink(...) | main.rs:344:16:346:9 | { ... } |
+| main.rs:347:9:347:9 | [SSA] a | main.rs:348:13:348:13 | a |
+| main.rs:347:9:347:9 | a | main.rs:347:9:347:9 | [SSA] a |
+| main.rs:347:13:347:22 | source(...) | main.rs:347:9:347:9 | a |
+| main.rs:352:9:352:9 | [SSA] f | main.rs:359:13:359:13 | f |
+| main.rs:352:9:352:9 | f | main.rs:352:9:352:9 | [SSA] f |
+| main.rs:352:13:357:9 | \|...\| ... | main.rs:352:9:352:9 | f |
+| main.rs:352:14:352:17 | ... | main.rs:352:14:352:17 | cond |
+| main.rs:352:14:352:17 | [SSA] cond | main.rs:353:12:353:15 | cond |
+| main.rs:352:14:352:17 | cond | main.rs:352:14:352:17 | [SSA] cond |
+| main.rs:352:20:352:23 | ... | main.rs:352:20:352:23 | data |
+| main.rs:352:20:352:23 | [SSA] data | main.rs:354:13:354:16 | data |
+| main.rs:352:20:352:23 | data | main.rs:352:20:352:23 | [SSA] data |
+| main.rs:353:17:355:9 | { ... } | main.rs:353:9:357:9 | if cond {...} else {...} |
+| main.rs:354:13:354:16 | data | main.rs:353:17:355:9 | { ... } |
+| main.rs:355:16:357:9 | { ... } | main.rs:353:9:357:9 | if cond {...} else {...} |
+| main.rs:356:13:356:13 | 0 | main.rs:355:16:357:9 | { ... } |
+| main.rs:358:9:358:9 | [SSA] a | main.rs:359:21:359:21 | a |
+| main.rs:358:9:358:9 | a | main.rs:358:9:358:9 | [SSA] a |
+| main.rs:358:13:358:22 | source(...) | main.rs:358:9:358:9 | a |
+| main.rs:359:9:359:9 | [SSA] b | main.rs:360:10:360:10 | b |
+| main.rs:359:9:359:9 | b | main.rs:359:9:359:9 | [SSA] b |
+| main.rs:359:13:359:22 | f(...) | main.rs:359:9:359:9 | b |
+| main.rs:384:13:384:33 | result_questionmark(...) | main.rs:384:9:384:9 | _ |
+storeStep
+| main.rs:94:14:94:22 | source(...) | tuple.0 | main.rs:94:13:94:26 | TupleExpr |
+| main.rs:94:25:94:25 | 2 | tuple.1 | main.rs:94:13:94:26 | TupleExpr |
+| main.rs:100:14:100:14 | 2 | tuple.0 | main.rs:100:13:100:30 | TupleExpr |
+| main.rs:100:17:100:26 | source(...) | tuple.1 | main.rs:100:13:100:30 | TupleExpr |
+| main.rs:100:29:100:29 | 2 | tuple.2 | main.rs:100:13:100:30 | TupleExpr |
+| main.rs:108:18:108:18 | 2 | tuple.0 | main.rs:108:17:108:31 | TupleExpr |
+| main.rs:108:21:108:30 | source(...) | tuple.1 | main.rs:108:17:108:31 | TupleExpr |
+| main.rs:111:11:111:20 | source(...) | tuple.0 | main.rs:111:5:111:5 | [post] a |
+| main.rs:112:11:112:11 | 2 | tuple.1 | main.rs:112:5:112:5 | [post] a |
+| main.rs:118:14:118:14 | 3 | tuple.0 | main.rs:118:13:118:27 | TupleExpr |
+| main.rs:118:17:118:26 | source(...) | tuple.1 | main.rs:118:13:118:27 | TupleExpr |
+| main.rs:119:14:119:14 | a | tuple.0 | main.rs:119:13:119:18 | TupleExpr |
+| main.rs:119:17:119:17 | 3 | tuple.1 | main.rs:119:13:119:18 | TupleExpr |
+| main.rs:134:24:134:32 | source(...) | Point.x | main.rs:134:13:134:40 | Point {...} |
+| main.rs:134:38:134:38 | 2 | Point.y | main.rs:134:13:134:40 | Point {...} |
+| main.rs:140:28:140:36 | source(...) | Point.x | main.rs:140:17:140:44 | Point {...} |
+| main.rs:140:42:140:42 | 2 | Point.y | main.rs:140:17:140:44 | Point {...} |
+| main.rs:148:12:148:21 | source(...) | Point.x | main.rs:147:13:150:5 | Point {...} |
+| main.rs:149:12:149:12 | 2 | Point.y | main.rs:147:13:150:5 | Point {...} |
+| main.rs:163:16:166:9 | Point {...} | Point3D.plane | main.rs:162:13:168:5 | Point3D {...} |
+| main.rs:164:16:164:16 | 2 | Point.x | main.rs:163:16:166:9 | Point {...} |
+| main.rs:165:16:165:25 | source(...) | Point.y | main.rs:163:16:166:9 | Point {...} |
+| main.rs:167:12:167:12 | 4 | Point3D.z | main.rs:162:13:168:5 | Point3D {...} |
+| main.rs:176:16:179:9 | Point {...} | Point3D.plane | main.rs:175:13:181:5 | Point3D {...} |
+| main.rs:177:16:177:16 | 2 | Point.x | main.rs:176:16:179:9 | Point {...} |
+| main.rs:178:16:178:25 | source(...) | Point.y | main.rs:176:16:179:9 | Point {...} |
+| main.rs:180:12:180:12 | 4 | Point3D.z | main.rs:175:13:181:5 | Point3D {...} |
+| main.rs:198:27:198:36 | source(...) | Some | main.rs:198:14:198:37 | ...::Some(...) |
+| main.rs:199:27:199:27 | 2 | Some | main.rs:199:14:199:28 | ...::Some(...) |
+| main.rs:211:19:211:28 | source(...) | Some | main.rs:211:14:211:29 | Some(...) |
+| main.rs:212:19:212:19 | 2 | Some | main.rs:212:14:212:20 | Some(...) |
+| main.rs:224:19:224:28 | source(...) | Some | main.rs:224:14:224:29 | Some(...) |
+| main.rs:229:19:229:28 | source(...) | Some | main.rs:229:14:229:29 | Some(...) |
+| main.rs:230:19:230:19 | 2 | Some | main.rs:230:14:230:20 | Some(...) |
+| main.rs:234:10:234:10 | 0 | Some | main.rs:234:5:234:11 | Some(...) |
+| main.rs:238:35:238:44 | source(...) | Ok | main.rs:238:32:238:45 | Ok(...) |
+| main.rs:239:35:239:35 | 2 | Ok | main.rs:239:32:239:36 | Ok(...) |
+| main.rs:240:36:240:45 | source(...) | Err | main.rs:240:32:240:46 | Err(...) |
+| main.rs:247:8:247:8 | 0 | Ok | main.rs:247:5:247:9 | Ok(...) |
+| main.rs:256:29:256:38 | source(...) | A | main.rs:256:14:256:39 | ...::A(...) |
+| main.rs:257:29:257:29 | 2 | B | main.rs:257:14:257:30 | ...::B(...) |
+| main.rs:274:16:274:25 | source(...) | A | main.rs:274:14:274:26 | A(...) |
+| main.rs:275:16:275:16 | 2 | B | main.rs:275:14:275:17 | B(...) |
+| main.rs:296:18:296:27 | source(...) | C | main.rs:295:14:297:5 | ...::C {...} |
+| main.rs:298:41:298:41 | 2 | D | main.rs:298:14:298:43 | ...::D {...} |
+| main.rs:316:18:316:27 | source(...) | C | main.rs:315:14:317:5 | C {...} |
+| main.rs:318:27:318:27 | 2 | D | main.rs:318:14:318:29 | D {...} |
+| main.rs:367:27:367:27 | 0 | Some | main.rs:367:22:367:28 | Some(...) |
+readStep
+| file://:0:0:0:0 | [summary param] self in lang:core::_::<crate::option::Option>::unwrap | Some | file://:0:0:0:0 | [summary] read: Argument[self].Variant[crate::option::Option::Some(0)] in lang:core::_::<crate::option::Option>::unwrap |
+| main.rs:33:9:33:15 | Some(...) | Some | main.rs:33:14:33:14 | _ |
+| main.rs:95:10:95:10 | a | tuple.0 | main.rs:95:10:95:12 | a.0 |
+| main.rs:96:10:96:10 | a | tuple.1 | main.rs:96:10:96:12 | a.1 |
+| main.rs:109:10:109:10 | a | tuple.0 | main.rs:109:10:109:12 | a.0 |
+| main.rs:110:10:110:10 | a | tuple.1 | main.rs:110:10:110:12 | a.1 |
+| main.rs:111:5:111:5 | a | tuple.0 | main.rs:111:5:111:7 | a.0 |
+| main.rs:112:5:112:5 | a | tuple.1 | main.rs:112:5:112:7 | a.1 |
+| main.rs:113:10:113:10 | a | tuple.0 | main.rs:113:10:113:12 | a.0 |
+| main.rs:114:10:114:10 | a | tuple.1 | main.rs:114:10:114:12 | a.1 |
+| main.rs:120:10:120:10 | b | tuple.0 | main.rs:120:10:120:12 | b.0 |
+| main.rs:120:10:120:12 | b.0 | tuple.0 | main.rs:120:10:120:15 | ... .0 |
+| main.rs:121:10:121:10 | b | tuple.0 | main.rs:121:10:121:12 | b.0 |
+| main.rs:121:10:121:12 | b.0 | tuple.1 | main.rs:121:10:121:15 | ... .1 |
+| main.rs:122:10:122:10 | b | tuple.1 | main.rs:122:10:122:12 | b.1 |
+| main.rs:151:9:151:28 | Point {...} | Point.x | main.rs:151:20:151:20 | a |
+| main.rs:151:9:151:28 | Point {...} | Point.y | main.rs:151:26:151:26 | b |
+| main.rs:183:9:186:9 | Point3D {...} | Point3D.plane | main.rs:184:20:184:33 | Point {...} |
+| main.rs:201:9:201:23 | ...::Some(...) | Some | main.rs:201:22:201:22 | n |
+| main.rs:205:9:205:23 | ...::Some(...) | Some | main.rs:205:22:205:22 | n |
+| main.rs:214:9:214:15 | Some(...) | Some | main.rs:214:14:214:14 | n |
+| main.rs:218:9:218:15 | Some(...) | Some | main.rs:218:14:218:14 | n |
+| main.rs:231:14:231:15 | s1 | Ok | main.rs:231:14:231:16 | TryExpr |
+| main.rs:231:14:231:15 | s1 | Some | main.rs:231:14:231:16 | TryExpr |
+| main.rs:233:10:233:11 | s2 | Ok | main.rs:233:10:233:12 | TryExpr |
+| main.rs:233:10:233:11 | s2 | Some | main.rs:233:10:233:12 | TryExpr |
+| main.rs:241:14:241:15 | s1 | Ok | main.rs:241:14:241:16 | TryExpr |
+| main.rs:241:14:241:15 | s1 | Some | main.rs:241:14:241:16 | TryExpr |
+| main.rs:242:14:242:15 | s2 | Ok | main.rs:242:14:242:16 | TryExpr |
+| main.rs:242:14:242:15 | s2 | Some | main.rs:242:14:242:16 | TryExpr |
+| main.rs:245:14:245:15 | s3 | Ok | main.rs:245:14:245:16 | TryExpr |
+| main.rs:245:14:245:15 | s3 | Some | main.rs:245:14:245:16 | TryExpr |
+| main.rs:259:9:259:25 | ...::A(...) | A | main.rs:259:24:259:24 | n |
+| main.rs:260:9:260:25 | ...::B(...) | B | main.rs:260:24:260:24 | n |
+| main.rs:263:9:263:25 | ...::A(...) | A | main.rs:263:24:263:24 | n |
+| main.rs:263:29:263:45 | ...::B(...) | B | main.rs:263:44:263:44 | n |
+| main.rs:266:9:266:25 | ...::A(...) | A | main.rs:266:24:266:24 | n |
+| main.rs:267:9:267:25 | ...::B(...) | B | main.rs:267:24:267:24 | n |
+| main.rs:277:9:277:12 | A(...) | A | main.rs:277:11:277:11 | n |
+| main.rs:278:9:278:12 | B(...) | B | main.rs:278:11:278:11 | n |
+| main.rs:281:9:281:12 | A(...) | A | main.rs:281:11:281:11 | n |
+| main.rs:281:16:281:19 | B(...) | B | main.rs:281:18:281:18 | n |
+| main.rs:284:9:284:12 | A(...) | A | main.rs:284:11:284:11 | n |
+| main.rs:285:9:285:12 | B(...) | B | main.rs:285:11:285:11 | n |
+| main.rs:300:9:300:38 | ...::C {...} | C | main.rs:300:36:300:36 | n |
+| main.rs:301:9:301:38 | ...::D {...} | D | main.rs:301:36:301:36 | n |
+| main.rs:304:9:304:38 | ...::C {...} | C | main.rs:304:36:304:36 | n |
+| main.rs:304:42:304:71 | ...::D {...} | D | main.rs:304:69:304:69 | n |
+| main.rs:307:9:307:38 | ...::C {...} | C | main.rs:307:36:307:36 | n |
+| main.rs:308:9:308:38 | ...::D {...} | D | main.rs:308:36:308:36 | n |
+| main.rs:320:9:320:24 | C {...} | C | main.rs:320:22:320:22 | n |
+| main.rs:321:9:321:24 | D {...} | D | main.rs:321:22:321:22 | n |
+| main.rs:324:9:324:24 | C {...} | C | main.rs:324:22:324:22 | n |
+| main.rs:324:28:324:43 | D {...} | D | main.rs:324:41:324:41 | n |
+| main.rs:327:9:327:24 | C {...} | C | main.rs:327:22:327:22 | n |
+| main.rs:328:9:328:24 | D {...} | D | main.rs:328:22:328:22 | n |
diff --git a/rust/ql/test/library-tests/dataflow/local/DataFlowStep.ql b/rust/ql/test/library-tests/dataflow/local/DataFlowStep.ql
index 77147a50573..8bbde28564a 100644
--- a/rust/ql/test/library-tests/dataflow/local/DataFlowStep.ql
+++ b/rust/ql/test/library-tests/dataflow/local/DataFlowStep.ql
@@ -1,5 +1,8 @@
 import codeql.rust.dataflow.DataFlow
+import codeql.rust.dataflow.internal.DataFlowImpl
 
-from DataFlow::Node pred, DataFlow::Node succ
-where DataFlow::localFlowStep(pred, succ)
-select pred, succ
+query predicate localStep = DataFlow::localFlowStep/2;
+
+query predicate storeStep = RustDataFlow::storeStep/3;
+
+query predicate readStep = RustDataFlow::readStep/3;
diff --git a/rust/ql/test/library-tests/dataflow/local/inline-flow.expected b/rust/ql/test/library-tests/dataflow/local/inline-flow.expected
index 72273334c6f..8dad98ad317 100644
--- a/rust/ql/test/library-tests/dataflow/local/inline-flow.expected
+++ b/rust/ql/test/library-tests/dataflow/local/inline-flow.expected
@@ -1,24 +1,221 @@
 models
 edges
-| main.rs:19:13:19:21 | CallExpr : unit | main.rs:20:10:20:10 | s | provenance |  |
-| main.rs:24:13:24:21 | CallExpr : unit | main.rs:27:10:27:10 | c | provenance |  |
-| main.rs:31:13:31:21 | CallExpr : unit | main.rs:36:10:36:10 | b | provenance |  |
-| main.rs:45:15:45:23 | CallExpr : unit | main.rs:47:10:47:10 | b | provenance |  |
+| main.rs:19:13:19:21 | source(...) | main.rs:20:10:20:10 | s | provenance |  |
+| main.rs:24:13:24:21 | source(...) | main.rs:27:10:27:10 | c | provenance |  |
+| main.rs:31:13:31:21 | source(...) | main.rs:36:10:36:10 | b | provenance |  |
+| main.rs:45:15:45:23 | source(...) | main.rs:47:10:47:10 | b | provenance |  |
+| main.rs:53:9:53:17 | source(...) | main.rs:54:10:54:10 | i | provenance |  |
+| main.rs:94:13:94:26 | TupleExpr [tuple.0] | main.rs:95:10:95:10 | a [tuple.0] | provenance |  |
+| main.rs:94:14:94:22 | source(...) | main.rs:94:13:94:26 | TupleExpr [tuple.0] | provenance |  |
+| main.rs:95:10:95:10 | a [tuple.0] | main.rs:95:10:95:12 | a.0 | provenance |  |
+| main.rs:108:17:108:31 | TupleExpr [tuple.1] | main.rs:110:10:110:10 | a [tuple.1] | provenance |  |
+| main.rs:108:21:108:30 | source(...) | main.rs:108:17:108:31 | TupleExpr [tuple.1] | provenance |  |
+| main.rs:110:10:110:10 | a [tuple.1] | main.rs:110:10:110:12 | a.1 | provenance |  |
+| main.rs:111:5:111:5 | [post] a [tuple.0] | main.rs:112:5:112:5 | a [tuple.0] | provenance |  |
+| main.rs:111:11:111:20 | source(...) | main.rs:111:5:111:5 | [post] a [tuple.0] | provenance |  |
+| main.rs:112:5:112:5 | a [tuple.0] | main.rs:113:10:113:10 | a [tuple.0] | provenance |  |
+| main.rs:113:10:113:10 | a [tuple.0] | main.rs:113:10:113:12 | a.0 | provenance |  |
+| main.rs:118:13:118:27 | TupleExpr [tuple.1] | main.rs:119:14:119:14 | a [tuple.1] | provenance |  |
+| main.rs:118:17:118:26 | source(...) | main.rs:118:13:118:27 | TupleExpr [tuple.1] | provenance |  |
+| main.rs:119:13:119:18 | TupleExpr [tuple.0, tuple.1] | main.rs:121:10:121:10 | b [tuple.0, tuple.1] | provenance |  |
+| main.rs:119:14:119:14 | a [tuple.1] | main.rs:119:13:119:18 | TupleExpr [tuple.0, tuple.1] | provenance |  |
+| main.rs:121:10:121:10 | b [tuple.0, tuple.1] | main.rs:121:10:121:12 | b.0 [tuple.1] | provenance |  |
+| main.rs:121:10:121:12 | b.0 [tuple.1] | main.rs:121:10:121:15 | ... .1 | provenance |  |
+| main.rs:147:13:150:5 | Point {...} [Point.x] | main.rs:151:9:151:28 | Point {...} [Point.x] | provenance |  |
+| main.rs:148:12:148:21 | source(...) | main.rs:147:13:150:5 | Point {...} [Point.x] | provenance |  |
+| main.rs:151:9:151:28 | Point {...} [Point.x] | main.rs:151:20:151:20 | a | provenance |  |
+| main.rs:151:20:151:20 | a | main.rs:152:10:152:10 | a | provenance |  |
+| main.rs:198:14:198:37 | ...::Some(...) [Some] | main.rs:201:9:201:23 | ...::Some(...) [Some] | provenance |  |
+| main.rs:198:27:198:36 | source(...) | main.rs:198:14:198:37 | ...::Some(...) [Some] | provenance |  |
+| main.rs:201:9:201:23 | ...::Some(...) [Some] | main.rs:201:22:201:22 | n | provenance |  |
+| main.rs:201:22:201:22 | n | main.rs:201:33:201:33 | n | provenance |  |
+| main.rs:211:14:211:29 | Some(...) [Some] | main.rs:214:9:214:15 | Some(...) [Some] | provenance |  |
+| main.rs:211:19:211:28 | source(...) | main.rs:211:14:211:29 | Some(...) [Some] | provenance |  |
+| main.rs:214:9:214:15 | Some(...) [Some] | main.rs:214:14:214:14 | n | provenance |  |
+| main.rs:214:14:214:14 | n | main.rs:214:25:214:25 | n | provenance |  |
+| main.rs:224:14:224:29 | Some(...) [Some] | main.rs:225:10:225:11 | s1 [Some] | provenance |  |
+| main.rs:224:19:224:28 | source(...) | main.rs:224:14:224:29 | Some(...) [Some] | provenance |  |
+| main.rs:225:10:225:11 | s1 [Some] | main.rs:225:10:225:20 | ... .unwrap(...) | provenance |  |
+| main.rs:229:14:229:29 | Some(...) [Some] | main.rs:231:14:231:15 | s1 [Some] | provenance |  |
+| main.rs:229:19:229:28 | source(...) | main.rs:229:14:229:29 | Some(...) [Some] | provenance |  |
+| main.rs:231:14:231:15 | s1 [Some] | main.rs:231:14:231:16 | TryExpr | provenance |  |
+| main.rs:231:14:231:16 | TryExpr | main.rs:232:10:232:11 | i1 | provenance |  |
+| main.rs:238:32:238:45 | Ok(...) [Ok] | main.rs:241:14:241:15 | s1 [Ok] | provenance |  |
+| main.rs:238:35:238:44 | source(...) | main.rs:238:32:238:45 | Ok(...) [Ok] | provenance |  |
+| main.rs:241:14:241:15 | s1 [Ok] | main.rs:241:14:241:16 | TryExpr | provenance |  |
+| main.rs:241:14:241:16 | TryExpr | main.rs:243:10:243:11 | i1 | provenance |  |
+| main.rs:256:14:256:39 | ...::A(...) [A] | main.rs:259:9:259:25 | ...::A(...) [A] | provenance |  |
+| main.rs:256:14:256:39 | ...::A(...) [A] | main.rs:263:9:263:25 | ...::A(...) [A] | provenance |  |
+| main.rs:256:29:256:38 | source(...) | main.rs:256:14:256:39 | ...::A(...) [A] | provenance |  |
+| main.rs:259:9:259:25 | ...::A(...) [A] | main.rs:259:24:259:24 | n | provenance |  |
+| main.rs:259:24:259:24 | n | main.rs:259:35:259:35 | n | provenance |  |
+| main.rs:263:9:263:25 | ...::A(...) [A] | main.rs:263:24:263:24 | n | provenance |  |
+| main.rs:263:24:263:24 | n | main.rs:263:55:263:55 | n | provenance |  |
+| main.rs:274:14:274:26 | A(...) [A] | main.rs:277:9:277:12 | A(...) [A] | provenance |  |
+| main.rs:274:14:274:26 | A(...) [A] | main.rs:281:9:281:12 | A(...) [A] | provenance |  |
+| main.rs:274:16:274:25 | source(...) | main.rs:274:14:274:26 | A(...) [A] | provenance |  |
+| main.rs:277:9:277:12 | A(...) [A] | main.rs:277:11:277:11 | n | provenance |  |
+| main.rs:277:11:277:11 | n | main.rs:277:22:277:22 | n | provenance |  |
+| main.rs:281:9:281:12 | A(...) [A] | main.rs:281:11:281:11 | n | provenance |  |
+| main.rs:281:11:281:11 | n | main.rs:281:29:281:29 | n | provenance |  |
+| main.rs:295:14:297:5 | ...::C {...} [C] | main.rs:300:9:300:38 | ...::C {...} [C] | provenance |  |
+| main.rs:295:14:297:5 | ...::C {...} [C] | main.rs:304:9:304:38 | ...::C {...} [C] | provenance |  |
+| main.rs:296:18:296:27 | source(...) | main.rs:295:14:297:5 | ...::C {...} [C] | provenance |  |
+| main.rs:300:9:300:38 | ...::C {...} [C] | main.rs:300:36:300:36 | n | provenance |  |
+| main.rs:300:36:300:36 | n | main.rs:300:48:300:48 | n | provenance |  |
+| main.rs:304:9:304:38 | ...::C {...} [C] | main.rs:304:36:304:36 | n | provenance |  |
+| main.rs:304:36:304:36 | n | main.rs:304:81:304:81 | n | provenance |  |
+| main.rs:315:14:317:5 | C {...} [C] | main.rs:320:9:320:24 | C {...} [C] | provenance |  |
+| main.rs:315:14:317:5 | C {...} [C] | main.rs:324:9:324:24 | C {...} [C] | provenance |  |
+| main.rs:316:18:316:27 | source(...) | main.rs:315:14:317:5 | C {...} [C] | provenance |  |
+| main.rs:320:9:320:24 | C {...} [C] | main.rs:320:22:320:22 | n | provenance |  |
+| main.rs:320:22:320:22 | n | main.rs:320:34:320:34 | n | provenance |  |
+| main.rs:324:9:324:24 | C {...} [C] | main.rs:324:22:324:22 | n | provenance |  |
+| main.rs:324:22:324:22 | n | main.rs:324:53:324:53 | n | provenance |  |
+| main.rs:336:20:336:52 | if cond {...} else {...} | main.rs:337:10:337:16 | f(...) | provenance |  |
+| main.rs:336:30:336:39 | source(...) | main.rs:336:20:336:52 | if cond {...} else {...} | provenance |  |
+| main.rs:341:20:341:23 | ... | main.rs:343:18:343:21 | data | provenance |  |
+| main.rs:347:13:347:22 | source(...) | main.rs:348:13:348:13 | a | provenance |  |
+| main.rs:348:13:348:13 | a | main.rs:341:20:341:23 | ... | provenance |  |
+| main.rs:352:20:352:23 | ... | main.rs:353:9:357:9 | if cond {...} else {...} | provenance |  |
+| main.rs:358:13:358:22 | source(...) | main.rs:359:21:359:21 | a | provenance |  |
+| main.rs:359:13:359:22 | f(...) | main.rs:360:10:360:10 | b | provenance |  |
+| main.rs:359:21:359:21 | a | main.rs:352:20:352:23 | ... | provenance |  |
+| main.rs:359:21:359:21 | a | main.rs:359:13:359:22 | f(...) | provenance |  |
 nodes
-| main.rs:15:10:15:18 | CallExpr | semmle.label | CallExpr |
-| main.rs:19:13:19:21 | CallExpr : unit | semmle.label | CallExpr : unit |
+| main.rs:15:10:15:18 | source(...) | semmle.label | source(...) |
+| main.rs:19:13:19:21 | source(...) | semmle.label | source(...) |
 | main.rs:20:10:20:10 | s | semmle.label | s |
-| main.rs:24:13:24:21 | CallExpr : unit | semmle.label | CallExpr : unit |
+| main.rs:24:13:24:21 | source(...) | semmle.label | source(...) |
 | main.rs:27:10:27:10 | c | semmle.label | c |
-| main.rs:31:13:31:21 | CallExpr : unit | semmle.label | CallExpr : unit |
+| main.rs:31:13:31:21 | source(...) | semmle.label | source(...) |
 | main.rs:36:10:36:10 | b | semmle.label | b |
-| main.rs:45:15:45:23 | CallExpr : unit | semmle.label | CallExpr : unit |
+| main.rs:45:15:45:23 | source(...) | semmle.label | source(...) |
 | main.rs:47:10:47:10 | b | semmle.label | b |
+| main.rs:53:9:53:17 | source(...) | semmle.label | source(...) |
+| main.rs:54:10:54:10 | i | semmle.label | i |
+| main.rs:94:13:94:26 | TupleExpr [tuple.0] | semmle.label | TupleExpr [tuple.0] |
+| main.rs:94:14:94:22 | source(...) | semmle.label | source(...) |
+| main.rs:95:10:95:10 | a [tuple.0] | semmle.label | a [tuple.0] |
+| main.rs:95:10:95:12 | a.0 | semmle.label | a.0 |
+| main.rs:108:17:108:31 | TupleExpr [tuple.1] | semmle.label | TupleExpr [tuple.1] |
+| main.rs:108:21:108:30 | source(...) | semmle.label | source(...) |
+| main.rs:110:10:110:10 | a [tuple.1] | semmle.label | a [tuple.1] |
+| main.rs:110:10:110:12 | a.1 | semmle.label | a.1 |
+| main.rs:111:5:111:5 | [post] a [tuple.0] | semmle.label | [post] a [tuple.0] |
+| main.rs:111:11:111:20 | source(...) | semmle.label | source(...) |
+| main.rs:112:5:112:5 | a [tuple.0] | semmle.label | a [tuple.0] |
+| main.rs:113:10:113:10 | a [tuple.0] | semmle.label | a [tuple.0] |
+| main.rs:113:10:113:12 | a.0 | semmle.label | a.0 |
+| main.rs:118:13:118:27 | TupleExpr [tuple.1] | semmle.label | TupleExpr [tuple.1] |
+| main.rs:118:17:118:26 | source(...) | semmle.label | source(...) |
+| main.rs:119:13:119:18 | TupleExpr [tuple.0, tuple.1] | semmle.label | TupleExpr [tuple.0, tuple.1] |
+| main.rs:119:14:119:14 | a [tuple.1] | semmle.label | a [tuple.1] |
+| main.rs:121:10:121:10 | b [tuple.0, tuple.1] | semmle.label | b [tuple.0, tuple.1] |
+| main.rs:121:10:121:12 | b.0 [tuple.1] | semmle.label | b.0 [tuple.1] |
+| main.rs:121:10:121:15 | ... .1 | semmle.label | ... .1 |
+| main.rs:147:13:150:5 | Point {...} [Point.x] | semmle.label | Point {...} [Point.x] |
+| main.rs:148:12:148:21 | source(...) | semmle.label | source(...) |
+| main.rs:151:9:151:28 | Point {...} [Point.x] | semmle.label | Point {...} [Point.x] |
+| main.rs:151:20:151:20 | a | semmle.label | a |
+| main.rs:152:10:152:10 | a | semmle.label | a |
+| main.rs:198:14:198:37 | ...::Some(...) [Some] | semmle.label | ...::Some(...) [Some] |
+| main.rs:198:27:198:36 | source(...) | semmle.label | source(...) |
+| main.rs:201:9:201:23 | ...::Some(...) [Some] | semmle.label | ...::Some(...) [Some] |
+| main.rs:201:22:201:22 | n | semmle.label | n |
+| main.rs:201:33:201:33 | n | semmle.label | n |
+| main.rs:211:14:211:29 | Some(...) [Some] | semmle.label | Some(...) [Some] |
+| main.rs:211:19:211:28 | source(...) | semmle.label | source(...) |
+| main.rs:214:9:214:15 | Some(...) [Some] | semmle.label | Some(...) [Some] |
+| main.rs:214:14:214:14 | n | semmle.label | n |
+| main.rs:214:25:214:25 | n | semmle.label | n |
+| main.rs:224:14:224:29 | Some(...) [Some] | semmle.label | Some(...) [Some] |
+| main.rs:224:19:224:28 | source(...) | semmle.label | source(...) |
+| main.rs:225:10:225:11 | s1 [Some] | semmle.label | s1 [Some] |
+| main.rs:225:10:225:20 | ... .unwrap(...) | semmle.label | ... .unwrap(...) |
+| main.rs:229:14:229:29 | Some(...) [Some] | semmle.label | Some(...) [Some] |
+| main.rs:229:19:229:28 | source(...) | semmle.label | source(...) |
+| main.rs:231:14:231:15 | s1 [Some] | semmle.label | s1 [Some] |
+| main.rs:231:14:231:16 | TryExpr | semmle.label | TryExpr |
+| main.rs:232:10:232:11 | i1 | semmle.label | i1 |
+| main.rs:238:32:238:45 | Ok(...) [Ok] | semmle.label | Ok(...) [Ok] |
+| main.rs:238:35:238:44 | source(...) | semmle.label | source(...) |
+| main.rs:241:14:241:15 | s1 [Ok] | semmle.label | s1 [Ok] |
+| main.rs:241:14:241:16 | TryExpr | semmle.label | TryExpr |
+| main.rs:243:10:243:11 | i1 | semmle.label | i1 |
+| main.rs:256:14:256:39 | ...::A(...) [A] | semmle.label | ...::A(...) [A] |
+| main.rs:256:29:256:38 | source(...) | semmle.label | source(...) |
+| main.rs:259:9:259:25 | ...::A(...) [A] | semmle.label | ...::A(...) [A] |
+| main.rs:259:24:259:24 | n | semmle.label | n |
+| main.rs:259:35:259:35 | n | semmle.label | n |
+| main.rs:263:9:263:25 | ...::A(...) [A] | semmle.label | ...::A(...) [A] |
+| main.rs:263:24:263:24 | n | semmle.label | n |
+| main.rs:263:55:263:55 | n | semmle.label | n |
+| main.rs:274:14:274:26 | A(...) [A] | semmle.label | A(...) [A] |
+| main.rs:274:16:274:25 | source(...) | semmle.label | source(...) |
+| main.rs:277:9:277:12 | A(...) [A] | semmle.label | A(...) [A] |
+| main.rs:277:11:277:11 | n | semmle.label | n |
+| main.rs:277:22:277:22 | n | semmle.label | n |
+| main.rs:281:9:281:12 | A(...) [A] | semmle.label | A(...) [A] |
+| main.rs:281:11:281:11 | n | semmle.label | n |
+| main.rs:281:29:281:29 | n | semmle.label | n |
+| main.rs:295:14:297:5 | ...::C {...} [C] | semmle.label | ...::C {...} [C] |
+| main.rs:296:18:296:27 | source(...) | semmle.label | source(...) |
+| main.rs:300:9:300:38 | ...::C {...} [C] | semmle.label | ...::C {...} [C] |
+| main.rs:300:36:300:36 | n | semmle.label | n |
+| main.rs:300:48:300:48 | n | semmle.label | n |
+| main.rs:304:9:304:38 | ...::C {...} [C] | semmle.label | ...::C {...} [C] |
+| main.rs:304:36:304:36 | n | semmle.label | n |
+| main.rs:304:81:304:81 | n | semmle.label | n |
+| main.rs:315:14:317:5 | C {...} [C] | semmle.label | C {...} [C] |
+| main.rs:316:18:316:27 | source(...) | semmle.label | source(...) |
+| main.rs:320:9:320:24 | C {...} [C] | semmle.label | C {...} [C] |
+| main.rs:320:22:320:22 | n | semmle.label | n |
+| main.rs:320:34:320:34 | n | semmle.label | n |
+| main.rs:324:9:324:24 | C {...} [C] | semmle.label | C {...} [C] |
+| main.rs:324:22:324:22 | n | semmle.label | n |
+| main.rs:324:53:324:53 | n | semmle.label | n |
+| main.rs:336:20:336:52 | if cond {...} else {...} | semmle.label | if cond {...} else {...} |
+| main.rs:336:30:336:39 | source(...) | semmle.label | source(...) |
+| main.rs:337:10:337:16 | f(...) | semmle.label | f(...) |
+| main.rs:341:20:341:23 | ... | semmle.label | ... |
+| main.rs:343:18:343:21 | data | semmle.label | data |
+| main.rs:347:13:347:22 | source(...) | semmle.label | source(...) |
+| main.rs:348:13:348:13 | a | semmle.label | a |
+| main.rs:352:20:352:23 | ... | semmle.label | ... |
+| main.rs:353:9:357:9 | if cond {...} else {...} | semmle.label | if cond {...} else {...} |
+| main.rs:358:13:358:22 | source(...) | semmle.label | source(...) |
+| main.rs:359:13:359:22 | f(...) | semmle.label | f(...) |
+| main.rs:359:21:359:21 | a | semmle.label | a |
+| main.rs:360:10:360:10 | b | semmle.label | b |
 subpaths
+| main.rs:359:21:359:21 | a | main.rs:352:20:352:23 | ... | main.rs:353:9:357:9 | if cond {...} else {...} | main.rs:359:13:359:22 | f(...) |
 testFailures
 #select
-| main.rs:15:10:15:18 | CallExpr | main.rs:15:10:15:18 | CallExpr | main.rs:15:10:15:18 | CallExpr | $@ | main.rs:15:10:15:18 | CallExpr | CallExpr |
-| main.rs:20:10:20:10 | s | main.rs:19:13:19:21 | CallExpr : unit | main.rs:20:10:20:10 | s | $@ | main.rs:19:13:19:21 | CallExpr : unit | CallExpr : unit |
-| main.rs:27:10:27:10 | c | main.rs:24:13:24:21 | CallExpr : unit | main.rs:27:10:27:10 | c | $@ | main.rs:24:13:24:21 | CallExpr : unit | CallExpr : unit |
-| main.rs:36:10:36:10 | b | main.rs:31:13:31:21 | CallExpr : unit | main.rs:36:10:36:10 | b | $@ | main.rs:31:13:31:21 | CallExpr : unit | CallExpr : unit |
-| main.rs:47:10:47:10 | b | main.rs:45:15:45:23 | CallExpr : unit | main.rs:47:10:47:10 | b | $@ | main.rs:45:15:45:23 | CallExpr : unit | CallExpr : unit |
+| main.rs:15:10:15:18 | source(...) | main.rs:15:10:15:18 | source(...) | main.rs:15:10:15:18 | source(...) | $@ | main.rs:15:10:15:18 | source(...) | source(...) |
+| main.rs:20:10:20:10 | s | main.rs:19:13:19:21 | source(...) | main.rs:20:10:20:10 | s | $@ | main.rs:19:13:19:21 | source(...) | source(...) |
+| main.rs:27:10:27:10 | c | main.rs:24:13:24:21 | source(...) | main.rs:27:10:27:10 | c | $@ | main.rs:24:13:24:21 | source(...) | source(...) |
+| main.rs:36:10:36:10 | b | main.rs:31:13:31:21 | source(...) | main.rs:36:10:36:10 | b | $@ | main.rs:31:13:31:21 | source(...) | source(...) |
+| main.rs:47:10:47:10 | b | main.rs:45:15:45:23 | source(...) | main.rs:47:10:47:10 | b | $@ | main.rs:45:15:45:23 | source(...) | source(...) |
+| main.rs:54:10:54:10 | i | main.rs:53:9:53:17 | source(...) | main.rs:54:10:54:10 | i | $@ | main.rs:53:9:53:17 | source(...) | source(...) |
+| main.rs:95:10:95:12 | a.0 | main.rs:94:14:94:22 | source(...) | main.rs:95:10:95:12 | a.0 | $@ | main.rs:94:14:94:22 | source(...) | source(...) |
+| main.rs:110:10:110:12 | a.1 | main.rs:108:21:108:30 | source(...) | main.rs:110:10:110:12 | a.1 | $@ | main.rs:108:21:108:30 | source(...) | source(...) |
+| main.rs:113:10:113:12 | a.0 | main.rs:111:11:111:20 | source(...) | main.rs:113:10:113:12 | a.0 | $@ | main.rs:111:11:111:20 | source(...) | source(...) |
+| main.rs:121:10:121:15 | ... .1 | main.rs:118:17:118:26 | source(...) | main.rs:121:10:121:15 | ... .1 | $@ | main.rs:118:17:118:26 | source(...) | source(...) |
+| main.rs:152:10:152:10 | a | main.rs:148:12:148:21 | source(...) | main.rs:152:10:152:10 | a | $@ | main.rs:148:12:148:21 | source(...) | source(...) |
+| main.rs:201:33:201:33 | n | main.rs:198:27:198:36 | source(...) | main.rs:201:33:201:33 | n | $@ | main.rs:198:27:198:36 | source(...) | source(...) |
+| main.rs:214:25:214:25 | n | main.rs:211:19:211:28 | source(...) | main.rs:214:25:214:25 | n | $@ | main.rs:211:19:211:28 | source(...) | source(...) |
+| main.rs:225:10:225:20 | ... .unwrap(...) | main.rs:224:19:224:28 | source(...) | main.rs:225:10:225:20 | ... .unwrap(...) | $@ | main.rs:224:19:224:28 | source(...) | source(...) |
+| main.rs:232:10:232:11 | i1 | main.rs:229:19:229:28 | source(...) | main.rs:232:10:232:11 | i1 | $@ | main.rs:229:19:229:28 | source(...) | source(...) |
+| main.rs:243:10:243:11 | i1 | main.rs:238:35:238:44 | source(...) | main.rs:243:10:243:11 | i1 | $@ | main.rs:238:35:238:44 | source(...) | source(...) |
+| main.rs:259:35:259:35 | n | main.rs:256:29:256:38 | source(...) | main.rs:259:35:259:35 | n | $@ | main.rs:256:29:256:38 | source(...) | source(...) |
+| main.rs:263:55:263:55 | n | main.rs:256:29:256:38 | source(...) | main.rs:263:55:263:55 | n | $@ | main.rs:256:29:256:38 | source(...) | source(...) |
+| main.rs:277:22:277:22 | n | main.rs:274:16:274:25 | source(...) | main.rs:277:22:277:22 | n | $@ | main.rs:274:16:274:25 | source(...) | source(...) |
+| main.rs:281:29:281:29 | n | main.rs:274:16:274:25 | source(...) | main.rs:281:29:281:29 | n | $@ | main.rs:274:16:274:25 | source(...) | source(...) |
+| main.rs:300:48:300:48 | n | main.rs:296:18:296:27 | source(...) | main.rs:300:48:300:48 | n | $@ | main.rs:296:18:296:27 | source(...) | source(...) |
+| main.rs:304:81:304:81 | n | main.rs:296:18:296:27 | source(...) | main.rs:304:81:304:81 | n | $@ | main.rs:296:18:296:27 | source(...) | source(...) |
+| main.rs:320:34:320:34 | n | main.rs:316:18:316:27 | source(...) | main.rs:320:34:320:34 | n | $@ | main.rs:316:18:316:27 | source(...) | source(...) |
+| main.rs:324:53:324:53 | n | main.rs:316:18:316:27 | source(...) | main.rs:324:53:324:53 | n | $@ | main.rs:316:18:316:27 | source(...) | source(...) |
+| main.rs:337:10:337:16 | f(...) | main.rs:336:30:336:39 | source(...) | main.rs:337:10:337:16 | f(...) | $@ | main.rs:336:30:336:39 | source(...) | source(...) |
+| main.rs:343:18:343:21 | data | main.rs:347:13:347:22 | source(...) | main.rs:343:18:343:21 | data | $@ | main.rs:347:13:347:22 | source(...) | source(...) |
+| main.rs:360:10:360:10 | b | main.rs:358:13:358:22 | source(...) | main.rs:360:10:360:10 | b | $@ | main.rs:358:13:358:22 | source(...) | source(...) |
diff --git a/rust/ql/test/library-tests/dataflow/local/main.rs b/rust/ql/test/library-tests/dataflow/local/main.rs
index fb79baa70bd..45553298157 100644
--- a/rust/ql/test/library-tests/dataflow/local/main.rs
+++ b/rust/ql/test/library-tests/dataflow/local/main.rs
@@ -16,24 +16,24 @@ fn direct() {
 }
 
 fn variable_usage() {
-    let s = source(1);
-    sink(s); // $ hasValueFlow=1
+    let s = source(2);
+    sink(s); // $ hasValueFlow=2
 }
 
 fn if_expression(cond: bool) {
-    let a = source(1);
+    let a = source(3);
     let b = 2;
     let c = if cond { a } else { b };
-    sink(c); // $ hasValueFlow=1
+    sink(c); // $ hasValueFlow=3
 }
 
 fn match_expression(m: Option<i64>) {
-    let a = source(1);
+    let a = source(4);
     let b = match m {
         Some(_) => a,
         None => 0,
     };
-    sink(b); // $ hasValueFlow=1
+    sink(b); // $ hasValueFlow=4
 }
 
 fn loop_with_break() {
@@ -42,69 +42,176 @@ fn loop_with_break() {
     };
     sink(a);
     let b = loop {
-        break source(1);
+        break source(5);
     };
-    sink(b); // $ hasValueFlow=1
+    sink(b); // $ hasValueFlow=5
 }
 
 fn assignment() {
     let mut i = 1;
     sink(i);
-    i = source(2);
-    sink(i); // $ MISSING: hasValueFlow=2
+    i = source(6);
+    sink(i); // $ hasValueFlow=6
+}
+
+fn block_expression1() -> i64 {
+    let a = { 0 };
+    a
+}
+
+fn block_expression2(b: bool) -> i64 {
+    let a = 'block: {
+        if b {
+            break 'block 1;
+        };
+        2
+    };
+    a
+}
+
+fn block_expression3(b: bool) -> i64 {
+    let a = 'block: {
+        if b {
+            break 'block 1;
+        }
+        break 'block 2;
+    };
+    a
 }
 
 // -----------------------------------------------------------------------------
-// Data flow through data structures by writing and reading
+// Data flow through `Box`
 
 fn box_deref() {
-    let i = Box::new(source(1));
-    sink(*i); // $ MISSING: hasValueFlow=1
+    let i = Box::new(source(7));
+    sink(*i); // $ MISSING: hasValueFlow=7
 }
 
+// -----------------------------------------------------------------------------
+// Data flow through tuples
+
 fn tuple() {
-    let a = (source(1), 2);
-    sink(a.0); // $ MISSING: hasValueFlow=1
+    let a = (source(8), 2);
+    sink(a.0); // $ hasValueFlow=8
     sink(a.1);
 }
 
+fn tuple_match() {
+    let a = (2, source(38), 2);
+    let (a0, a1, a2) = a;
+    sink(a0);
+    sink(a1); // $ MISSING: hasValueFlow=38
+    sink(a2);
+}
+
+fn tuple_mutation() {
+    let mut a = (2, source(38));
+    sink(a.0);
+    sink(a.1); // $ hasValueFlow=38
+    a.0 = source(70);
+    a.1 = 2;
+    sink(a.0); // $ hasValueFlow=70
+    sink(a.1);
+}
+
+fn tuple_nested() {
+    let a = (3, source(59));
+    let b = (a, 3);
+    sink(b.0 .0);
+    sink(b.0 .1); // $ hasValueFlow=59
+    sink(b.1);
+}
+
+// -----------------------------------------------------------------------------
+// Data flow through structs
+
 struct Point {
     x: i64,
     y: i64,
-    z: i64,
 }
 
 fn struct_field() {
-    let p = Point {
-        x: source(1),
-        y: 2,
-        z: source(3),
-    };
-    sink(p.x); // MISSING: hasValueFlow=1
+    let p = Point { x: source(9), y: 2 };
+    sink(p.x); // $ MISSING: hasValueFlow=9
     sink(p.y);
-    sink(p.z); // MISSING: hasValueFlow=3
 }
 
-// -----------------------------------------------------------------------------
-// Data flow through data structures by pattern matching
+fn struct_mutation() {
+    let mut p = Point { x: source(9), y: 2 };
+    sink(p.y);
+    p.y = source(54);
+    sink(p.y); // $ MISSING: hasValueFlow=54
+}
 
 fn struct_pattern_match() {
     let p = Point {
-        x: source(1),
+        x: source(11),
         y: 2,
-        z: source(3),
     };
-    let Point { x: a, y: b, z: c } = p;
-    sink(a); // MISSING: hasValueFlow=1
+    let Point { x: a, y: b } = p;
+    sink(a); // $ hasValueFlow=11
     sink(b);
-    sink(c); // MISSING: hasValueFlow=3
 }
 
-fn option_pattern_match() {
-    let s1 = Some(source(1));
+struct Point3D {
+    plane: Point,
+    z: i64,
+}
+
+fn struct_nested_field() {
+    let p = Point3D {
+        plane: Point {
+            x: 2,
+            y: source(77),
+        },
+        z: 4,
+    };
+    sink(p.plane.x);
+    sink(p.plane.y); // $ MISSING: hasValueFlow=77
+    sink(p.z);
+}
+
+fn struct_nested_match() {
+    let p = Point3D {
+        plane: Point {
+            x: 2,
+            y: source(93),
+        },
+        z: 4,
+    };
+    match p {
+        Point3D {
+            plane: Point { x, y },
+            z,
+        } => {
+            sink(x);
+            sink(y); // MISSING: hasValueFlow=93
+            sink(z);
+        }
+    }
+}
+
+// -----------------------------------------------------------------------------
+// Data flow through enums
+
+fn option_pattern_match_qualified() {
+    let s1 = Option::Some(source(13));
+    let s2 = Option::Some(2);
+    match s1 {
+        Option::Some(n) => sink(n), // $ hasValueFlow=13
+        Option::None => sink(0),
+    }
+    match s2 {
+        Option::Some(n) => sink(n),
+        Option::None => sink(0),
+    }
+}
+
+fn option_pattern_match_unqualified() {
+    let s1 = Some(source(14));
     let s2 = Some(2);
     match s1 {
-        Some(n) => sink(n), // MISSING: hasValueFlow=3
+        Some(n) => sink(n), // $ hasValueFlow=14
         None => sink(0),
     }
     match s2 {
@@ -113,6 +220,146 @@ fn option_pattern_match() {
     }
 }
 
+fn option_unwrap() {
+    let s1 = Some(source(19));
+    sink(s1.unwrap()); // $ hasValueFlow=19
+}
+
+fn option_questionmark() -> Option<i64> {
+    let s1 = Some(source(20));
+    let s2 = Some(2);
+    let i1 = s1?;
+    sink(i1); // $ hasValueFlow=20
+    sink(s2?);
+    Some(0)
+}
+
+fn result_questionmark() -> Result<i64, i64> {
+    let s1: Result<i64, i64> = Ok(source(20));
+    let s2: Result<i64, i64> = Ok(2);
+    let s3: Result<i64, i64> = Err(source(77));
+    let i1 = s1?;
+    let i2 = s2?;
+    sink(i1); // $ hasValueFlow=20
+    sink(i2);
+    let i3 = s3?;
+    sink(i3); // No flow since value is in `Err`.
+    Ok(0)
+}
+
+enum MyTupleEnum {
+    A(i64),
+    B(i64),
+}
+
+fn custom_tuple_enum_pattern_match_qualified() {
+    let s1 = MyTupleEnum::A(source(15));
+    let s2 = MyTupleEnum::B(2);
+    match s1 {
+        MyTupleEnum::A(n) => sink(n), // $ hasValueFlow=15
+        MyTupleEnum::B(n) => sink(n),
+    }
+    match s1 {
+        MyTupleEnum::A(n) | MyTupleEnum::B(n) => sink(n), // $ hasValueFlow=15
+    }
+    match s2 {
+        MyTupleEnum::A(n) => sink(n),
+        MyTupleEnum::B(n) => sink(n),
+    }
+}
+
+use crate::MyTupleEnum::*;
+
+fn custom_tuple_enum_pattern_match_unqualified() {
+    let s1 = A(source(16));
+    let s2 = B(2);
+    match s1 {
+        A(n) => sink(n), // $ hasValueFlow=16
+        B(n) => sink(n),
+    }
+    match s1 {
+        A(n) | B(n) => sink(n), // $ hasValueFlow=16
+    }
+    match s2 {
+        A(n) => sink(n),
+        B(n) => sink(n),
+    }
+}
+
+enum MyRecordEnum {
+    C { field_c: i64 },
+    D { field_d: i64 },
+}
+
+fn custom_record_enum_pattern_match_qualified() {
+    let s1 = MyRecordEnum::C {
+        field_c: source(17),
+    };
+    let s2 = MyRecordEnum::D { field_d: 2 };
+    match s1 {
+        MyRecordEnum::C { field_c: n } => sink(n), // $ hasValueFlow=17
+        MyRecordEnum::D { field_d: n } => sink(n),
+    }
+    match s1 {
+        MyRecordEnum::C { field_c: n } | MyRecordEnum::D { field_d: n } => sink(n), // $ hasValueFlow=17
+    }
+    match s2 {
+        MyRecordEnum::C { field_c: n } => sink(n),
+        MyRecordEnum::D { field_d: n } => sink(n),
+    }
+}
+
+use crate::MyRecordEnum::*;
+
+fn custom_record_enum_pattern_match_unqualified() {
+    let s1 = C {
+        field_c: source(18),
+    };
+    let s2 = D { field_d: 2 };
+    match s1 {
+        C { field_c: n } => sink(n), // $ hasValueFlow=18
+        D { field_d: n } => sink(n),
+    }
+    match s1 {
+        C { field_c: n } | D { field_d: n } => sink(n), // $ hasValueFlow=18
+    }
+    match s2 {
+        C { field_c: n } => sink(n),
+        D { field_d: n } => sink(n),
+    }
+}
+
+// -----------------------------------------------------------------------------
+// Data flow through closures
+
+fn closure_flow_out() {
+    let f = |cond| if cond { source(92) } else { 0 };
+    sink(f(true)); // $ hasValueFlow=92
+}
+
+fn closure_flow_in() {
+    let f = |cond, data|
+        if cond {
+            sink(data); // $ hasValueFlow=87
+        } else {
+            sink(0)
+        };
+    let a = source(87);
+    f(true, a);
+}
+
+fn closure_flow_through() {
+    let f = |cond, data|
+        if cond {
+            data
+        } else {
+            0
+        };
+    let a = source(43);
+    let b = f(true, a);
+    sink(b); // $ hasValueFlow=43
+}
+
 fn main() {
     direct();
     variable_usage();
@@ -122,7 +369,27 @@ fn main() {
     assignment();
     box_deref();
     tuple();
+    tuple_match();
+    tuple_mutation();
+    tuple_nested();
     struct_field();
+    struct_mutation();
     struct_pattern_match();
-    option_pattern_match();
+    struct_nested_field();
+    struct_nested_match();
+    option_pattern_match_qualified();
+    option_pattern_match_unqualified();
+    option_unwrap();
+    option_questionmark();
+    let _ = result_questionmark();
+    custom_tuple_enum_pattern_match_qualified();
+    custom_tuple_enum_pattern_match_unqualified();
+    custom_record_enum_pattern_match_qualified();
+    custom_record_enum_pattern_match_unqualified();
+    block_expression1();
+    block_expression2(true);
+    block_expression3(true);
+    closure_flow_out();
+    closure_flow_in();
+    closure_flow_through();
 }
diff --git a/rust/ql/test/library-tests/dataflow/models/main.rs b/rust/ql/test/library-tests/dataflow/models/main.rs
new file mode 100644
index 00000000000..21cfc10ad2f
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/models/main.rs
@@ -0,0 +1,90 @@
+fn source(i: i64) -> i64 {
+    1000 + i
+}
+
+fn sink(s: i64) {
+    println!("{}", s);
+}
+
+// has a flow model
+fn identity(i: i64) -> i64 {
+    0
+}
+
+fn test_identify() {
+    let s = source(1);
+    sink(identity(s)); // $ hasValueFlow=1
+}
+
+enum MyPosEnum {
+    A(i64),
+    B(i64),
+}
+
+// has a flow model
+fn get_var_pos(e: MyPosEnum) -> i64 {
+    0
+}
+
+fn test_get_var_pos() {
+    let s = source(2);
+    let e1 = MyPosEnum::A(s);
+    sink(get_var_pos(e1)); // $ hasValueFlow=2
+    let e2 = MyPosEnum::B(s);
+    sink(get_var_pos(e2));
+}
+
+// has a flow model
+fn set_var_pos(i: i64) -> MyPosEnum {
+    MyPosEnum::A(0)
+}
+
+fn test_set_var_pos() {
+    let s = source(3);
+    let e1 = set_var_pos(s);
+    match e1 {
+        MyPosEnum::A(i) => sink(i),
+        MyPosEnum::B(i) => sink(i), // $ hasValueFlow=3
+    }
+}
+
+enum MyFieldEnum {
+    C { field_c: i64 },
+    D { field_d: i64 },
+}
+
+// has a flow model
+fn get_var_field(e: MyFieldEnum) -> i64 {
+    0
+}
+
+fn test_get_var_field() {
+    let s = source(4);
+    let e1 = MyFieldEnum::C { field_c: s };
+    sink(get_var_field(e1)); // $ hasValueFlow=4
+    let e2 = MyFieldEnum::D { field_d: s };
+    sink(get_var_field(e2));
+}
+
+// has a flow model
+fn set_var_field(i: i64) -> MyFieldEnum {
+    MyFieldEnum::C { field_c: 0 }
+}
+
+fn test_set_var_field() {
+    let s = source(5);
+    let e1 = set_var_field(s);
+    match e1 {
+        MyFieldEnum::C { field_c: i } => sink(i),
+        MyFieldEnum::D { field_d: i } => sink(i), // $ hasValueFlow=5
+    }
+}
+
+fn main() {
+    test_identify();
+    test_get_var_pos();
+    test_set_var_pos();
+    test_get_var_field();
+    test_set_var_field();
+    let dummy = Some(0); // ensure that the the `lang:core` crate is extracted
+}
diff --git a/rust/ql/test/library-tests/dataflow/models/models.expected b/rust/ql/test/library-tests/dataflow/models/models.expected
new file mode 100644
index 00000000000..eeb9301b434
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/models/models.expected
@@ -0,0 +1,57 @@
+models
+edges
+| main.rs:15:13:15:21 | source(...) | main.rs:16:19:16:19 | s | provenance |  |
+| main.rs:16:19:16:19 | s | main.rs:16:10:16:20 | identity(...) | provenance |  |
+| main.rs:30:13:30:21 | source(...) | main.rs:31:27:31:27 | s | provenance |  |
+| main.rs:31:14:31:28 | ...::A(...) [A] | main.rs:32:22:32:23 | e1 [A] | provenance |  |
+| main.rs:31:27:31:27 | s | main.rs:31:14:31:28 | ...::A(...) [A] | provenance |  |
+| main.rs:32:22:32:23 | e1 [A] | main.rs:32:10:32:24 | get_var_pos(...) | provenance |  |
+| main.rs:43:13:43:21 | source(...) | main.rs:44:26:44:26 | s | provenance |  |
+| main.rs:44:14:44:27 | set_var_pos(...) [B] | main.rs:47:9:47:23 | ...::B(...) [B] | provenance |  |
+| main.rs:44:26:44:26 | s | main.rs:44:14:44:27 | set_var_pos(...) [B] | provenance |  |
+| main.rs:47:9:47:23 | ...::B(...) [B] | main.rs:47:22:47:22 | i | provenance |  |
+| main.rs:47:22:47:22 | i | main.rs:47:33:47:33 | i | provenance |  |
+| main.rs:62:13:62:21 | source(...) | main.rs:63:40:63:40 | s | provenance |  |
+| main.rs:63:14:63:42 | ...::C {...} [C] | main.rs:64:24:64:25 | e1 [C] | provenance |  |
+| main.rs:63:40:63:40 | s | main.rs:63:14:63:42 | ...::C {...} [C] | provenance |  |
+| main.rs:64:24:64:25 | e1 [C] | main.rs:64:10:64:26 | get_var_field(...) | provenance |  |
+| main.rs:75:13:75:21 | source(...) | main.rs:76:28:76:28 | s | provenance |  |
+| main.rs:76:14:76:29 | set_var_field(...) [D] | main.rs:79:9:79:37 | ...::D {...} [D] | provenance |  |
+| main.rs:76:28:76:28 | s | main.rs:76:14:76:29 | set_var_field(...) [D] | provenance |  |
+| main.rs:79:9:79:37 | ...::D {...} [D] | main.rs:79:35:79:35 | i | provenance |  |
+| main.rs:79:35:79:35 | i | main.rs:79:47:79:47 | i | provenance |  |
+nodes
+| main.rs:15:13:15:21 | source(...) | semmle.label | source(...) |
+| main.rs:16:10:16:20 | identity(...) | semmle.label | identity(...) |
+| main.rs:16:19:16:19 | s | semmle.label | s |
+| main.rs:30:13:30:21 | source(...) | semmle.label | source(...) |
+| main.rs:31:14:31:28 | ...::A(...) [A] | semmle.label | ...::A(...) [A] |
+| main.rs:31:27:31:27 | s | semmle.label | s |
+| main.rs:32:10:32:24 | get_var_pos(...) | semmle.label | get_var_pos(...) |
+| main.rs:32:22:32:23 | e1 [A] | semmle.label | e1 [A] |
+| main.rs:43:13:43:21 | source(...) | semmle.label | source(...) |
+| main.rs:44:14:44:27 | set_var_pos(...) [B] | semmle.label | set_var_pos(...) [B] |
+| main.rs:44:26:44:26 | s | semmle.label | s |
+| main.rs:47:9:47:23 | ...::B(...) [B] | semmle.label | ...::B(...) [B] |
+| main.rs:47:22:47:22 | i | semmle.label | i |
+| main.rs:47:33:47:33 | i | semmle.label | i |
+| main.rs:62:13:62:21 | source(...) | semmle.label | source(...) |
+| main.rs:63:14:63:42 | ...::C {...} [C] | semmle.label | ...::C {...} [C] |
+| main.rs:63:40:63:40 | s | semmle.label | s |
+| main.rs:64:10:64:26 | get_var_field(...) | semmle.label | get_var_field(...) |
+| main.rs:64:24:64:25 | e1 [C] | semmle.label | e1 [C] |
+| main.rs:75:13:75:21 | source(...) | semmle.label | source(...) |
+| main.rs:76:14:76:29 | set_var_field(...) [D] | semmle.label | set_var_field(...) [D] |
+| main.rs:76:28:76:28 | s | semmle.label | s |
+| main.rs:79:9:79:37 | ...::D {...} [D] | semmle.label | ...::D {...} [D] |
+| main.rs:79:35:79:35 | i | semmle.label | i |
+| main.rs:79:47:79:47 | i | semmle.label | i |
+subpaths
+testFailures
+invalidSpecComponent
+#select
+| main.rs:16:10:16:20 | identity(...) | main.rs:15:13:15:21 | source(...) | main.rs:16:10:16:20 | identity(...) | $@ | main.rs:15:13:15:21 | source(...) | source(...) |
+| main.rs:32:10:32:24 | get_var_pos(...) | main.rs:30:13:30:21 | source(...) | main.rs:32:10:32:24 | get_var_pos(...) | $@ | main.rs:30:13:30:21 | source(...) | source(...) |
+| main.rs:47:33:47:33 | i | main.rs:43:13:43:21 | source(...) | main.rs:47:33:47:33 | i | $@ | main.rs:43:13:43:21 | source(...) | source(...) |
+| main.rs:64:10:64:26 | get_var_field(...) | main.rs:62:13:62:21 | source(...) | main.rs:64:10:64:26 | get_var_field(...) | $@ | main.rs:62:13:62:21 | source(...) | source(...) |
+| main.rs:79:47:79:47 | i | main.rs:75:13:75:21 | source(...) | main.rs:79:47:79:47 | i | $@ | main.rs:75:13:75:21 | source(...) | source(...) |
diff --git a/rust/ql/test/library-tests/dataflow/models/models.ql b/rust/ql/test/library-tests/dataflow/models/models.ql
new file mode 100644
index 00000000000..080d6b58f5c
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/models/models.ql
@@ -0,0 +1,78 @@
+/**
+ * @kind path-problem
+ */
+
+import rust
+import utils.InlineFlowTest
+import codeql.rust.dataflow.DataFlow
+import codeql.rust.dataflow.FlowSummary
+import codeql.rust.dataflow.TaintTracking
+import codeql.rust.dataflow.internal.FlowSummaryImpl
+import PathGraph
+
+query predicate invalidSpecComponent(SummarizedCallable sc, string s, string c) {
+  (sc.propagatesFlow(s, _, _) or sc.propagatesFlow(_, s, _)) and
+  Private::External::invalidSpecComponent(s, c)
+}
+
+private class SummarizedCallableIdentity extends SummarizedCallable::Range {
+  SummarizedCallableIdentity() { this = "repo::test::_::crate::identity" }
+
+  override predicate propagatesFlow(string input, string output, boolean preservesValue) {
+    input = "Argument[0]" and
+    output = "ReturnValue" and
+    preservesValue = true
+  }
+}
+
+private class SummarizedCallableGetVarPos extends SummarizedCallable::Range {
+  SummarizedCallableGetVarPos() { this = "repo::test::_::crate::get_var_pos" }
+
+  override predicate propagatesFlow(string input, string output, boolean preservesValue) {
+    input = "Argument[0].Variant[crate::MyPosEnum::A(0)]" and
+    output = "ReturnValue" and
+    preservesValue = true
+  }
+}
+
+private class SummarizedCallableSetVarPos extends SummarizedCallable::Range {
+  SummarizedCallableSetVarPos() { this = "repo::test::_::crate::set_var_pos" }
+
+  override predicate propagatesFlow(string input, string output, boolean preservesValue) {
+    input = "Argument[0]" and
+    output = "ReturnValue.Variant[crate::MyPosEnum::B(0)]" and
+    preservesValue = true
+  }
+}
+
+private class SummarizedCallableGetVarField extends SummarizedCallable::Range {
+  SummarizedCallableGetVarField() { this = "repo::test::_::crate::get_var_field" }
+
+  override predicate propagatesFlow(string input, string output, boolean preservesValue) {
+    input = "Argument[0].Variant[crate::MyFieldEnum::C::field_c]" and
+    output = "ReturnValue" and
+    preservesValue = true
+  }
+}
+
+private class SummarizedCallableSetVarField extends SummarizedCallable::Range {
+  SummarizedCallableSetVarField() { this = "repo::test::_::crate::set_var_field" }
+
+  override predicate propagatesFlow(string input, string output, boolean preservesValue) {
+    input = "Argument[0]" and
+    output = "ReturnValue.Variant[crate::MyFieldEnum::D::field_d]" and
+    preservesValue = true
+  }
+}
+
+module CustomConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { DefaultFlowConfig::isSource(source) }
+
+  predicate isSink(DataFlow::Node sink) { DefaultFlowConfig::isSink(sink) }
+}
+
+import ValueFlowTest<CustomConfig>
+
+from PathNode source, PathNode sink
+where flowPath(source, sink)
+select sink, source, sink, "$@", source, source.toString()
diff --git a/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getTy.expected b/rust/ql/test/library-tests/dataflow/sources/InlineFlow.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/TypeBound/TypeBound_getTy.expected
rename to rust/ql/test/library-tests/dataflow/sources/InlineFlow.expected
diff --git a/rust/ql/test/library-tests/dataflow/sources/InlineFlow.ql b/rust/ql/test/library-tests/dataflow/sources/InlineFlow.ql
new file mode 100644
index 00000000000..2b08aeea63f
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/InlineFlow.ql
@@ -0,0 +1,21 @@
+import rust
+import codeql.rust.dataflow.DataFlow
+import codeql.rust.Concepts
+import utils.InlineFlowTest
+
+/**
+ * Configuration for flow from any threat model source to an argument of the function `sink`.
+ */
+module MyFlowConfig implements DataFlow::ConfigSig {
+  predicate isSource(DataFlow::Node source) { source instanceof ThreatModelSource }
+
+  predicate isSink(DataFlow::Node sink) {
+    any(CallExpr call |
+      call.getFunction().(PathExpr).getPath().getResolvedPath() = "crate::test::sink"
+    ).getArgList().getAnArg() = sink.asExpr().getExpr()
+  }
+}
+
+module MyFlowTest = TaintFlowTest<MyFlowConfig>;
+
+import MyFlowTest
diff --git a/rust/ql/test/library-tests/dataflow/sources/TaintSources.expected b/rust/ql/test/library-tests/dataflow/sources/TaintSources.expected
new file mode 100644
index 00000000000..cebbc00f3a5
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/TaintSources.expected
@@ -0,0 +1,17 @@
+| test.rs:8:10:8:30 | ...::var(...) | Flow source 'EnvironmentSource' of type environment. |
+| test.rs:9:10:9:33 | ...::var_os(...) | Flow source 'EnvironmentSource' of type environment. |
+| test.rs:11:16:11:36 | ...::var(...) | Flow source 'EnvironmentSource' of type environment. |
+| test.rs:12:16:12:39 | ...::var_os(...) | Flow source 'EnvironmentSource' of type environment. |
+| test.rs:17:25:17:40 | ...::vars(...) | Flow source 'EnvironmentSource' of type environment. |
+| test.rs:22:25:22:43 | ...::vars_os(...) | Flow source 'EnvironmentSource' of type environment. |
+| test.rs:29:29:29:44 | ...::args(...) | Flow source 'CommandLineArgs' of type commandargs. |
+| test.rs:32:16:32:31 | ...::args(...) | Flow source 'CommandLineArgs' of type commandargs. |
+| test.rs:33:16:33:34 | ...::args_os(...) | Flow source 'CommandLineArgs' of type commandargs. |
+| test.rs:40:16:40:31 | ...::args(...) | Flow source 'CommandLineArgs' of type commandargs. |
+| test.rs:44:16:44:34 | ...::args_os(...) | Flow source 'CommandLineArgs' of type commandargs. |
+| test.rs:50:15:50:37 | ...::current_dir(...) | Flow source 'CommandLineArgs' of type commandargs. |
+| test.rs:51:15:51:37 | ...::current_exe(...) | Flow source 'CommandLineArgs' of type commandargs. |
+| test.rs:52:16:52:35 | ...::home_dir(...) | Flow source 'CommandLineArgs' of type commandargs. |
+| test.rs:60:26:60:70 | ...::get(...) | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:63:26:63:70 | ...::get(...) | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:66:26:66:60 | ...::get(...) | Flow source 'RemoteSource' of type remote (DEFAULT). |
diff --git a/rust/ql/test/library-tests/dataflow/sources/TaintSources.qlref b/rust/ql/test/library-tests/dataflow/sources/TaintSources.qlref
new file mode 100644
index 00000000000..3f6de4d0e4e
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/TaintSources.qlref
@@ -0,0 +1,2 @@
+query: queries/summary/TaintSources.ql
+postprocess: utils/InlineExpectationsTestQuery.ql
diff --git a/rust/ql/test/library-tests/dataflow/sources/options.yml b/rust/ql/test/library-tests/dataflow/sources/options.yml
new file mode 100644
index 00000000000..3885768c7fa
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/options.yml
@@ -0,0 +1,3 @@
+qltest_cargo_check: true
+qltest_dependencies:
+    - reqwest = { version = "0.12.9", features = ["blocking"] }
diff --git a/rust/ql/test/library-tests/dataflow/sources/reqwest.rs b/rust/ql/test/library-tests/dataflow/sources/reqwest.rs
new file mode 100644
index 00000000000..3e8f5ef8510
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/reqwest.rs
@@ -0,0 +1,36 @@
+
+// --- stubs for the "reqwest" library ---
+
+/*
+ --- we don't seem to have a way to use this, hence we currently test against the real reqwest library
+#[derive(Debug)]
+pub struct Error { }
+
+pub mod blocking {
+    pub struct Response { }
+    impl Response {
+        pub fn text(self) -> Result<String, super::Error> {
+            Ok("".to_string())
+        }
+    }
+
+    pub fn get<T>(url: T) -> Result<Response, super::Error> {
+        let _url = url;
+
+        Ok(Response {})
+    }
+}
+
+pub struct Response { }
+impl Response {
+    pub async fn text(self) -> Result<String, Error> {
+        Ok("".to_string())
+    }
+}
+
+pub async fn get<T>(url: T) -> Result<Response, Error> {
+    let _url = url;
+
+    Ok(Response {})
+}
+*/
diff --git a/rust/ql/test/library-tests/dataflow/sources/test.rs b/rust/ql/test/library-tests/dataflow/sources/test.rs
new file mode 100644
index 00000000000..e4701865a7e
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/test.rs
@@ -0,0 +1,70 @@
+#![allow(deprecated)]
+
+fn sink<T>(_: T) { }
+
+// --- tests ---
+
+fn test_env_vars() {
+    sink(std::env::var("HOME")); // $ Alert[rust/summary/taint-sources] hasTaintFlow
+    sink(std::env::var_os("PATH")); // $ Alert[rust/summary/taint-sources] hasTaintFlow
+
+    let var1 = std::env::var("HOME").expect("HOME not set"); // $ Alert[rust/summary/taint-sources]
+    let var2 = std::env::var_os("PATH").unwrap(); // $ Alert[rust/summary/taint-sources]
+
+    sink(var1); // $ MISSING: hasTaintFlow
+    sink(var2); // $ MISSING: hasTaintFlow
+
+    for (key, value) in std::env::vars() { // $ Alert[rust/summary/taint-sources]
+        sink(key); // $ MISSING: hasTaintFlow
+        sink(value); // $ MISSING: hasTaintFlow
+    }
+
+    for (key, value) in std::env::vars_os() { // $ Alert[rust/summary/taint-sources]
+        sink(key); // $ MISSING: hasTaintFlow
+        sink(value); // $ MISSING: hasTaintFlow
+    }
+}
+
+fn test_env_args() {
+    let args: Vec<String> = std::env::args().collect(); // $ Alert[rust/summary/taint-sources]
+    let my_path = &args[0];
+    let arg1 = &args[1];
+    let arg2 = std::env::args().nth(2).unwrap(); // $ Alert[rust/summary/taint-sources]
+    let arg3 = std::env::args_os().nth(3).unwrap(); // $ Alert[rust/summary/taint-sources]
+
+    sink(my_path); // $ MISSING: hasTaintFlow
+    sink(arg1); // $ MISSING: hasTaintFlow
+    sink(arg2); // $ MISSING: hasTaintFlow
+    sink(arg3); // $ MISSING: hasTaintFlow
+
+    for arg in std::env::args() { // $ Alert[rust/summary/taint-sources]
+        sink(arg); // $ MISSING: hasTaintFlow
+    }
+
+    for arg in std::env::args_os() { // $ Alert[rust/summary/taint-sources]
+        sink(arg); // $ MISSING: hasTaintFlow
+    }
+}
+
+fn test_env_dirs() {
+    let dir = std::env::current_dir().expect("FAILED"); // $ Alert[rust/summary/taint-sources]
+    let exe = std::env::current_exe().expect("FAILED"); // $ Alert[rust/summary/taint-sources]
+    let home = std::env::home_dir().expect("FAILED"); // $ Alert[rust/summary/taint-sources]
+
+    sink(dir); // $ MISSING: hasTaintFlow
+    sink(exe); // $ MISSING: hasTaintFlow
+    sink(home); // $ MISSING: hasTaintFlow
+}
+
+async fn test_reqwest() -> Result<(), reqwest::Error> {
+    let remote_string1 = reqwest::blocking::get("http://example.com/")?.text()?; // $ Alert[rust/summary/taint-sources]
+    sink(remote_string1); // $ MISSING: hasTaintFlow
+
+    let remote_string2 = reqwest::blocking::get("http://example.com/").unwrap().text().unwrap(); // $ Alert[rust/summary/taint-sources]
+    sink(remote_string2); // $ MISSING: hasTaintFlow
+
+    let remote_string3 = reqwest::get("http://example.com/").await?.text().await?; // $ Alert[rust/summary/taint-sources]
+    sink(remote_string3); // $ MISSING: hasTaintFlow
+
+    Ok(())
+}
diff --git a/rust/ql/test/library-tests/definitions/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/library-tests/definitions/CONSISTENCY/DataFlowConsistency.expected
deleted file mode 100644
index 8d729bb5fd9..00000000000
--- a/rust/ql/test/library-tests/definitions/CONSISTENCY/DataFlowConsistency.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-uniqueEnclosingCallable
-| main.rs:5:29:5:33 | width | Node should have one enclosing callable but has 0. |
-| main.rs:5:36:5:44 | precision | Node should have one enclosing callable but has 0. |
-| main.rs:9:22:9:27 | people | Node should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/library-tests/formatstrings/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/library-tests/formatstrings/CONSISTENCY/DataFlowConsistency.expected
deleted file mode 100644
index 5bd870a7205..00000000000
--- a/rust/ql/test/library-tests/formatstrings/CONSISTENCY/DataFlowConsistency.expected
+++ /dev/null
@@ -1,5 +0,0 @@
-uniqueEnclosingCallable
-| main.rs:5:29:5:33 | width | Node should have one enclosing callable but has 0. |
-| main.rs:5:36:5:44 | precision | Node should have one enclosing callable but has 0. |
-| main.rs:16:22:16:27 | people | Node should have one enclosing callable but has 0. |
-| main.rs:27:23:27:27 | width | Node should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/library-tests/variables/Cfg.expected b/rust/ql/test/library-tests/variables/Cfg.expected
index 3ff46aa9f7e..b55c0e9d04c 100644
--- a/rust/ql/test/library-tests/variables/Cfg.expected
+++ b/rust/ql/test/library-tests/variables/Cfg.expected
@@ -1,292 +1,292 @@
 edges
-| variables.rs:3:1:5:1 | enter print_str | variables.rs:3:14:3:14 | s |  |
-| variables.rs:3:1:5:1 | exit print_str (normal) | variables.rs:3:1:5:1 | exit print_str |  |
-| variables.rs:3:14:3:14 | s | variables.rs:3:14:3:20 | Param | match |
-| variables.rs:3:14:3:20 | Param | variables.rs:4:5:4:22 | ExprStmt |  |
-| variables.rs:3:23:5:1 | BlockExpr | variables.rs:3:1:5:1 | exit print_str (normal) |  |
-| variables.rs:4:5:4:21 | $crate::io::_print | variables.rs:4:14:4:17 | "{}\\n" |  |
-| variables.rs:4:5:4:21 | MacroExpr | variables.rs:3:23:5:1 | BlockExpr |  |
+| variables.rs:3:1:5:1 | enter fn print_str | variables.rs:3:14:3:14 | s |  |
+| variables.rs:3:1:5:1 | exit fn print_str (normal) | variables.rs:3:1:5:1 | exit fn print_str |  |
+| variables.rs:3:14:3:14 | s | variables.rs:3:14:3:20 | ...: ... | match |
+| variables.rs:3:14:3:20 | ...: ... | variables.rs:4:5:4:22 | ExprStmt |  |
+| variables.rs:3:23:5:1 | { ... } | variables.rs:3:1:5:1 | exit fn print_str (normal) |  |
+| variables.rs:4:5:4:21 | ...::_print | variables.rs:4:14:4:17 | "{}\\n" |  |
+| variables.rs:4:5:4:21 | MacroExpr | variables.rs:3:23:5:1 | { ... } |  |
 | variables.rs:4:5:4:22 | ExprStmt | variables.rs:4:14:4:20 | MacroStmts |  |
 | variables.rs:4:14:4:17 | "{}\\n" | variables.rs:4:20:4:20 | s |  |
-| variables.rs:4:14:4:20 | BlockExpr | variables.rs:4:5:4:21 | MacroExpr |  |
-| variables.rs:4:14:4:20 | CallExpr | variables.rs:4:14:4:20 | BlockExpr |  |
-| variables.rs:4:14:4:20 | ExprStmt | variables.rs:4:5:4:21 | $crate::io::_print |  |
+| variables.rs:4:14:4:20 | ...::_print(...) | variables.rs:4:14:4:20 | { ... } |  |
+| variables.rs:4:14:4:20 | ExprStmt | variables.rs:4:5:4:21 | ...::_print |  |
 | variables.rs:4:14:4:20 | FormatArgsExpr | variables.rs:4:14:4:20 | MacroExpr |  |
-| variables.rs:4:14:4:20 | MacroExpr | variables.rs:4:14:4:20 | CallExpr |  |
+| variables.rs:4:14:4:20 | MacroExpr | variables.rs:4:14:4:20 | ...::_print(...) |  |
 | variables.rs:4:14:4:20 | MacroStmts | variables.rs:4:14:4:20 | ExprStmt |  |
+| variables.rs:4:14:4:20 | { ... } | variables.rs:4:5:4:21 | MacroExpr |  |
 | variables.rs:4:20:4:20 | s | variables.rs:4:14:4:20 | FormatArgsExpr |  |
-| variables.rs:7:1:9:1 | enter print_i64 | variables.rs:7:14:7:14 | i |  |
-| variables.rs:7:1:9:1 | exit print_i64 (normal) | variables.rs:7:1:9:1 | exit print_i64 |  |
-| variables.rs:7:14:7:14 | i | variables.rs:7:14:7:19 | Param | match |
-| variables.rs:7:14:7:19 | Param | variables.rs:8:5:8:22 | ExprStmt |  |
-| variables.rs:7:22:9:1 | BlockExpr | variables.rs:7:1:9:1 | exit print_i64 (normal) |  |
-| variables.rs:8:5:8:21 | $crate::io::_print | variables.rs:8:14:8:17 | "{}\\n" |  |
-| variables.rs:8:5:8:21 | MacroExpr | variables.rs:7:22:9:1 | BlockExpr |  |
+| variables.rs:7:1:9:1 | enter fn print_i64 | variables.rs:7:14:7:14 | i |  |
+| variables.rs:7:1:9:1 | exit fn print_i64 (normal) | variables.rs:7:1:9:1 | exit fn print_i64 |  |
+| variables.rs:7:14:7:14 | i | variables.rs:7:14:7:19 | ...: i64 | match |
+| variables.rs:7:14:7:19 | ...: i64 | variables.rs:8:5:8:22 | ExprStmt |  |
+| variables.rs:7:22:9:1 | { ... } | variables.rs:7:1:9:1 | exit fn print_i64 (normal) |  |
+| variables.rs:8:5:8:21 | ...::_print | variables.rs:8:14:8:17 | "{}\\n" |  |
+| variables.rs:8:5:8:21 | MacroExpr | variables.rs:7:22:9:1 | { ... } |  |
 | variables.rs:8:5:8:22 | ExprStmt | variables.rs:8:14:8:20 | MacroStmts |  |
 | variables.rs:8:14:8:17 | "{}\\n" | variables.rs:8:20:8:20 | i |  |
-| variables.rs:8:14:8:20 | BlockExpr | variables.rs:8:5:8:21 | MacroExpr |  |
-| variables.rs:8:14:8:20 | CallExpr | variables.rs:8:14:8:20 | BlockExpr |  |
-| variables.rs:8:14:8:20 | ExprStmt | variables.rs:8:5:8:21 | $crate::io::_print |  |
+| variables.rs:8:14:8:20 | ...::_print(...) | variables.rs:8:14:8:20 | { ... } |  |
+| variables.rs:8:14:8:20 | ExprStmt | variables.rs:8:5:8:21 | ...::_print |  |
 | variables.rs:8:14:8:20 | FormatArgsExpr | variables.rs:8:14:8:20 | MacroExpr |  |
-| variables.rs:8:14:8:20 | MacroExpr | variables.rs:8:14:8:20 | CallExpr |  |
+| variables.rs:8:14:8:20 | MacroExpr | variables.rs:8:14:8:20 | ...::_print(...) |  |
 | variables.rs:8:14:8:20 | MacroStmts | variables.rs:8:14:8:20 | ExprStmt |  |
+| variables.rs:8:14:8:20 | { ... } | variables.rs:8:5:8:21 | MacroExpr |  |
 | variables.rs:8:20:8:20 | i | variables.rs:8:14:8:20 | FormatArgsExpr |  |
-| variables.rs:11:1:13:1 | enter print_i64_ref | variables.rs:11:18:11:18 | i |  |
-| variables.rs:11:1:13:1 | exit print_i64_ref (normal) | variables.rs:11:1:13:1 | exit print_i64_ref |  |
-| variables.rs:11:18:11:18 | i | variables.rs:11:18:11:24 | Param | match |
-| variables.rs:11:18:11:24 | Param | variables.rs:12:5:12:13 | print_i64 |  |
-| variables.rs:11:27:13:1 | BlockExpr | variables.rs:11:1:13:1 | exit print_i64_ref (normal) |  |
+| variables.rs:11:1:13:1 | enter fn print_i64_ref | variables.rs:11:18:11:18 | i |  |
+| variables.rs:11:1:13:1 | exit fn print_i64_ref (normal) | variables.rs:11:1:13:1 | exit fn print_i64_ref |  |
+| variables.rs:11:18:11:18 | i | variables.rs:11:18:11:24 | ...: ... | match |
+| variables.rs:11:18:11:24 | ...: ... | variables.rs:12:5:12:13 | print_i64 |  |
+| variables.rs:11:27:13:1 | { ... } | variables.rs:11:1:13:1 | exit fn print_i64_ref (normal) |  |
 | variables.rs:12:5:12:13 | print_i64 | variables.rs:12:16:12:16 | i |  |
-| variables.rs:12:5:12:17 | CallExpr | variables.rs:11:27:13:1 | BlockExpr |  |
-| variables.rs:12:15:12:16 | * ... | variables.rs:12:5:12:17 | CallExpr |  |
+| variables.rs:12:5:12:17 | print_i64(...) | variables.rs:11:27:13:1 | { ... } |  |
+| variables.rs:12:15:12:16 | * ... | variables.rs:12:5:12:17 | print_i64(...) |  |
 | variables.rs:12:16:12:16 | i | variables.rs:12:15:12:16 | * ... |  |
-| variables.rs:15:1:18:1 | enter immutable_variable | variables.rs:16:5:16:17 | LetStmt |  |
-| variables.rs:15:1:18:1 | exit immutable_variable (normal) | variables.rs:15:1:18:1 | exit immutable_variable |  |
-| variables.rs:15:25:18:1 | BlockExpr | variables.rs:15:1:18:1 | exit immutable_variable (normal) |  |
-| variables.rs:16:5:16:17 | LetStmt | variables.rs:16:14:16:16 | "a" |  |
+| variables.rs:15:1:18:1 | enter fn immutable_variable | variables.rs:16:5:16:17 | let ... = "a" |  |
+| variables.rs:15:1:18:1 | exit fn immutable_variable (normal) | variables.rs:15:1:18:1 | exit fn immutable_variable |  |
+| variables.rs:15:25:18:1 | { ... } | variables.rs:15:1:18:1 | exit fn immutable_variable (normal) |  |
+| variables.rs:16:5:16:17 | let ... = "a" | variables.rs:16:14:16:16 | "a" |  |
 | variables.rs:16:9:16:10 | x1 | variables.rs:17:5:17:18 | ExprStmt | match |
 | variables.rs:16:14:16:16 | "a" | variables.rs:16:9:16:10 | x1 |  |
 | variables.rs:17:5:17:13 | print_str | variables.rs:17:15:17:16 | x1 |  |
-| variables.rs:17:5:17:17 | CallExpr | variables.rs:15:25:18:1 | BlockExpr |  |
+| variables.rs:17:5:17:17 | print_str(...) | variables.rs:15:25:18:1 | { ... } |  |
 | variables.rs:17:5:17:18 | ExprStmt | variables.rs:17:5:17:13 | print_str |  |
-| variables.rs:17:15:17:16 | x1 | variables.rs:17:5:17:17 | CallExpr |  |
-| variables.rs:20:1:25:1 | enter mutable_variable | variables.rs:21:5:21:19 | LetStmt |  |
-| variables.rs:20:1:25:1 | exit mutable_variable (normal) | variables.rs:20:1:25:1 | exit mutable_variable |  |
-| variables.rs:20:23:25:1 | BlockExpr | variables.rs:20:1:25:1 | exit mutable_variable (normal) |  |
-| variables.rs:21:5:21:19 | LetStmt | variables.rs:21:18:21:18 | 4 |  |
+| variables.rs:17:15:17:16 | x1 | variables.rs:17:5:17:17 | print_str(...) |  |
+| variables.rs:20:1:25:1 | enter fn mutable_variable | variables.rs:21:5:21:19 | let ... = 4 |  |
+| variables.rs:20:1:25:1 | exit fn mutable_variable (normal) | variables.rs:20:1:25:1 | exit fn mutable_variable |  |
+| variables.rs:20:23:25:1 | { ... } | variables.rs:20:1:25:1 | exit fn mutable_variable (normal) |  |
+| variables.rs:21:5:21:19 | let ... = 4 | variables.rs:21:18:21:18 | 4 |  |
 | variables.rs:21:9:21:14 | x2 | variables.rs:22:5:22:18 | ExprStmt | match |
 | variables.rs:21:18:21:18 | 4 | variables.rs:21:9:21:14 | x2 |  |
 | variables.rs:22:5:22:13 | print_i64 | variables.rs:22:15:22:16 | x2 |  |
-| variables.rs:22:5:22:17 | CallExpr | variables.rs:23:5:23:11 | ExprStmt |  |
+| variables.rs:22:5:22:17 | print_i64(...) | variables.rs:23:5:23:11 | ExprStmt |  |
 | variables.rs:22:5:22:18 | ExprStmt | variables.rs:22:5:22:13 | print_i64 |  |
-| variables.rs:22:15:22:16 | x2 | variables.rs:22:5:22:17 | CallExpr |  |
+| variables.rs:22:15:22:16 | x2 | variables.rs:22:5:22:17 | print_i64(...) |  |
 | variables.rs:23:5:23:6 | x2 | variables.rs:23:10:23:10 | 5 |  |
 | variables.rs:23:5:23:10 | ... = ... | variables.rs:24:5:24:18 | ExprStmt |  |
 | variables.rs:23:5:23:11 | ExprStmt | variables.rs:23:5:23:6 | x2 |  |
 | variables.rs:23:10:23:10 | 5 | variables.rs:23:5:23:10 | ... = ... |  |
 | variables.rs:24:5:24:13 | print_i64 | variables.rs:24:15:24:16 | x2 |  |
-| variables.rs:24:5:24:17 | CallExpr | variables.rs:20:23:25:1 | BlockExpr |  |
+| variables.rs:24:5:24:17 | print_i64(...) | variables.rs:20:23:25:1 | { ... } |  |
 | variables.rs:24:5:24:18 | ExprStmt | variables.rs:24:5:24:13 | print_i64 |  |
-| variables.rs:24:15:24:16 | x2 | variables.rs:24:5:24:17 | CallExpr |  |
-| variables.rs:27:1:32:1 | enter mutable_variable_immutable_borrow | variables.rs:28:5:28:18 | LetStmt |  |
-| variables.rs:27:1:32:1 | exit mutable_variable_immutable_borrow (normal) | variables.rs:27:1:32:1 | exit mutable_variable_immutable_borrow |  |
-| variables.rs:27:40:32:1 | BlockExpr | variables.rs:27:1:32:1 | exit mutable_variable_immutable_borrow (normal) |  |
-| variables.rs:28:5:28:18 | LetStmt | variables.rs:28:17:28:17 | 1 |  |
+| variables.rs:24:15:24:16 | x2 | variables.rs:24:5:24:17 | print_i64(...) |  |
+| variables.rs:27:1:32:1 | enter fn mutable_variable_immutable_borrow | variables.rs:28:5:28:18 | let ... = 1 |  |
+| variables.rs:27:1:32:1 | exit fn mutable_variable_immutable_borrow (normal) | variables.rs:27:1:32:1 | exit fn mutable_variable_immutable_borrow |  |
+| variables.rs:27:40:32:1 | { ... } | variables.rs:27:1:32:1 | exit fn mutable_variable_immutable_borrow (normal) |  |
+| variables.rs:28:5:28:18 | let ... = 1 | variables.rs:28:17:28:17 | 1 |  |
 | variables.rs:28:9:28:13 | x | variables.rs:29:5:29:22 | ExprStmt | match |
 | variables.rs:28:17:28:17 | 1 | variables.rs:28:9:28:13 | x |  |
 | variables.rs:29:5:29:17 | print_i64_ref | variables.rs:29:20:29:20 | x |  |
-| variables.rs:29:5:29:21 | CallExpr | variables.rs:30:5:30:10 | ExprStmt |  |
+| variables.rs:29:5:29:21 | print_i64_ref(...) | variables.rs:30:5:30:10 | ExprStmt |  |
 | variables.rs:29:5:29:22 | ExprStmt | variables.rs:29:5:29:17 | print_i64_ref |  |
-| variables.rs:29:19:29:20 | RefExpr | variables.rs:29:5:29:21 | CallExpr |  |
-| variables.rs:29:20:29:20 | x | variables.rs:29:19:29:20 | RefExpr |  |
+| variables.rs:29:19:29:20 | &x | variables.rs:29:5:29:21 | print_i64_ref(...) |  |
+| variables.rs:29:20:29:20 | x | variables.rs:29:19:29:20 | &x |  |
 | variables.rs:30:5:30:5 | x | variables.rs:30:9:30:9 | 2 |  |
 | variables.rs:30:5:30:9 | ... = ... | variables.rs:31:5:31:22 | ExprStmt |  |
 | variables.rs:30:5:30:10 | ExprStmt | variables.rs:30:5:30:5 | x |  |
 | variables.rs:30:9:30:9 | 2 | variables.rs:30:5:30:9 | ... = ... |  |
 | variables.rs:31:5:31:17 | print_i64_ref | variables.rs:31:20:31:20 | x |  |
-| variables.rs:31:5:31:21 | CallExpr | variables.rs:27:40:32:1 | BlockExpr |  |
+| variables.rs:31:5:31:21 | print_i64_ref(...) | variables.rs:27:40:32:1 | { ... } |  |
 | variables.rs:31:5:31:22 | ExprStmt | variables.rs:31:5:31:17 | print_i64_ref |  |
-| variables.rs:31:19:31:20 | RefExpr | variables.rs:31:5:31:21 | CallExpr |  |
-| variables.rs:31:20:31:20 | x | variables.rs:31:19:31:20 | RefExpr |  |
-| variables.rs:34:1:40:1 | enter variable_shadow1 | variables.rs:35:5:35:15 | LetStmt |  |
-| variables.rs:34:1:40:1 | exit variable_shadow1 (normal) | variables.rs:34:1:40:1 | exit variable_shadow1 |  |
-| variables.rs:34:23:40:1 | BlockExpr | variables.rs:34:1:40:1 | exit variable_shadow1 (normal) |  |
-| variables.rs:35:5:35:15 | LetStmt | variables.rs:35:14:35:14 | 1 |  |
+| variables.rs:31:19:31:20 | &x | variables.rs:31:5:31:21 | print_i64_ref(...) |  |
+| variables.rs:31:20:31:20 | x | variables.rs:31:19:31:20 | &x |  |
+| variables.rs:34:1:40:1 | enter fn variable_shadow1 | variables.rs:35:5:35:15 | let ... = 1 |  |
+| variables.rs:34:1:40:1 | exit fn variable_shadow1 (normal) | variables.rs:34:1:40:1 | exit fn variable_shadow1 |  |
+| variables.rs:34:23:40:1 | { ... } | variables.rs:34:1:40:1 | exit fn variable_shadow1 (normal) |  |
+| variables.rs:35:5:35:15 | let ... = 1 | variables.rs:35:14:35:14 | 1 |  |
 | variables.rs:35:9:35:10 | x3 | variables.rs:36:5:36:18 | ExprStmt | match |
 | variables.rs:35:14:35:14 | 1 | variables.rs:35:9:35:10 | x3 |  |
 | variables.rs:36:5:36:13 | print_i64 | variables.rs:36:15:36:16 | x3 |  |
-| variables.rs:36:5:36:17 | CallExpr | variables.rs:37:5:38:15 | LetStmt |  |
+| variables.rs:36:5:36:17 | print_i64(...) | variables.rs:37:5:38:15 | let ... = ... |  |
 | variables.rs:36:5:36:18 | ExprStmt | variables.rs:36:5:36:13 | print_i64 |  |
-| variables.rs:36:15:36:16 | x3 | variables.rs:36:5:36:17 | CallExpr |  |
-| variables.rs:37:5:38:15 | LetStmt | variables.rs:38:9:38:10 | x3 |  |
+| variables.rs:36:15:36:16 | x3 | variables.rs:36:5:36:17 | print_i64(...) |  |
+| variables.rs:37:5:38:15 | let ... = ... | variables.rs:38:9:38:10 | x3 |  |
 | variables.rs:37:9:37:10 | x3 | variables.rs:39:5:39:18 | ExprStmt | match |
 | variables.rs:38:9:38:10 | x3 | variables.rs:38:14:38:14 | 1 |  |
 | variables.rs:38:9:38:14 | ... + ... | variables.rs:37:9:37:10 | x3 |  |
 | variables.rs:38:14:38:14 | 1 | variables.rs:38:9:38:14 | ... + ... |  |
 | variables.rs:39:5:39:13 | print_i64 | variables.rs:39:15:39:16 | x3 |  |
-| variables.rs:39:5:39:17 | CallExpr | variables.rs:34:23:40:1 | BlockExpr |  |
+| variables.rs:39:5:39:17 | print_i64(...) | variables.rs:34:23:40:1 | { ... } |  |
 | variables.rs:39:5:39:18 | ExprStmt | variables.rs:39:5:39:13 | print_i64 |  |
-| variables.rs:39:15:39:16 | x3 | variables.rs:39:5:39:17 | CallExpr |  |
-| variables.rs:42:1:50:1 | enter variable_shadow2 | variables.rs:43:5:43:17 | LetStmt |  |
-| variables.rs:42:1:50:1 | exit variable_shadow2 (normal) | variables.rs:42:1:50:1 | exit variable_shadow2 |  |
-| variables.rs:42:23:50:1 | BlockExpr | variables.rs:42:1:50:1 | exit variable_shadow2 (normal) |  |
-| variables.rs:43:5:43:17 | LetStmt | variables.rs:43:14:43:16 | "a" |  |
+| variables.rs:39:15:39:16 | x3 | variables.rs:39:5:39:17 | print_i64(...) |  |
+| variables.rs:42:1:50:1 | enter fn variable_shadow2 | variables.rs:43:5:43:17 | let ... = "a" |  |
+| variables.rs:42:1:50:1 | exit fn variable_shadow2 (normal) | variables.rs:42:1:50:1 | exit fn variable_shadow2 |  |
+| variables.rs:42:23:50:1 | { ... } | variables.rs:42:1:50:1 | exit fn variable_shadow2 (normal) |  |
+| variables.rs:43:5:43:17 | let ... = "a" | variables.rs:43:14:43:16 | "a" |  |
 | variables.rs:43:9:43:10 | x4 | variables.rs:44:5:44:18 | ExprStmt | match |
 | variables.rs:43:14:43:16 | "a" | variables.rs:43:9:43:10 | x4 |  |
 | variables.rs:44:5:44:13 | print_str | variables.rs:44:15:44:16 | x4 |  |
-| variables.rs:44:5:44:17 | CallExpr | variables.rs:45:5:48:5 | ExprStmt |  |
+| variables.rs:44:5:44:17 | print_str(...) | variables.rs:45:5:48:5 | ExprStmt |  |
 | variables.rs:44:5:44:18 | ExprStmt | variables.rs:44:5:44:13 | print_str |  |
-| variables.rs:44:15:44:16 | x4 | variables.rs:44:5:44:17 | CallExpr |  |
-| variables.rs:45:5:48:5 | BlockExpr | variables.rs:49:5:49:18 | ExprStmt |  |
-| variables.rs:45:5:48:5 | ExprStmt | variables.rs:46:9:46:21 | LetStmt |  |
-| variables.rs:46:9:46:21 | LetStmt | variables.rs:46:18:46:20 | "b" |  |
+| variables.rs:44:15:44:16 | x4 | variables.rs:44:5:44:17 | print_str(...) |  |
+| variables.rs:45:5:48:5 | ExprStmt | variables.rs:46:9:46:21 | let ... = "b" |  |
+| variables.rs:45:5:48:5 | { ... } | variables.rs:49:5:49:18 | ExprStmt |  |
+| variables.rs:46:9:46:21 | let ... = "b" | variables.rs:46:18:46:20 | "b" |  |
 | variables.rs:46:13:46:14 | x4 | variables.rs:47:9:47:22 | ExprStmt | match |
 | variables.rs:46:18:46:20 | "b" | variables.rs:46:13:46:14 | x4 |  |
 | variables.rs:47:9:47:17 | print_str | variables.rs:47:19:47:20 | x4 |  |
-| variables.rs:47:9:47:21 | CallExpr | variables.rs:45:5:48:5 | BlockExpr |  |
+| variables.rs:47:9:47:21 | print_str(...) | variables.rs:45:5:48:5 | { ... } |  |
 | variables.rs:47:9:47:22 | ExprStmt | variables.rs:47:9:47:17 | print_str |  |
-| variables.rs:47:19:47:20 | x4 | variables.rs:47:9:47:21 | CallExpr |  |
+| variables.rs:47:19:47:20 | x4 | variables.rs:47:9:47:21 | print_str(...) |  |
 | variables.rs:49:5:49:13 | print_str | variables.rs:49:15:49:16 | x4 |  |
-| variables.rs:49:5:49:17 | CallExpr | variables.rs:42:23:50:1 | BlockExpr |  |
+| variables.rs:49:5:49:17 | print_str(...) | variables.rs:42:23:50:1 | { ... } |  |
 | variables.rs:49:5:49:18 | ExprStmt | variables.rs:49:5:49:13 | print_str |  |
-| variables.rs:49:15:49:16 | x4 | variables.rs:49:5:49:17 | CallExpr |  |
-| variables.rs:57:1:72:1 | enter let_pattern1 | variables.rs:58:5:67:47 | LetStmt |  |
-| variables.rs:57:1:72:1 | exit let_pattern1 (normal) | variables.rs:57:1:72:1 | exit let_pattern1 |  |
-| variables.rs:57:19:72:1 | BlockExpr | variables.rs:57:1:72:1 | exit let_pattern1 (normal) |  |
-| variables.rs:58:5:67:47 | LetStmt | variables.rs:67:11:67:13 | "a" |  |
+| variables.rs:49:15:49:16 | x4 | variables.rs:49:5:49:17 | print_str(...) |  |
+| variables.rs:57:1:72:1 | enter fn let_pattern1 | variables.rs:58:5:67:47 | let ... = ... |  |
+| variables.rs:57:1:72:1 | exit fn let_pattern1 (normal) | variables.rs:57:1:72:1 | exit fn let_pattern1 |  |
+| variables.rs:57:19:72:1 | { ... } | variables.rs:57:1:72:1 | exit fn let_pattern1 (normal) |  |
+| variables.rs:58:5:67:47 | let ... = ... | variables.rs:67:11:67:13 | "a" |  |
 | variables.rs:58:9:67:5 | TuplePat | variables.rs:59:9:62:9 | TuplePat | match |
 | variables.rs:59:9:62:9 | TuplePat | variables.rs:60:13:60:14 | a1 | match |
 | variables.rs:60:13:60:14 | a1 | variables.rs:61:13:61:14 | b1 | match |
-| variables.rs:61:13:61:14 | b1 | variables.rs:63:9:66:9 | RecordPat | match |
-| variables.rs:63:9:66:9 | RecordPat | variables.rs:64:13:64:13 | x | match |
+| variables.rs:61:13:61:14 | b1 | variables.rs:63:9:66:9 | Point {...} | match |
+| variables.rs:63:9:66:9 | Point {...} | variables.rs:64:13:64:13 | x | match |
 | variables.rs:64:13:64:13 | x | variables.rs:65:13:65:13 | y | match |
 | variables.rs:65:13:65:13 | y | variables.rs:68:5:68:18 | ExprStmt | match |
 | variables.rs:67:9:67:46 | TupleExpr | variables.rs:58:9:67:5 | TuplePat |  |
 | variables.rs:67:10:67:19 | TupleExpr | variables.rs:67:33:67:35 | "x" |  |
 | variables.rs:67:11:67:13 | "a" | variables.rs:67:16:67:18 | "b" |  |
 | variables.rs:67:16:67:18 | "b" | variables.rs:67:10:67:19 | TupleExpr |  |
-| variables.rs:67:22:67:45 | RecordExpr | variables.rs:67:9:67:46 | TupleExpr |  |
+| variables.rs:67:22:67:45 | Point {...} | variables.rs:67:9:67:46 | TupleExpr |  |
 | variables.rs:67:33:67:35 | "x" | variables.rs:67:41:67:43 | "y" |  |
-| variables.rs:67:41:67:43 | "y" | variables.rs:67:22:67:45 | RecordExpr |  |
+| variables.rs:67:41:67:43 | "y" | variables.rs:67:22:67:45 | Point {...} |  |
 | variables.rs:68:5:68:13 | print_str | variables.rs:68:15:68:16 | a1 |  |
-| variables.rs:68:5:68:17 | CallExpr | variables.rs:69:5:69:18 | ExprStmt |  |
+| variables.rs:68:5:68:17 | print_str(...) | variables.rs:69:5:69:18 | ExprStmt |  |
 | variables.rs:68:5:68:18 | ExprStmt | variables.rs:68:5:68:13 | print_str |  |
-| variables.rs:68:15:68:16 | a1 | variables.rs:68:5:68:17 | CallExpr |  |
+| variables.rs:68:15:68:16 | a1 | variables.rs:68:5:68:17 | print_str(...) |  |
 | variables.rs:69:5:69:13 | print_str | variables.rs:69:15:69:16 | b1 |  |
-| variables.rs:69:5:69:17 | CallExpr | variables.rs:70:5:70:17 | ExprStmt |  |
+| variables.rs:69:5:69:17 | print_str(...) | variables.rs:70:5:70:17 | ExprStmt |  |
 | variables.rs:69:5:69:18 | ExprStmt | variables.rs:69:5:69:13 | print_str |  |
-| variables.rs:69:15:69:16 | b1 | variables.rs:69:5:69:17 | CallExpr |  |
+| variables.rs:69:15:69:16 | b1 | variables.rs:69:5:69:17 | print_str(...) |  |
 | variables.rs:70:5:70:13 | print_str | variables.rs:70:15:70:15 | x |  |
-| variables.rs:70:5:70:16 | CallExpr | variables.rs:71:5:71:17 | ExprStmt |  |
+| variables.rs:70:5:70:16 | print_str(...) | variables.rs:71:5:71:17 | ExprStmt |  |
 | variables.rs:70:5:70:17 | ExprStmt | variables.rs:70:5:70:13 | print_str |  |
-| variables.rs:70:15:70:15 | x | variables.rs:70:5:70:16 | CallExpr |  |
+| variables.rs:70:15:70:15 | x | variables.rs:70:5:70:16 | print_str(...) |  |
 | variables.rs:71:5:71:13 | print_str | variables.rs:71:15:71:15 | y |  |
-| variables.rs:71:5:71:16 | CallExpr | variables.rs:57:19:72:1 | BlockExpr |  |
+| variables.rs:71:5:71:16 | print_str(...) | variables.rs:57:19:72:1 | { ... } |  |
 | variables.rs:71:5:71:17 | ExprStmt | variables.rs:71:5:71:13 | print_str |  |
-| variables.rs:71:15:71:15 | y | variables.rs:71:5:71:16 | CallExpr |  |
-| variables.rs:74:1:82:1 | enter let_pattern2 | variables.rs:75:5:75:38 | LetStmt |  |
-| variables.rs:74:1:82:1 | exit let_pattern2 (normal) | variables.rs:74:1:82:1 | exit let_pattern2 |  |
-| variables.rs:74:19:82:1 | BlockExpr | variables.rs:74:1:82:1 | exit let_pattern2 (normal) |  |
-| variables.rs:75:5:75:38 | LetStmt | variables.rs:75:25:75:27 | "a" |  |
-| variables.rs:75:9:75:10 | p1 | variables.rs:76:5:79:11 | LetStmt | match |
-| variables.rs:75:14:75:37 | RecordExpr | variables.rs:75:9:75:10 | p1 |  |
+| variables.rs:71:15:71:15 | y | variables.rs:71:5:71:16 | print_str(...) |  |
+| variables.rs:74:1:82:1 | enter fn let_pattern2 | variables.rs:75:5:75:38 | let ... = ... |  |
+| variables.rs:74:1:82:1 | exit fn let_pattern2 (normal) | variables.rs:74:1:82:1 | exit fn let_pattern2 |  |
+| variables.rs:74:19:82:1 | { ... } | variables.rs:74:1:82:1 | exit fn let_pattern2 (normal) |  |
+| variables.rs:75:5:75:38 | let ... = ... | variables.rs:75:25:75:27 | "a" |  |
+| variables.rs:75:9:75:10 | p1 | variables.rs:76:5:79:11 | let ... = p1 | match |
+| variables.rs:75:14:75:37 | Point {...} | variables.rs:75:9:75:10 | p1 |  |
 | variables.rs:75:25:75:27 | "a" | variables.rs:75:33:75:35 | "b" |  |
-| variables.rs:75:33:75:35 | "b" | variables.rs:75:14:75:37 | RecordExpr |  |
-| variables.rs:76:5:79:11 | LetStmt | variables.rs:79:9:79:10 | p1 |  |
-| variables.rs:76:9:79:5 | RecordPat | variables.rs:77:12:77:13 | a2 | match |
+| variables.rs:75:33:75:35 | "b" | variables.rs:75:14:75:37 | Point {...} |  |
+| variables.rs:76:5:79:11 | let ... = p1 | variables.rs:79:9:79:10 | p1 |  |
+| variables.rs:76:9:79:5 | Point {...} | variables.rs:77:12:77:13 | a2 | match |
 | variables.rs:77:12:77:13 | a2 | variables.rs:78:12:78:13 | b2 | match |
 | variables.rs:78:12:78:13 | b2 | variables.rs:80:5:80:18 | ExprStmt | match |
-| variables.rs:79:9:79:10 | p1 | variables.rs:76:9:79:5 | RecordPat |  |
+| variables.rs:79:9:79:10 | p1 | variables.rs:76:9:79:5 | Point {...} |  |
 | variables.rs:80:5:80:13 | print_str | variables.rs:80:15:80:16 | a2 |  |
-| variables.rs:80:5:80:17 | CallExpr | variables.rs:81:5:81:18 | ExprStmt |  |
+| variables.rs:80:5:80:17 | print_str(...) | variables.rs:81:5:81:18 | ExprStmt |  |
 | variables.rs:80:5:80:18 | ExprStmt | variables.rs:80:5:80:13 | print_str |  |
-| variables.rs:80:15:80:16 | a2 | variables.rs:80:5:80:17 | CallExpr |  |
+| variables.rs:80:15:80:16 | a2 | variables.rs:80:5:80:17 | print_str(...) |  |
 | variables.rs:81:5:81:13 | print_str | variables.rs:81:15:81:16 | b2 |  |
-| variables.rs:81:5:81:17 | CallExpr | variables.rs:74:19:82:1 | BlockExpr |  |
+| variables.rs:81:5:81:17 | print_str(...) | variables.rs:74:19:82:1 | { ... } |  |
 | variables.rs:81:5:81:18 | ExprStmt | variables.rs:81:5:81:13 | print_str |  |
-| variables.rs:81:15:81:16 | b2 | variables.rs:81:5:81:17 | CallExpr |  |
-| variables.rs:84:1:91:1 | enter let_pattern3 | variables.rs:85:5:85:42 | LetStmt |  |
-| variables.rs:84:1:91:1 | exit let_pattern3 (normal) | variables.rs:84:1:91:1 | exit let_pattern3 |  |
-| variables.rs:84:19:91:1 | BlockExpr | variables.rs:84:1:91:1 | exit let_pattern3 (normal) |  |
-| variables.rs:85:5:85:42 | LetStmt | variables.rs:85:14:85:17 | Some |  |
-| variables.rs:85:9:85:10 | s1 | variables.rs:87:8:88:12 | LetExpr | match |
-| variables.rs:85:14:85:17 | Some | variables.rs:85:19:85:30 | String::from |  |
-| variables.rs:85:14:85:41 | CallExpr | variables.rs:85:9:85:10 | s1 |  |
-| variables.rs:85:19:85:30 | String::from | variables.rs:85:32:85:39 | "Hello!" |  |
-| variables.rs:85:19:85:40 | CallExpr | variables.rs:85:14:85:41 | CallExpr |  |
-| variables.rs:85:32:85:39 | "Hello!" | variables.rs:85:19:85:40 | CallExpr |  |
-| variables.rs:87:5:90:5 | IfExpr | variables.rs:84:19:91:1 | BlockExpr |  |
-| variables.rs:87:8:88:12 | LetExpr | variables.rs:88:11:88:12 | s1 |  |
-| variables.rs:87:12:87:23 | TupleStructPat | variables.rs:87:5:90:5 | IfExpr | no-match |
-| variables.rs:87:12:87:23 | TupleStructPat | variables.rs:87:17:87:22 | s2 | match |
+| variables.rs:81:15:81:16 | b2 | variables.rs:81:5:81:17 | print_str(...) |  |
+| variables.rs:84:1:91:1 | enter fn let_pattern3 | variables.rs:85:5:85:42 | let ... = ... |  |
+| variables.rs:84:1:91:1 | exit fn let_pattern3 (normal) | variables.rs:84:1:91:1 | exit fn let_pattern3 |  |
+| variables.rs:84:19:91:1 | { ... } | variables.rs:84:1:91:1 | exit fn let_pattern3 (normal) |  |
+| variables.rs:85:5:85:42 | let ... = ... | variables.rs:85:14:85:17 | Some |  |
+| variables.rs:85:9:85:10 | s1 | variables.rs:87:8:88:12 | let ... = s1 | match |
+| variables.rs:85:14:85:17 | Some | variables.rs:85:19:85:30 | ...::from |  |
+| variables.rs:85:14:85:41 | Some(...) | variables.rs:85:9:85:10 | s1 |  |
+| variables.rs:85:19:85:30 | ...::from | variables.rs:85:32:85:39 | "Hello!" |  |
+| variables.rs:85:19:85:40 | ...::from(...) | variables.rs:85:14:85:41 | Some(...) |  |
+| variables.rs:85:32:85:39 | "Hello!" | variables.rs:85:19:85:40 | ...::from(...) |  |
+| variables.rs:87:5:90:5 | if ... {...} | variables.rs:84:19:91:1 | { ... } |  |
+| variables.rs:87:8:88:12 | let ... = s1 | variables.rs:88:11:88:12 | s1 |  |
+| variables.rs:87:12:87:23 | Some(...) | variables.rs:87:5:90:5 | if ... {...} | no-match |
+| variables.rs:87:12:87:23 | Some(...) | variables.rs:87:17:87:22 | s2 | match |
 | variables.rs:87:17:87:22 | s2 | variables.rs:89:9:89:22 | ExprStmt | match |
-| variables.rs:88:11:88:12 | s1 | variables.rs:87:12:87:23 | TupleStructPat |  |
-| variables.rs:88:14:90:5 | BlockExpr | variables.rs:87:5:90:5 | IfExpr |  |
+| variables.rs:88:11:88:12 | s1 | variables.rs:87:12:87:23 | Some(...) |  |
+| variables.rs:88:14:90:5 | { ... } | variables.rs:87:5:90:5 | if ... {...} |  |
 | variables.rs:89:9:89:17 | print_str | variables.rs:89:19:89:20 | s2 |  |
-| variables.rs:89:9:89:21 | CallExpr | variables.rs:88:14:90:5 | BlockExpr |  |
+| variables.rs:89:9:89:21 | print_str(...) | variables.rs:88:14:90:5 | { ... } |  |
 | variables.rs:89:9:89:22 | ExprStmt | variables.rs:89:9:89:17 | print_str |  |
-| variables.rs:89:19:89:20 | s2 | variables.rs:89:9:89:21 | CallExpr |  |
-| variables.rs:93:1:99:1 | enter let_pattern4 | variables.rs:94:5:97:10 | LetStmt |  |
-| variables.rs:93:1:99:1 | exit let_pattern4 (normal) | variables.rs:93:1:99:1 | exit let_pattern4 |  |
-| variables.rs:93:19:99:1 | BlockExpr | variables.rs:93:1:99:1 | exit let_pattern4 (normal) |  |
-| variables.rs:94:5:97:10 | LetStmt | variables.rs:94:34:94:37 | Some |  |
-| variables.rs:94:9:94:16 | TupleStructPat | variables.rs:94:14:94:15 | x5 | match |
-| variables.rs:94:9:94:16 | TupleStructPat | variables.rs:96:13:96:19 | MacroStmts | no-match |
+| variables.rs:89:19:89:20 | s2 | variables.rs:89:9:89:21 | print_str(...) |  |
+| variables.rs:93:1:99:1 | enter fn let_pattern4 | variables.rs:94:5:97:10 | let ... = ... else {...} |  |
+| variables.rs:93:1:99:1 | exit fn let_pattern4 (normal) | variables.rs:93:1:99:1 | exit fn let_pattern4 |  |
+| variables.rs:93:19:99:1 | { ... } | variables.rs:93:1:99:1 | exit fn let_pattern4 (normal) |  |
+| variables.rs:94:5:97:10 | let ... = ... else {...} | variables.rs:94:34:94:37 | Some |  |
+| variables.rs:94:9:94:16 | Some(...) | variables.rs:94:14:94:15 | x5 | match |
+| variables.rs:94:9:94:16 | Some(...) | variables.rs:96:13:96:19 | MacroStmts | no-match |
 | variables.rs:94:14:94:15 | x5 | variables.rs:98:5:98:18 | ExprStmt | match |
 | variables.rs:94:34:94:37 | Some | variables.rs:94:39:94:42 | "x5" |  |
-| variables.rs:94:34:94:43 | CallExpr | variables.rs:94:9:94:16 | TupleStructPat |  |
-| variables.rs:94:39:94:42 | "x5" | variables.rs:94:34:94:43 | CallExpr |  |
-| variables.rs:96:13:96:19 | "not yet implemented" | variables.rs:96:13:96:19 | CallExpr |  |
-| variables.rs:96:13:96:19 | $crate::panicking::panic | variables.rs:96:13:96:19 | "not yet implemented" |  |
-| variables.rs:96:13:96:19 | CallExpr | variables.rs:96:13:96:19 | MacroExpr |  |
-| variables.rs:96:13:96:19 | MacroExpr | variables.rs:95:14:97:9 | BlockExpr |  |
-| variables.rs:96:13:96:19 | MacroStmts | variables.rs:96:13:96:19 | $crate::panicking::panic |  |
+| variables.rs:94:34:94:43 | Some(...) | variables.rs:94:9:94:16 | Some(...) |  |
+| variables.rs:94:39:94:42 | "x5" | variables.rs:94:34:94:43 | Some(...) |  |
+| variables.rs:96:13:96:19 | "not yet implemented" | variables.rs:96:13:96:19 | ...::panic(...) |  |
+| variables.rs:96:13:96:19 | ...::panic | variables.rs:96:13:96:19 | "not yet implemented" |  |
+| variables.rs:96:13:96:19 | ...::panic(...) | variables.rs:96:13:96:19 | MacroExpr |  |
+| variables.rs:96:13:96:19 | MacroExpr | variables.rs:95:14:97:9 | { ... } |  |
+| variables.rs:96:13:96:19 | MacroStmts | variables.rs:96:13:96:19 | ...::panic |  |
 | variables.rs:98:5:98:13 | print_str | variables.rs:98:15:98:16 | x5 |  |
-| variables.rs:98:5:98:17 | CallExpr | variables.rs:93:19:99:1 | BlockExpr |  |
+| variables.rs:98:5:98:17 | print_str(...) | variables.rs:93:19:99:1 | { ... } |  |
 | variables.rs:98:5:98:18 | ExprStmt | variables.rs:98:5:98:13 | print_str |  |
-| variables.rs:98:15:98:16 | x5 | variables.rs:98:5:98:17 | CallExpr |  |
-| variables.rs:101:1:108:1 | enter let_pattern5 | variables.rs:102:5:102:42 | LetStmt |  |
-| variables.rs:101:1:108:1 | exit let_pattern5 (normal) | variables.rs:101:1:108:1 | exit let_pattern5 |  |
-| variables.rs:101:19:108:1 | BlockExpr | variables.rs:101:1:108:1 | exit let_pattern5 (normal) |  |
-| variables.rs:102:5:102:42 | LetStmt | variables.rs:102:14:102:17 | Some |  |
-| variables.rs:102:9:102:10 | s1 | variables.rs:104:11:105:12 | LetExpr | match |
-| variables.rs:102:14:102:17 | Some | variables.rs:102:19:102:30 | String::from |  |
-| variables.rs:102:14:102:41 | CallExpr | variables.rs:102:9:102:10 | s1 |  |
-| variables.rs:102:19:102:30 | String::from | variables.rs:102:32:102:39 | "Hello!" |  |
-| variables.rs:102:19:102:40 | CallExpr | variables.rs:102:14:102:41 | CallExpr |  |
-| variables.rs:102:32:102:39 | "Hello!" | variables.rs:102:19:102:40 | CallExpr |  |
-| variables.rs:104:5:107:5 | WhileExpr | variables.rs:101:19:108:1 | BlockExpr |  |
-| variables.rs:104:11:105:12 | LetExpr | variables.rs:105:11:105:12 | s1 |  |
-| variables.rs:104:15:104:26 | TupleStructPat | variables.rs:104:5:107:5 | WhileExpr | no-match |
-| variables.rs:104:15:104:26 | TupleStructPat | variables.rs:104:20:104:25 | s2 | match |
+| variables.rs:98:15:98:16 | x5 | variables.rs:98:5:98:17 | print_str(...) |  |
+| variables.rs:101:1:108:1 | enter fn let_pattern5 | variables.rs:102:5:102:42 | let ... = ... |  |
+| variables.rs:101:1:108:1 | exit fn let_pattern5 (normal) | variables.rs:101:1:108:1 | exit fn let_pattern5 |  |
+| variables.rs:101:19:108:1 | { ... } | variables.rs:101:1:108:1 | exit fn let_pattern5 (normal) |  |
+| variables.rs:102:5:102:42 | let ... = ... | variables.rs:102:14:102:17 | Some |  |
+| variables.rs:102:9:102:10 | s1 | variables.rs:104:11:105:12 | let ... = s1 | match |
+| variables.rs:102:14:102:17 | Some | variables.rs:102:19:102:30 | ...::from |  |
+| variables.rs:102:14:102:41 | Some(...) | variables.rs:102:9:102:10 | s1 |  |
+| variables.rs:102:19:102:30 | ...::from | variables.rs:102:32:102:39 | "Hello!" |  |
+| variables.rs:102:19:102:40 | ...::from(...) | variables.rs:102:14:102:41 | Some(...) |  |
+| variables.rs:102:32:102:39 | "Hello!" | variables.rs:102:19:102:40 | ...::from(...) |  |
+| variables.rs:104:5:107:5 | while ... { ... } | variables.rs:101:19:108:1 | { ... } |  |
+| variables.rs:104:11:105:12 | let ... = s1 | variables.rs:105:11:105:12 | s1 |  |
+| variables.rs:104:15:104:26 | Some(...) | variables.rs:104:5:107:5 | while ... { ... } | no-match |
+| variables.rs:104:15:104:26 | Some(...) | variables.rs:104:20:104:25 | s2 | match |
 | variables.rs:104:20:104:25 | s2 | variables.rs:106:9:106:22 | ExprStmt | match |
-| variables.rs:105:11:105:12 | s1 | variables.rs:104:15:104:26 | TupleStructPat |  |
-| variables.rs:105:14:107:5 | BlockExpr | variables.rs:104:11:105:12 | LetExpr |  |
+| variables.rs:105:11:105:12 | s1 | variables.rs:104:15:104:26 | Some(...) |  |
+| variables.rs:105:14:107:5 | { ... } | variables.rs:104:11:105:12 | let ... = s1 |  |
 | variables.rs:106:9:106:17 | print_str | variables.rs:106:19:106:20 | s2 |  |
-| variables.rs:106:9:106:21 | CallExpr | variables.rs:105:14:107:5 | BlockExpr |  |
+| variables.rs:106:9:106:21 | print_str(...) | variables.rs:105:14:107:5 | { ... } |  |
 | variables.rs:106:9:106:22 | ExprStmt | variables.rs:106:9:106:17 | print_str |  |
-| variables.rs:106:19:106:20 | s2 | variables.rs:106:9:106:21 | CallExpr |  |
-| variables.rs:110:1:125:1 | enter match_pattern1 | variables.rs:111:5:111:21 | LetStmt |  |
-| variables.rs:110:1:125:1 | exit match_pattern1 (normal) | variables.rs:110:1:125:1 | exit match_pattern1 |  |
-| variables.rs:110:21:125:1 | BlockExpr | variables.rs:110:1:125:1 | exit match_pattern1 (normal) |  |
-| variables.rs:111:5:111:21 | LetStmt | variables.rs:111:14:111:17 | Some |  |
-| variables.rs:111:9:111:10 | x6 | variables.rs:112:5:112:16 | LetStmt | match |
+| variables.rs:106:19:106:20 | s2 | variables.rs:106:9:106:21 | print_str(...) |  |
+| variables.rs:110:1:125:1 | enter fn match_pattern1 | variables.rs:111:5:111:21 | let ... = ... |  |
+| variables.rs:110:1:125:1 | exit fn match_pattern1 (normal) | variables.rs:110:1:125:1 | exit fn match_pattern1 |  |
+| variables.rs:110:21:125:1 | { ... } | variables.rs:110:1:125:1 | exit fn match_pattern1 (normal) |  |
+| variables.rs:111:5:111:21 | let ... = ... | variables.rs:111:14:111:17 | Some |  |
+| variables.rs:111:9:111:10 | x6 | variables.rs:112:5:112:16 | let ... = 10 | match |
 | variables.rs:111:14:111:17 | Some | variables.rs:111:19:111:19 | 5 |  |
-| variables.rs:111:14:111:20 | CallExpr | variables.rs:111:9:111:10 | x6 |  |
-| variables.rs:111:19:111:19 | 5 | variables.rs:111:14:111:20 | CallExpr |  |
-| variables.rs:112:5:112:16 | LetStmt | variables.rs:112:14:112:15 | 10 |  |
+| variables.rs:111:14:111:20 | Some(...) | variables.rs:111:9:111:10 | x6 |  |
+| variables.rs:111:19:111:19 | 5 | variables.rs:111:14:111:20 | Some(...) |  |
+| variables.rs:112:5:112:16 | let ... = 10 | variables.rs:112:14:112:15 | 10 |  |
 | variables.rs:112:9:112:10 | y1 | variables.rs:114:5:122:5 | ExprStmt | match |
 | variables.rs:112:14:112:15 | 10 | variables.rs:112:9:112:10 | y1 |  |
 | variables.rs:114:5:122:5 | ExprStmt | variables.rs:114:11:114:12 | x6 |  |
-| variables.rs:114:5:122:5 | MatchExpr | variables.rs:124:5:124:18 | ExprStmt |  |
-| variables.rs:114:11:114:12 | x6 | variables.rs:115:9:115:16 | TupleStructPat |  |
-| variables.rs:115:9:115:16 | TupleStructPat | variables.rs:115:14:115:15 | 50 | match |
-| variables.rs:115:9:115:16 | TupleStructPat | variables.rs:116:9:116:16 | TupleStructPat | no-match |
-| variables.rs:115:14:115:15 | 50 | variables.rs:115:14:115:15 | LiteralPat |  |
-| variables.rs:115:14:115:15 | LiteralPat | variables.rs:115:21:115:29 | print_str | match |
-| variables.rs:115:14:115:15 | LiteralPat | variables.rs:116:9:116:16 | TupleStructPat | no-match |
+| variables.rs:114:5:122:5 | match x6 { ... } | variables.rs:124:5:124:18 | ExprStmt |  |
+| variables.rs:114:11:114:12 | x6 | variables.rs:115:9:115:16 | Some(...) |  |
+| variables.rs:115:9:115:16 | Some(...) | variables.rs:115:14:115:15 | 50 | match |
+| variables.rs:115:9:115:16 | Some(...) | variables.rs:116:9:116:16 | Some(...) | no-match |
+| variables.rs:115:14:115:15 | 50 | variables.rs:115:14:115:15 | 50 |  |
+| variables.rs:115:14:115:15 | 50 | variables.rs:115:21:115:29 | print_str | match |
+| variables.rs:115:14:115:15 | 50 | variables.rs:116:9:116:16 | Some(...) | no-match |
 | variables.rs:115:21:115:29 | print_str | variables.rs:115:31:115:38 | "Got 50" |  |
-| variables.rs:115:21:115:39 | CallExpr | variables.rs:114:5:122:5 | MatchExpr |  |
-| variables.rs:115:31:115:38 | "Got 50" | variables.rs:115:21:115:39 | CallExpr |  |
-| variables.rs:116:9:116:16 | TupleStructPat | variables.rs:116:14:116:15 | y1 | match |
-| variables.rs:116:9:116:16 | TupleStructPat | variables.rs:121:9:121:12 | None | no-match |
+| variables.rs:115:21:115:39 | print_str(...) | variables.rs:114:5:122:5 | match x6 { ... } |  |
+| variables.rs:115:31:115:38 | "Got 50" | variables.rs:115:21:115:39 | print_str(...) |  |
+| variables.rs:116:9:116:16 | Some(...) | variables.rs:116:14:116:15 | y1 | match |
+| variables.rs:116:9:116:16 | Some(...) | variables.rs:121:9:121:12 | None | no-match |
 | variables.rs:116:14:116:15 | y1 | variables.rs:119:13:119:21 | print_i64 | match |
-| variables.rs:118:9:120:9 | BlockExpr | variables.rs:114:5:122:5 | MatchExpr |  |
+| variables.rs:118:9:120:9 | { ... } | variables.rs:114:5:122:5 | match x6 { ... } |  |
 | variables.rs:119:13:119:21 | print_i64 | variables.rs:119:23:119:24 | y1 |  |
-| variables.rs:119:13:119:25 | CallExpr | variables.rs:118:9:120:9 | BlockExpr |  |
-| variables.rs:119:23:119:24 | y1 | variables.rs:119:13:119:25 | CallExpr |  |
+| variables.rs:119:13:119:25 | print_i64(...) | variables.rs:118:9:120:9 | { ... } |  |
+| variables.rs:119:23:119:24 | y1 | variables.rs:119:13:119:25 | print_i64(...) |  |
 | variables.rs:121:9:121:12 | None | variables.rs:121:17:121:25 | print_str | match |
 | variables.rs:121:17:121:25 | print_str | variables.rs:121:27:121:32 | "NONE" |  |
-| variables.rs:121:17:121:33 | CallExpr | variables.rs:114:5:122:5 | MatchExpr |  |
-| variables.rs:121:27:121:32 | "NONE" | variables.rs:121:17:121:33 | CallExpr |  |
+| variables.rs:121:17:121:33 | print_str(...) | variables.rs:114:5:122:5 | match x6 { ... } |  |
+| variables.rs:121:27:121:32 | "NONE" | variables.rs:121:17:121:33 | print_str(...) |  |
 | variables.rs:124:5:124:13 | print_i64 | variables.rs:124:15:124:16 | y1 |  |
-| variables.rs:124:5:124:17 | CallExpr | variables.rs:110:21:125:1 | BlockExpr |  |
+| variables.rs:124:5:124:17 | print_i64(...) | variables.rs:110:21:125:1 | { ... } |  |
 | variables.rs:124:5:124:18 | ExprStmt | variables.rs:124:5:124:13 | print_i64 |  |
-| variables.rs:124:15:124:16 | y1 | variables.rs:124:5:124:17 | CallExpr |  |
-| variables.rs:127:1:152:1 | enter match_pattern2 | variables.rs:128:5:128:36 | LetStmt |  |
-| variables.rs:127:1:152:1 | exit match_pattern2 (normal) | variables.rs:127:1:152:1 | exit match_pattern2 |  |
-| variables.rs:127:21:152:1 | BlockExpr | variables.rs:127:1:152:1 | exit match_pattern2 (normal) |  |
-| variables.rs:128:5:128:36 | LetStmt | variables.rs:128:20:128:20 | 2 |  |
+| variables.rs:124:15:124:16 | y1 | variables.rs:124:5:124:17 | print_i64(...) |  |
+| variables.rs:127:1:152:1 | enter fn match_pattern2 | variables.rs:128:5:128:36 | let ... = ... |  |
+| variables.rs:127:1:152:1 | exit fn match_pattern2 (normal) | variables.rs:127:1:152:1 | exit fn match_pattern2 |  |
+| variables.rs:127:21:152:1 | { ... } | variables.rs:127:1:152:1 | exit fn match_pattern2 (normal) |  |
+| variables.rs:128:5:128:36 | let ... = ... | variables.rs:128:20:128:20 | 2 |  |
 | variables.rs:128:9:128:15 | numbers | variables.rs:130:5:140:5 | ExprStmt | match |
 | variables.rs:128:19:128:35 | TupleExpr | variables.rs:128:9:128:15 | numbers |  |
 | variables.rs:128:20:128:20 | 2 | variables.rs:128:23:128:23 | 4 |  |
@@ -295,311 +295,311 @@ edges
 | variables.rs:128:29:128:30 | 16 | variables.rs:128:33:128:34 | 32 |  |
 | variables.rs:128:33:128:34 | 32 | variables.rs:128:19:128:35 | TupleExpr |  |
 | variables.rs:130:5:140:5 | ExprStmt | variables.rs:130:11:130:17 | numbers |  |
-| variables.rs:130:5:140:5 | MatchExpr | variables.rs:142:11:142:17 | numbers |  |
+| variables.rs:130:5:140:5 | match numbers { ... } | variables.rs:142:11:142:17 | numbers |  |
 | variables.rs:130:11:130:17 | numbers | variables.rs:131:9:135:9 | TuplePat |  |
 | variables.rs:131:9:135:9 | TuplePat | variables.rs:132:13:132:17 | first | match |
-| variables.rs:132:13:132:17 | first | variables.rs:132:20:132:20 | WildcardPat | match |
-| variables.rs:132:20:132:20 | WildcardPat | variables.rs:133:13:133:17 | third | match |
-| variables.rs:133:13:133:17 | third | variables.rs:133:20:133:20 | WildcardPat | match |
-| variables.rs:133:20:133:20 | WildcardPat | variables.rs:134:13:134:17 | fifth | match |
+| variables.rs:132:13:132:17 | first | variables.rs:132:20:132:20 | _ | match |
+| variables.rs:132:20:132:20 | _ | variables.rs:133:13:133:17 | third | match |
+| variables.rs:133:13:133:17 | third | variables.rs:133:20:133:20 | _ | match |
+| variables.rs:133:20:133:20 | _ | variables.rs:134:13:134:17 | fifth | match |
 | variables.rs:134:13:134:17 | fifth | variables.rs:136:13:136:29 | ExprStmt | match |
-| variables.rs:135:14:139:9 | BlockExpr | variables.rs:130:5:140:5 | MatchExpr |  |
+| variables.rs:135:14:139:9 | { ... } | variables.rs:130:5:140:5 | match numbers { ... } |  |
 | variables.rs:136:13:136:21 | print_i64 | variables.rs:136:23:136:27 | first |  |
-| variables.rs:136:13:136:28 | CallExpr | variables.rs:137:13:137:29 | ExprStmt |  |
+| variables.rs:136:13:136:28 | print_i64(...) | variables.rs:137:13:137:29 | ExprStmt |  |
 | variables.rs:136:13:136:29 | ExprStmt | variables.rs:136:13:136:21 | print_i64 |  |
-| variables.rs:136:23:136:27 | first | variables.rs:136:13:136:28 | CallExpr |  |
+| variables.rs:136:23:136:27 | first | variables.rs:136:13:136:28 | print_i64(...) |  |
 | variables.rs:137:13:137:21 | print_i64 | variables.rs:137:23:137:27 | third |  |
-| variables.rs:137:13:137:28 | CallExpr | variables.rs:138:13:138:29 | ExprStmt |  |
+| variables.rs:137:13:137:28 | print_i64(...) | variables.rs:138:13:138:29 | ExprStmt |  |
 | variables.rs:137:13:137:29 | ExprStmt | variables.rs:137:13:137:21 | print_i64 |  |
-| variables.rs:137:23:137:27 | third | variables.rs:137:13:137:28 | CallExpr |  |
+| variables.rs:137:23:137:27 | third | variables.rs:137:13:137:28 | print_i64(...) |  |
 | variables.rs:138:13:138:21 | print_i64 | variables.rs:138:23:138:27 | fifth |  |
-| variables.rs:138:13:138:28 | CallExpr | variables.rs:135:14:139:9 | BlockExpr |  |
+| variables.rs:138:13:138:28 | print_i64(...) | variables.rs:135:14:139:9 | { ... } |  |
 | variables.rs:138:13:138:29 | ExprStmt | variables.rs:138:13:138:21 | print_i64 |  |
-| variables.rs:138:23:138:27 | fifth | variables.rs:138:13:138:28 | CallExpr |  |
-| variables.rs:142:5:151:5 | MatchExpr | variables.rs:127:21:152:1 | BlockExpr |  |
+| variables.rs:138:23:138:27 | fifth | variables.rs:138:13:138:28 | print_i64(...) |  |
+| variables.rs:142:5:151:5 | match numbers { ... } | variables.rs:127:21:152:1 | { ... } |  |
 | variables.rs:142:11:142:17 | numbers | variables.rs:143:9:147:9 | TuplePat |  |
 | variables.rs:143:9:147:9 | TuplePat | variables.rs:144:13:144:17 | first | match |
-| variables.rs:144:13:144:17 | first | variables.rs:145:13:145:14 | RestPat | match |
-| variables.rs:145:13:145:14 | RestPat | variables.rs:146:13:146:16 | last | match |
+| variables.rs:144:13:144:17 | first | variables.rs:145:13:145:14 | .. | match |
+| variables.rs:145:13:145:14 | .. | variables.rs:146:13:146:16 | last | match |
 | variables.rs:146:13:146:16 | last | variables.rs:148:13:148:29 | ExprStmt | match |
-| variables.rs:147:14:150:9 | BlockExpr | variables.rs:142:5:151:5 | MatchExpr |  |
+| variables.rs:147:14:150:9 | { ... } | variables.rs:142:5:151:5 | match numbers { ... } |  |
 | variables.rs:148:13:148:21 | print_i64 | variables.rs:148:23:148:27 | first |  |
-| variables.rs:148:13:148:28 | CallExpr | variables.rs:149:13:149:28 | ExprStmt |  |
+| variables.rs:148:13:148:28 | print_i64(...) | variables.rs:149:13:149:28 | ExprStmt |  |
 | variables.rs:148:13:148:29 | ExprStmt | variables.rs:148:13:148:21 | print_i64 |  |
-| variables.rs:148:23:148:27 | first | variables.rs:148:13:148:28 | CallExpr |  |
+| variables.rs:148:23:148:27 | first | variables.rs:148:13:148:28 | print_i64(...) |  |
 | variables.rs:149:13:149:21 | print_i64 | variables.rs:149:23:149:26 | last |  |
-| variables.rs:149:13:149:27 | CallExpr | variables.rs:147:14:150:9 | BlockExpr |  |
+| variables.rs:149:13:149:27 | print_i64(...) | variables.rs:147:14:150:9 | { ... } |  |
 | variables.rs:149:13:149:28 | ExprStmt | variables.rs:149:13:149:21 | print_i64 |  |
-| variables.rs:149:23:149:26 | last | variables.rs:149:13:149:27 | CallExpr |  |
-| variables.rs:154:1:162:1 | enter match_pattern3 | variables.rs:155:5:155:38 | LetStmt |  |
-| variables.rs:154:1:162:1 | exit match_pattern3 (normal) | variables.rs:154:1:162:1 | exit match_pattern3 |  |
-| variables.rs:154:21:162:1 | BlockExpr | variables.rs:154:1:162:1 | exit match_pattern3 (normal) |  |
-| variables.rs:155:5:155:38 | LetStmt | variables.rs:155:25:155:27 | "x" |  |
+| variables.rs:149:23:149:26 | last | variables.rs:149:13:149:27 | print_i64(...) |  |
+| variables.rs:154:1:162:1 | enter fn match_pattern3 | variables.rs:155:5:155:38 | let ... = ... |  |
+| variables.rs:154:1:162:1 | exit fn match_pattern3 (normal) | variables.rs:154:1:162:1 | exit fn match_pattern3 |  |
+| variables.rs:154:21:162:1 | { ... } | variables.rs:154:1:162:1 | exit fn match_pattern3 (normal) |  |
+| variables.rs:155:5:155:38 | let ... = ... | variables.rs:155:25:155:27 | "x" |  |
 | variables.rs:155:9:155:10 | p2 | variables.rs:157:11:157:12 | p2 | match |
-| variables.rs:155:14:155:37 | RecordExpr | variables.rs:155:9:155:10 | p2 |  |
+| variables.rs:155:14:155:37 | Point {...} | variables.rs:155:9:155:10 | p2 |  |
 | variables.rs:155:25:155:27 | "x" | variables.rs:155:33:155:35 | "y" |  |
-| variables.rs:155:33:155:35 | "y" | variables.rs:155:14:155:37 | RecordExpr |  |
-| variables.rs:157:5:161:5 | MatchExpr | variables.rs:154:21:162:1 | BlockExpr |  |
-| variables.rs:157:11:157:12 | p2 | variables.rs:158:9:160:9 | RecordPat |  |
-| variables.rs:158:9:160:9 | RecordPat | variables.rs:159:16:159:17 | x7 | match |
-| variables.rs:159:16:159:17 | x7 | variables.rs:159:20:159:21 | RestPat | match |
-| variables.rs:159:20:159:21 | RestPat | variables.rs:160:14:160:22 | print_str | match |
+| variables.rs:155:33:155:35 | "y" | variables.rs:155:14:155:37 | Point {...} |  |
+| variables.rs:157:5:161:5 | match p2 { ... } | variables.rs:154:21:162:1 | { ... } |  |
+| variables.rs:157:11:157:12 | p2 | variables.rs:158:9:160:9 | Point {...} |  |
+| variables.rs:158:9:160:9 | Point {...} | variables.rs:159:16:159:17 | x7 | match |
+| variables.rs:159:16:159:17 | x7 | variables.rs:159:20:159:21 | .. | match |
+| variables.rs:159:20:159:21 | .. | variables.rs:160:14:160:22 | print_str | match |
 | variables.rs:160:14:160:22 | print_str | variables.rs:160:24:160:25 | x7 |  |
-| variables.rs:160:14:160:26 | CallExpr | variables.rs:157:5:161:5 | MatchExpr |  |
-| variables.rs:160:24:160:25 | x7 | variables.rs:160:14:160:26 | CallExpr |  |
-| variables.rs:168:1:181:1 | enter match_pattern4 | variables.rs:169:5:169:39 | LetStmt |  |
-| variables.rs:168:1:181:1 | exit match_pattern4 (normal) | variables.rs:168:1:181:1 | exit match_pattern4 |  |
-| variables.rs:168:21:181:1 | BlockExpr | variables.rs:168:1:181:1 | exit match_pattern4 (normal) |  |
-| variables.rs:169:5:169:39 | LetStmt | variables.rs:169:36:169:36 | 0 |  |
+| variables.rs:160:14:160:26 | print_str(...) | variables.rs:157:5:161:5 | match p2 { ... } |  |
+| variables.rs:160:24:160:25 | x7 | variables.rs:160:14:160:26 | print_str(...) |  |
+| variables.rs:168:1:181:1 | enter fn match_pattern4 | variables.rs:169:5:169:39 | let ... = ... |  |
+| variables.rs:168:1:181:1 | exit fn match_pattern4 (normal) | variables.rs:168:1:181:1 | exit fn match_pattern4 |  |
+| variables.rs:168:21:181:1 | { ... } | variables.rs:168:1:181:1 | exit fn match_pattern4 (normal) |  |
+| variables.rs:169:5:169:39 | let ... = ... | variables.rs:169:36:169:36 | 0 |  |
 | variables.rs:169:9:169:11 | msg | variables.rs:171:11:171:13 | msg | match |
-| variables.rs:169:15:169:38 | RecordExpr | variables.rs:169:9:169:11 | msg |  |
-| variables.rs:169:36:169:36 | 0 | variables.rs:169:15:169:38 | RecordExpr |  |
-| variables.rs:171:5:180:5 | MatchExpr | variables.rs:168:21:181:1 | BlockExpr |  |
-| variables.rs:171:11:171:13 | msg | variables.rs:172:9:174:9 | RecordPat |  |
-| variables.rs:172:9:174:9 | RecordPat | variables.rs:173:31:173:35 | RangePat | match |
-| variables.rs:172:9:174:9 | RecordPat | variables.rs:175:9:175:38 | RecordPat | no-match |
+| variables.rs:169:15:169:38 | ...::Hello {...} | variables.rs:169:9:169:11 | msg |  |
+| variables.rs:169:36:169:36 | 0 | variables.rs:169:15:169:38 | ...::Hello {...} |  |
+| variables.rs:171:5:180:5 | match msg { ... } | variables.rs:168:21:181:1 | { ... } |  |
+| variables.rs:171:11:171:13 | msg | variables.rs:172:9:174:9 | ...::Hello {...} |  |
+| variables.rs:172:9:174:9 | ...::Hello {...} | variables.rs:173:31:173:35 | RangePat | match |
+| variables.rs:172:9:174:9 | ...::Hello {...} | variables.rs:175:9:175:38 | ...::Hello {...} | no-match |
 | variables.rs:173:17:173:35 | [match(true)] id_variable | variables.rs:174:14:174:22 | print_i64 | match |
-| variables.rs:173:31:173:31 | 3 | variables.rs:173:31:173:31 | LiteralPat |  |
-| variables.rs:173:31:173:31 | LiteralPat | variables.rs:173:35:173:35 | 7 | match |
-| variables.rs:173:31:173:31 | LiteralPat | variables.rs:175:9:175:38 | RecordPat | no-match |
+| variables.rs:173:31:173:31 | 3 | variables.rs:173:31:173:31 | 3 |  |
+| variables.rs:173:31:173:31 | 3 | variables.rs:173:35:173:35 | 7 | match |
+| variables.rs:173:31:173:31 | 3 | variables.rs:175:9:175:38 | ...::Hello {...} | no-match |
 | variables.rs:173:31:173:35 | RangePat | variables.rs:173:31:173:31 | 3 | match |
-| variables.rs:173:31:173:35 | RangePat | variables.rs:175:9:175:38 | RecordPat | no-match |
-| variables.rs:173:35:173:35 | 7 | variables.rs:173:35:173:35 | LiteralPat |  |
-| variables.rs:173:35:173:35 | LiteralPat | variables.rs:173:17:173:35 | [match(true)] id_variable | match |
-| variables.rs:173:35:173:35 | LiteralPat | variables.rs:175:9:175:38 | RecordPat | no-match |
+| variables.rs:173:31:173:35 | RangePat | variables.rs:175:9:175:38 | ...::Hello {...} | no-match |
+| variables.rs:173:35:173:35 | 7 | variables.rs:173:17:173:35 | [match(true)] id_variable | match |
+| variables.rs:173:35:173:35 | 7 | variables.rs:173:35:173:35 | 7 |  |
+| variables.rs:173:35:173:35 | 7 | variables.rs:175:9:175:38 | ...::Hello {...} | no-match |
 | variables.rs:174:14:174:22 | print_i64 | variables.rs:174:24:174:34 | id_variable |  |
-| variables.rs:174:14:174:35 | CallExpr | variables.rs:171:5:180:5 | MatchExpr |  |
-| variables.rs:174:24:174:34 | id_variable | variables.rs:174:14:174:35 | CallExpr |  |
-| variables.rs:175:9:175:38 | RecordPat | variables.rs:175:30:175:36 | RangePat | match |
-| variables.rs:175:9:175:38 | RecordPat | variables.rs:178:9:178:29 | RecordPat | no-match |
-| variables.rs:175:30:175:31 | 10 | variables.rs:175:30:175:31 | LiteralPat |  |
-| variables.rs:175:30:175:31 | LiteralPat | variables.rs:175:35:175:36 | 12 | match |
-| variables.rs:175:30:175:31 | LiteralPat | variables.rs:178:9:178:29 | RecordPat | no-match |
+| variables.rs:174:14:174:35 | print_i64(...) | variables.rs:171:5:180:5 | match msg { ... } |  |
+| variables.rs:174:24:174:34 | id_variable | variables.rs:174:14:174:35 | print_i64(...) |  |
+| variables.rs:175:9:175:38 | ...::Hello {...} | variables.rs:175:30:175:36 | RangePat | match |
+| variables.rs:175:9:175:38 | ...::Hello {...} | variables.rs:178:9:178:29 | ...::Hello {...} | no-match |
+| variables.rs:175:30:175:31 | 10 | variables.rs:175:30:175:31 | 10 |  |
+| variables.rs:175:30:175:31 | 10 | variables.rs:175:35:175:36 | 12 | match |
+| variables.rs:175:30:175:31 | 10 | variables.rs:178:9:178:29 | ...::Hello {...} | no-match |
 | variables.rs:175:30:175:36 | RangePat | variables.rs:175:30:175:31 | 10 | match |
-| variables.rs:175:30:175:36 | RangePat | variables.rs:178:9:178:29 | RecordPat | no-match |
-| variables.rs:175:35:175:36 | 12 | variables.rs:175:35:175:36 | LiteralPat |  |
-| variables.rs:175:35:175:36 | LiteralPat | variables.rs:176:22:176:51 | MacroStmts | match |
-| variables.rs:175:35:175:36 | LiteralPat | variables.rs:178:9:178:29 | RecordPat | no-match |
-| variables.rs:175:43:177:9 | BlockExpr | variables.rs:171:5:180:5 | MatchExpr |  |
-| variables.rs:176:13:176:52 | $crate::io::_print | variables.rs:176:22:176:51 | "Found an id in another range\\n" |  |
-| variables.rs:176:13:176:52 | MacroExpr | variables.rs:175:43:177:9 | BlockExpr |  |
-| variables.rs:176:22:176:51 | "Found an id in another range\\n" | variables.rs:176:22:176:51 | FormatArgsExpr |  |
-| variables.rs:176:22:176:51 | BlockExpr | variables.rs:176:13:176:52 | MacroExpr |  |
-| variables.rs:176:22:176:51 | CallExpr | variables.rs:176:22:176:51 | BlockExpr |  |
-| variables.rs:176:22:176:51 | ExprStmt | variables.rs:176:13:176:52 | $crate::io::_print |  |
+| variables.rs:175:30:175:36 | RangePat | variables.rs:178:9:178:29 | ...::Hello {...} | no-match |
+| variables.rs:175:35:175:36 | 12 | variables.rs:175:35:175:36 | 12 |  |
+| variables.rs:175:35:175:36 | 12 | variables.rs:176:22:176:51 | MacroStmts | match |
+| variables.rs:175:35:175:36 | 12 | variables.rs:178:9:178:29 | ...::Hello {...} | no-match |
+| variables.rs:175:43:177:9 | { ... } | variables.rs:171:5:180:5 | match msg { ... } |  |
+| variables.rs:176:13:176:52 | ...::_print | variables.rs:176:22:176:51 | "Found an id in another range\\... |  |
+| variables.rs:176:13:176:52 | MacroExpr | variables.rs:175:43:177:9 | { ... } |  |
+| variables.rs:176:22:176:51 | "Found an id in another range\\... | variables.rs:176:22:176:51 | FormatArgsExpr |  |
+| variables.rs:176:22:176:51 | ...::_print(...) | variables.rs:176:22:176:51 | { ... } |  |
+| variables.rs:176:22:176:51 | ExprStmt | variables.rs:176:13:176:52 | ...::_print |  |
 | variables.rs:176:22:176:51 | FormatArgsExpr | variables.rs:176:22:176:51 | MacroExpr |  |
-| variables.rs:176:22:176:51 | MacroExpr | variables.rs:176:22:176:51 | CallExpr |  |
+| variables.rs:176:22:176:51 | MacroExpr | variables.rs:176:22:176:51 | ...::_print(...) |  |
 | variables.rs:176:22:176:51 | MacroStmts | variables.rs:176:22:176:51 | ExprStmt |  |
-| variables.rs:178:9:178:29 | RecordPat | variables.rs:178:26:178:27 | id | match |
+| variables.rs:176:22:176:51 | { ... } | variables.rs:176:13:176:52 | MacroExpr |  |
+| variables.rs:178:9:178:29 | ...::Hello {...} | variables.rs:178:26:178:27 | id | match |
 | variables.rs:178:26:178:27 | id | variables.rs:179:13:179:21 | print_i64 | match |
 | variables.rs:179:13:179:21 | print_i64 | variables.rs:179:23:179:24 | id |  |
-| variables.rs:179:13:179:25 | CallExpr | variables.rs:171:5:180:5 | MatchExpr |  |
-| variables.rs:179:23:179:24 | id | variables.rs:179:13:179:25 | CallExpr |  |
-| variables.rs:188:1:194:1 | enter match_pattern5 | variables.rs:189:5:189:34 | LetStmt |  |
-| variables.rs:188:1:194:1 | exit match_pattern5 (normal) | variables.rs:188:1:194:1 | exit match_pattern5 |  |
-| variables.rs:188:21:194:1 | BlockExpr | variables.rs:188:1:194:1 | exit match_pattern5 (normal) |  |
-| variables.rs:189:5:189:34 | LetStmt | variables.rs:189:18:189:29 | Either::Left |  |
+| variables.rs:179:13:179:25 | print_i64(...) | variables.rs:171:5:180:5 | match msg { ... } |  |
+| variables.rs:179:23:179:24 | id | variables.rs:179:13:179:25 | print_i64(...) |  |
+| variables.rs:188:1:194:1 | enter fn match_pattern5 | variables.rs:189:5:189:34 | let ... = ... |  |
+| variables.rs:188:1:194:1 | exit fn match_pattern5 (normal) | variables.rs:188:1:194:1 | exit fn match_pattern5 |  |
+| variables.rs:188:21:194:1 | { ... } | variables.rs:188:1:194:1 | exit fn match_pattern5 (normal) |  |
+| variables.rs:189:5:189:34 | let ... = ... | variables.rs:189:18:189:29 | ...::Left |  |
 | variables.rs:189:9:189:14 | either | variables.rs:190:11:190:16 | either | match |
-| variables.rs:189:18:189:29 | Either::Left | variables.rs:189:31:189:32 | 32 |  |
-| variables.rs:189:18:189:33 | CallExpr | variables.rs:189:9:189:14 | either |  |
-| variables.rs:189:31:189:32 | 32 | variables.rs:189:18:189:33 | CallExpr |  |
-| variables.rs:190:5:193:5 | MatchExpr | variables.rs:188:21:194:1 | BlockExpr |  |
-| variables.rs:190:11:190:16 | either | variables.rs:191:9:191:24 | TupleStructPat |  |
-| variables.rs:191:9:191:24 | TupleStructPat | variables.rs:191:22:191:23 | a3 | match |
-| variables.rs:191:9:191:24 | TupleStructPat | variables.rs:191:28:191:44 | TupleStructPat | no-match |
-| variables.rs:191:9:191:44 | [match(true)] OrPat | variables.rs:192:16:192:24 | print_i64 | match |
-| variables.rs:191:22:191:23 | a3 | variables.rs:191:9:191:44 | [match(true)] OrPat | match |
-| variables.rs:191:28:191:44 | TupleStructPat | variables.rs:191:42:191:43 | a3 | match |
-| variables.rs:191:42:191:43 | a3 | variables.rs:191:9:191:44 | [match(true)] OrPat | match |
+| variables.rs:189:18:189:29 | ...::Left | variables.rs:189:31:189:32 | 32 |  |
+| variables.rs:189:18:189:33 | ...::Left(...) | variables.rs:189:9:189:14 | either |  |
+| variables.rs:189:31:189:32 | 32 | variables.rs:189:18:189:33 | ...::Left(...) |  |
+| variables.rs:190:5:193:5 | match either { ... } | variables.rs:188:21:194:1 | { ... } |  |
+| variables.rs:190:11:190:16 | either | variables.rs:191:9:191:24 | ...::Left(...) |  |
+| variables.rs:191:9:191:24 | ...::Left(...) | variables.rs:191:22:191:23 | a3 | match |
+| variables.rs:191:9:191:24 | ...::Left(...) | variables.rs:191:28:191:44 | ...::Right(...) | no-match |
+| variables.rs:191:9:191:44 | [match(true)] ... \| ... | variables.rs:192:16:192:24 | print_i64 | match |
+| variables.rs:191:22:191:23 | a3 | variables.rs:191:9:191:44 | [match(true)] ... \| ... | match |
+| variables.rs:191:28:191:44 | ...::Right(...) | variables.rs:191:42:191:43 | a3 | match |
+| variables.rs:191:42:191:43 | a3 | variables.rs:191:9:191:44 | [match(true)] ... \| ... | match |
 | variables.rs:192:16:192:24 | print_i64 | variables.rs:192:26:192:27 | a3 |  |
-| variables.rs:192:16:192:28 | CallExpr | variables.rs:190:5:193:5 | MatchExpr |  |
-| variables.rs:192:26:192:27 | a3 | variables.rs:192:16:192:28 | CallExpr |  |
-| variables.rs:202:1:216:1 | enter match_pattern6 | variables.rs:203:5:203:37 | LetStmt |  |
-| variables.rs:202:1:216:1 | exit match_pattern6 (normal) | variables.rs:202:1:216:1 | exit match_pattern6 |  |
-| variables.rs:202:21:216:1 | BlockExpr | variables.rs:202:1:216:1 | exit match_pattern6 (normal) |  |
-| variables.rs:203:5:203:37 | LetStmt | variables.rs:203:14:203:32 | ThreeValued::Second |  |
+| variables.rs:192:16:192:28 | print_i64(...) | variables.rs:190:5:193:5 | match either { ... } |  |
+| variables.rs:192:26:192:27 | a3 | variables.rs:192:16:192:28 | print_i64(...) |  |
+| variables.rs:202:1:216:1 | enter fn match_pattern6 | variables.rs:203:5:203:37 | let ... = ... |  |
+| variables.rs:202:1:216:1 | exit fn match_pattern6 (normal) | variables.rs:202:1:216:1 | exit fn match_pattern6 |  |
+| variables.rs:202:21:216:1 | { ... } | variables.rs:202:1:216:1 | exit fn match_pattern6 (normal) |  |
+| variables.rs:203:5:203:37 | let ... = ... | variables.rs:203:14:203:32 | ...::Second |  |
 | variables.rs:203:9:203:10 | tv | variables.rs:204:5:207:5 | ExprStmt | match |
-| variables.rs:203:14:203:32 | ThreeValued::Second | variables.rs:203:34:203:35 | 62 |  |
-| variables.rs:203:14:203:36 | CallExpr | variables.rs:203:9:203:10 | tv |  |
-| variables.rs:203:34:203:35 | 62 | variables.rs:203:14:203:36 | CallExpr |  |
+| variables.rs:203:14:203:32 | ...::Second | variables.rs:203:34:203:35 | 62 |  |
+| variables.rs:203:14:203:36 | ...::Second(...) | variables.rs:203:9:203:10 | tv |  |
+| variables.rs:203:34:203:35 | 62 | variables.rs:203:14:203:36 | ...::Second(...) |  |
 | variables.rs:204:5:207:5 | ExprStmt | variables.rs:204:11:204:12 | tv |  |
-| variables.rs:204:5:207:5 | MatchExpr | variables.rs:208:5:211:5 | ExprStmt |  |
-| variables.rs:204:11:204:12 | tv | variables.rs:205:9:205:30 | TupleStructPat |  |
-| variables.rs:205:9:205:30 | TupleStructPat | variables.rs:205:28:205:29 | a4 | match |
-| variables.rs:205:9:205:30 | TupleStructPat | variables.rs:205:34:205:56 | TupleStructPat | no-match |
-| variables.rs:205:9:205:81 | [match(true)] OrPat | variables.rs:206:16:206:24 | print_i64 | match |
-| variables.rs:205:28:205:29 | a4 | variables.rs:205:9:205:81 | [match(true)] OrPat | match |
-| variables.rs:205:34:205:56 | TupleStructPat | variables.rs:205:54:205:55 | a4 | match |
-| variables.rs:205:34:205:56 | TupleStructPat | variables.rs:205:60:205:81 | TupleStructPat | no-match |
-| variables.rs:205:54:205:55 | a4 | variables.rs:205:9:205:81 | [match(true)] OrPat | match |
-| variables.rs:205:60:205:81 | TupleStructPat | variables.rs:205:79:205:80 | a4 | match |
-| variables.rs:205:79:205:80 | a4 | variables.rs:205:9:205:81 | [match(true)] OrPat | match |
+| variables.rs:204:5:207:5 | match tv { ... } | variables.rs:208:5:211:5 | ExprStmt |  |
+| variables.rs:204:11:204:12 | tv | variables.rs:205:9:205:30 | ...::First(...) |  |
+| variables.rs:205:9:205:30 | ...::First(...) | variables.rs:205:28:205:29 | a4 | match |
+| variables.rs:205:9:205:30 | ...::First(...) | variables.rs:205:34:205:56 | ...::Second(...) | no-match |
+| variables.rs:205:9:205:81 | [match(true)] ... \| ... \| ... | variables.rs:206:16:206:24 | print_i64 | match |
+| variables.rs:205:28:205:29 | a4 | variables.rs:205:9:205:81 | [match(true)] ... \| ... \| ... | match |
+| variables.rs:205:34:205:56 | ...::Second(...) | variables.rs:205:54:205:55 | a4 | match |
+| variables.rs:205:34:205:56 | ...::Second(...) | variables.rs:205:60:205:81 | ...::Third(...) | no-match |
+| variables.rs:205:54:205:55 | a4 | variables.rs:205:9:205:81 | [match(true)] ... \| ... \| ... | match |
+| variables.rs:205:60:205:81 | ...::Third(...) | variables.rs:205:79:205:80 | a4 | match |
+| variables.rs:205:79:205:80 | a4 | variables.rs:205:9:205:81 | [match(true)] ... \| ... \| ... | match |
 | variables.rs:206:16:206:24 | print_i64 | variables.rs:206:26:206:27 | a4 |  |
-| variables.rs:206:16:206:28 | CallExpr | variables.rs:204:5:207:5 | MatchExpr |  |
-| variables.rs:206:26:206:27 | a4 | variables.rs:206:16:206:28 | CallExpr |  |
+| variables.rs:206:16:206:28 | print_i64(...) | variables.rs:204:5:207:5 | match tv { ... } |  |
+| variables.rs:206:26:206:27 | a4 | variables.rs:206:16:206:28 | print_i64(...) |  |
 | variables.rs:208:5:211:5 | ExprStmt | variables.rs:208:11:208:12 | tv |  |
-| variables.rs:208:5:211:5 | MatchExpr | variables.rs:212:11:212:12 | tv |  |
-| variables.rs:208:11:208:12 | tv | variables.rs:209:10:209:31 | TupleStructPat |  |
-| variables.rs:209:9:209:83 | [match(true)] OrPat | variables.rs:210:16:210:24 | print_i64 | match |
-| variables.rs:209:10:209:31 | TupleStructPat | variables.rs:209:29:209:30 | a5 | match |
-| variables.rs:209:10:209:31 | TupleStructPat | variables.rs:209:35:209:57 | TupleStructPat | no-match |
-| variables.rs:209:10:209:57 | [match(false)] OrPat | variables.rs:209:62:209:83 | TupleStructPat | no-match |
-| variables.rs:209:10:209:57 | [match(true)] OrPat | variables.rs:209:9:209:83 | [match(true)] OrPat | match |
-| variables.rs:209:29:209:30 | a5 | variables.rs:209:10:209:57 | [match(true)] OrPat | match |
-| variables.rs:209:35:209:57 | TupleStructPat | variables.rs:209:10:209:57 | [match(false)] OrPat | no-match |
-| variables.rs:209:35:209:57 | TupleStructPat | variables.rs:209:55:209:56 | a5 | match |
-| variables.rs:209:55:209:56 | a5 | variables.rs:209:10:209:57 | [match(true)] OrPat | match |
-| variables.rs:209:62:209:83 | TupleStructPat | variables.rs:209:81:209:82 | a5 | match |
-| variables.rs:209:81:209:82 | a5 | variables.rs:209:9:209:83 | [match(true)] OrPat | match |
+| variables.rs:208:5:211:5 | match tv { ... } | variables.rs:212:11:212:12 | tv |  |
+| variables.rs:208:11:208:12 | tv | variables.rs:209:10:209:31 | ...::First(...) |  |
+| variables.rs:209:9:209:83 | [match(true)] ... \| ... | variables.rs:210:16:210:24 | print_i64 | match |
+| variables.rs:209:10:209:31 | ...::First(...) | variables.rs:209:29:209:30 | a5 | match |
+| variables.rs:209:10:209:31 | ...::First(...) | variables.rs:209:35:209:57 | ...::Second(...) | no-match |
+| variables.rs:209:10:209:57 | [match(false)] ... \| ... | variables.rs:209:62:209:83 | ...::Third(...) | no-match |
+| variables.rs:209:10:209:57 | [match(true)] ... \| ... | variables.rs:209:9:209:83 | [match(true)] ... \| ... | match |
+| variables.rs:209:29:209:30 | a5 | variables.rs:209:10:209:57 | [match(true)] ... \| ... | match |
+| variables.rs:209:35:209:57 | ...::Second(...) | variables.rs:209:10:209:57 | [match(false)] ... \| ... | no-match |
+| variables.rs:209:35:209:57 | ...::Second(...) | variables.rs:209:55:209:56 | a5 | match |
+| variables.rs:209:55:209:56 | a5 | variables.rs:209:10:209:57 | [match(true)] ... \| ... | match |
+| variables.rs:209:62:209:83 | ...::Third(...) | variables.rs:209:81:209:82 | a5 | match |
+| variables.rs:209:81:209:82 | a5 | variables.rs:209:9:209:83 | [match(true)] ... \| ... | match |
 | variables.rs:210:16:210:24 | print_i64 | variables.rs:210:26:210:27 | a5 |  |
-| variables.rs:210:16:210:28 | CallExpr | variables.rs:208:5:211:5 | MatchExpr |  |
-| variables.rs:210:26:210:27 | a5 | variables.rs:210:16:210:28 | CallExpr |  |
-| variables.rs:212:5:215:5 | MatchExpr | variables.rs:202:21:216:1 | BlockExpr |  |
-| variables.rs:212:11:212:12 | tv | variables.rs:213:9:213:30 | TupleStructPat |  |
-| variables.rs:213:9:213:30 | TupleStructPat | variables.rs:213:28:213:29 | a6 | match |
-| variables.rs:213:9:213:30 | TupleStructPat | variables.rs:213:35:213:57 | TupleStructPat | no-match |
-| variables.rs:213:9:213:83 | [match(true)] OrPat | variables.rs:214:16:214:24 | print_i64 | match |
-| variables.rs:213:28:213:29 | a6 | variables.rs:213:9:213:83 | [match(true)] OrPat | match |
-| variables.rs:213:35:213:57 | TupleStructPat | variables.rs:213:55:213:56 | a6 | match |
-| variables.rs:213:35:213:57 | TupleStructPat | variables.rs:213:61:213:82 | TupleStructPat | no-match |
-| variables.rs:213:35:213:82 | [match(true)] OrPat | variables.rs:213:9:213:83 | [match(true)] OrPat | match |
-| variables.rs:213:55:213:56 | a6 | variables.rs:213:35:213:82 | [match(true)] OrPat | match |
-| variables.rs:213:61:213:82 | TupleStructPat | variables.rs:213:80:213:81 | a6 | match |
-| variables.rs:213:80:213:81 | a6 | variables.rs:213:35:213:82 | [match(true)] OrPat | match |
+| variables.rs:210:16:210:28 | print_i64(...) | variables.rs:208:5:211:5 | match tv { ... } |  |
+| variables.rs:210:26:210:27 | a5 | variables.rs:210:16:210:28 | print_i64(...) |  |
+| variables.rs:212:5:215:5 | match tv { ... } | variables.rs:202:21:216:1 | { ... } |  |
+| variables.rs:212:11:212:12 | tv | variables.rs:213:9:213:30 | ...::First(...) |  |
+| variables.rs:213:9:213:30 | ...::First(...) | variables.rs:213:28:213:29 | a6 | match |
+| variables.rs:213:9:213:30 | ...::First(...) | variables.rs:213:35:213:57 | ...::Second(...) | no-match |
+| variables.rs:213:9:213:83 | [match(true)] ... \| ... | variables.rs:214:16:214:24 | print_i64 | match |
+| variables.rs:213:28:213:29 | a6 | variables.rs:213:9:213:83 | [match(true)] ... \| ... | match |
+| variables.rs:213:35:213:57 | ...::Second(...) | variables.rs:213:55:213:56 | a6 | match |
+| variables.rs:213:35:213:57 | ...::Second(...) | variables.rs:213:61:213:82 | ...::Third(...) | no-match |
+| variables.rs:213:35:213:82 | [match(true)] ... \| ... | variables.rs:213:9:213:83 | [match(true)] ... \| ... | match |
+| variables.rs:213:55:213:56 | a6 | variables.rs:213:35:213:82 | [match(true)] ... \| ... | match |
+| variables.rs:213:61:213:82 | ...::Third(...) | variables.rs:213:80:213:81 | a6 | match |
+| variables.rs:213:80:213:81 | a6 | variables.rs:213:35:213:82 | [match(true)] ... \| ... | match |
 | variables.rs:214:16:214:24 | print_i64 | variables.rs:214:26:214:27 | a6 |  |
-| variables.rs:214:16:214:28 | CallExpr | variables.rs:212:5:215:5 | MatchExpr |  |
-| variables.rs:214:26:214:27 | a6 | variables.rs:214:16:214:28 | CallExpr |  |
-| variables.rs:218:1:226:1 | enter match_pattern7 | variables.rs:219:5:219:34 | LetStmt |  |
-| variables.rs:218:1:226:1 | exit match_pattern7 (normal) | variables.rs:218:1:226:1 | exit match_pattern7 |  |
-| variables.rs:218:21:226:1 | BlockExpr | variables.rs:218:1:226:1 | exit match_pattern7 (normal) |  |
-| variables.rs:219:5:219:34 | LetStmt | variables.rs:219:18:219:29 | Either::Left |  |
+| variables.rs:214:16:214:28 | print_i64(...) | variables.rs:212:5:215:5 | match tv { ... } |  |
+| variables.rs:214:26:214:27 | a6 | variables.rs:214:16:214:28 | print_i64(...) |  |
+| variables.rs:218:1:226:1 | enter fn match_pattern7 | variables.rs:219:5:219:34 | let ... = ... |  |
+| variables.rs:218:1:226:1 | exit fn match_pattern7 (normal) | variables.rs:218:1:226:1 | exit fn match_pattern7 |  |
+| variables.rs:218:21:226:1 | { ... } | variables.rs:218:1:226:1 | exit fn match_pattern7 (normal) |  |
+| variables.rs:219:5:219:34 | let ... = ... | variables.rs:219:18:219:29 | ...::Left |  |
 | variables.rs:219:9:219:14 | either | variables.rs:220:11:220:16 | either | match |
-| variables.rs:219:18:219:29 | Either::Left | variables.rs:219:31:219:32 | 32 |  |
-| variables.rs:219:18:219:33 | CallExpr | variables.rs:219:9:219:14 | either |  |
-| variables.rs:219:31:219:32 | 32 | variables.rs:219:18:219:33 | CallExpr |  |
-| variables.rs:220:5:225:5 | MatchExpr | variables.rs:218:21:226:1 | BlockExpr |  |
-| variables.rs:220:11:220:16 | either | variables.rs:221:9:221:24 | TupleStructPat |  |
-| variables.rs:221:9:221:24 | TupleStructPat | variables.rs:221:22:221:23 | a7 | match |
-| variables.rs:221:9:221:24 | TupleStructPat | variables.rs:221:28:221:44 | TupleStructPat | no-match |
-| variables.rs:221:9:221:44 | [match(false)] OrPat | variables.rs:224:9:224:9 | WildcardPat | no-match |
-| variables.rs:221:9:221:44 | [match(true)] OrPat | variables.rs:222:16:222:17 | a7 | match |
-| variables.rs:221:22:221:23 | a7 | variables.rs:221:9:221:44 | [match(true)] OrPat | match |
-| variables.rs:221:28:221:44 | TupleStructPat | variables.rs:221:9:221:44 | [match(false)] OrPat | no-match |
-| variables.rs:221:28:221:44 | TupleStructPat | variables.rs:221:42:221:43 | a7 | match |
-| variables.rs:221:42:221:43 | a7 | variables.rs:221:9:221:44 | [match(true)] OrPat | match |
+| variables.rs:219:18:219:29 | ...::Left | variables.rs:219:31:219:32 | 32 |  |
+| variables.rs:219:18:219:33 | ...::Left(...) | variables.rs:219:9:219:14 | either |  |
+| variables.rs:219:31:219:32 | 32 | variables.rs:219:18:219:33 | ...::Left(...) |  |
+| variables.rs:220:5:225:5 | match either { ... } | variables.rs:218:21:226:1 | { ... } |  |
+| variables.rs:220:11:220:16 | either | variables.rs:221:9:221:24 | ...::Left(...) |  |
+| variables.rs:221:9:221:24 | ...::Left(...) | variables.rs:221:22:221:23 | a7 | match |
+| variables.rs:221:9:221:24 | ...::Left(...) | variables.rs:221:28:221:44 | ...::Right(...) | no-match |
+| variables.rs:221:9:221:44 | [match(false)] ... \| ... | variables.rs:224:9:224:9 | _ | no-match |
+| variables.rs:221:9:221:44 | [match(true)] ... \| ... | variables.rs:222:16:222:17 | a7 | match |
+| variables.rs:221:22:221:23 | a7 | variables.rs:221:9:221:44 | [match(true)] ... \| ... | match |
+| variables.rs:221:28:221:44 | ...::Right(...) | variables.rs:221:9:221:44 | [match(false)] ... \| ... | no-match |
+| variables.rs:221:28:221:44 | ...::Right(...) | variables.rs:221:42:221:43 | a7 | match |
+| variables.rs:221:42:221:43 | a7 | variables.rs:221:9:221:44 | [match(true)] ... \| ... | match |
 | variables.rs:222:16:222:17 | a7 | variables.rs:222:21:222:21 | 0 |  |
 | variables.rs:222:16:222:21 | ... > ... | variables.rs:223:16:223:24 | print_i64 | true |
-| variables.rs:222:16:222:21 | ... > ... | variables.rs:224:9:224:9 | WildcardPat | false |
+| variables.rs:222:16:222:21 | ... > ... | variables.rs:224:9:224:9 | _ | false |
 | variables.rs:222:21:222:21 | 0 | variables.rs:222:16:222:21 | ... > ... |  |
 | variables.rs:223:16:223:24 | print_i64 | variables.rs:223:26:223:27 | a7 |  |
-| variables.rs:223:16:223:28 | CallExpr | variables.rs:220:5:225:5 | MatchExpr |  |
-| variables.rs:223:26:223:27 | a7 | variables.rs:223:16:223:28 | CallExpr |  |
-| variables.rs:224:9:224:9 | WildcardPat | variables.rs:224:14:224:15 | TupleExpr | match |
-| variables.rs:224:14:224:15 | TupleExpr | variables.rs:220:5:225:5 | MatchExpr |  |
-| variables.rs:228:1:243:1 | enter match_pattern8 | variables.rs:229:5:229:34 | LetStmt |  |
-| variables.rs:228:1:243:1 | exit match_pattern8 (normal) | variables.rs:228:1:243:1 | exit match_pattern8 |  |
-| variables.rs:228:21:243:1 | BlockExpr | variables.rs:228:1:243:1 | exit match_pattern8 (normal) |  |
-| variables.rs:229:5:229:34 | LetStmt | variables.rs:229:18:229:29 | Either::Left |  |
+| variables.rs:223:16:223:28 | print_i64(...) | variables.rs:220:5:225:5 | match either { ... } |  |
+| variables.rs:223:26:223:27 | a7 | variables.rs:223:16:223:28 | print_i64(...) |  |
+| variables.rs:224:9:224:9 | _ | variables.rs:224:14:224:15 | TupleExpr | match |
+| variables.rs:224:14:224:15 | TupleExpr | variables.rs:220:5:225:5 | match either { ... } |  |
+| variables.rs:228:1:243:1 | enter fn match_pattern8 | variables.rs:229:5:229:34 | let ... = ... |  |
+| variables.rs:228:1:243:1 | exit fn match_pattern8 (normal) | variables.rs:228:1:243:1 | exit fn match_pattern8 |  |
+| variables.rs:228:21:243:1 | { ... } | variables.rs:228:1:243:1 | exit fn match_pattern8 (normal) |  |
+| variables.rs:229:5:229:34 | let ... = ... | variables.rs:229:18:229:29 | ...::Left |  |
 | variables.rs:229:9:229:14 | either | variables.rs:231:11:231:16 | either | match |
-| variables.rs:229:18:229:29 | Either::Left | variables.rs:229:31:229:32 | 32 |  |
-| variables.rs:229:18:229:33 | CallExpr | variables.rs:229:9:229:14 | either |  |
-| variables.rs:229:31:229:32 | 32 | variables.rs:229:18:229:33 | CallExpr |  |
-| variables.rs:231:5:242:5 | MatchExpr | variables.rs:228:21:243:1 | BlockExpr |  |
-| variables.rs:231:11:231:16 | either | variables.rs:233:14:233:30 | TupleStructPat |  |
+| variables.rs:229:18:229:29 | ...::Left | variables.rs:229:31:229:32 | 32 |  |
+| variables.rs:229:18:229:33 | ...::Left(...) | variables.rs:229:9:229:14 | either |  |
+| variables.rs:229:31:229:32 | 32 | variables.rs:229:18:229:33 | ...::Left(...) |  |
+| variables.rs:231:5:242:5 | match either { ... } | variables.rs:228:21:243:1 | { ... } |  |
+| variables.rs:231:11:231:16 | either | variables.rs:233:14:233:30 | ...::Left(...) |  |
 | variables.rs:232:9:233:52 | [match(true)] e | variables.rs:235:13:235:27 | ExprStmt | match |
-| variables.rs:233:14:233:30 | TupleStructPat | variables.rs:233:27:233:29 | a11 | match |
-| variables.rs:233:14:233:30 | TupleStructPat | variables.rs:233:34:233:51 | TupleStructPat | no-match |
-| variables.rs:233:14:233:51 | [match(false)] OrPat | variables.rs:241:9:241:9 | WildcardPat | no-match |
-| variables.rs:233:14:233:51 | [match(true)] OrPat | variables.rs:232:9:233:52 | [match(true)] e | match |
-| variables.rs:233:27:233:29 | a11 | variables.rs:233:14:233:51 | [match(true)] OrPat | match |
-| variables.rs:233:34:233:51 | TupleStructPat | variables.rs:233:14:233:51 | [match(false)] OrPat | no-match |
-| variables.rs:233:34:233:51 | TupleStructPat | variables.rs:233:48:233:50 | a11 | match |
-| variables.rs:233:48:233:50 | a11 | variables.rs:233:14:233:51 | [match(true)] OrPat | match |
-| variables.rs:234:12:240:9 | BlockExpr | variables.rs:231:5:242:5 | MatchExpr |  |
+| variables.rs:233:14:233:30 | ...::Left(...) | variables.rs:233:27:233:29 | a11 | match |
+| variables.rs:233:14:233:30 | ...::Left(...) | variables.rs:233:34:233:51 | ...::Right(...) | no-match |
+| variables.rs:233:14:233:51 | [match(false)] ... \| ... | variables.rs:241:9:241:9 | _ | no-match |
+| variables.rs:233:14:233:51 | [match(true)] ... \| ... | variables.rs:232:9:233:52 | [match(true)] e | match |
+| variables.rs:233:27:233:29 | a11 | variables.rs:233:14:233:51 | [match(true)] ... \| ... | match |
+| variables.rs:233:34:233:51 | ...::Right(...) | variables.rs:233:14:233:51 | [match(false)] ... \| ... | no-match |
+| variables.rs:233:34:233:51 | ...::Right(...) | variables.rs:233:48:233:50 | a11 | match |
+| variables.rs:233:48:233:50 | a11 | variables.rs:233:14:233:51 | [match(true)] ... \| ... | match |
+| variables.rs:234:12:240:9 | { ... } | variables.rs:231:5:242:5 | match either { ... } |  |
 | variables.rs:235:13:235:21 | print_i64 | variables.rs:235:23:235:25 | a11 |  |
-| variables.rs:235:13:235:26 | CallExpr | variables.rs:236:16:237:15 | LetExpr |  |
+| variables.rs:235:13:235:26 | print_i64(...) | variables.rs:236:16:237:15 | let ... = e |  |
 | variables.rs:235:13:235:27 | ExprStmt | variables.rs:235:13:235:21 | print_i64 |  |
-| variables.rs:235:23:235:25 | a11 | variables.rs:235:13:235:26 | CallExpr |  |
-| variables.rs:236:13:239:13 | IfExpr | variables.rs:234:12:240:9 | BlockExpr |  |
-| variables.rs:236:16:237:15 | LetExpr | variables.rs:237:15:237:15 | e |  |
-| variables.rs:236:20:236:36 | TupleStructPat | variables.rs:236:13:239:13 | IfExpr | no-match |
-| variables.rs:236:20:236:36 | TupleStructPat | variables.rs:236:33:236:35 | a12 | match |
+| variables.rs:235:23:235:25 | a11 | variables.rs:235:13:235:26 | print_i64(...) |  |
+| variables.rs:236:13:239:13 | if ... {...} | variables.rs:234:12:240:9 | { ... } |  |
+| variables.rs:236:16:237:15 | let ... = e | variables.rs:237:15:237:15 | e |  |
+| variables.rs:236:20:236:36 | ...::Left(...) | variables.rs:236:13:239:13 | if ... {...} | no-match |
+| variables.rs:236:20:236:36 | ...::Left(...) | variables.rs:236:33:236:35 | a12 | match |
 | variables.rs:236:33:236:35 | a12 | variables.rs:238:17:238:32 | ExprStmt | match |
-| variables.rs:237:15:237:15 | e | variables.rs:236:20:236:36 | TupleStructPat |  |
-| variables.rs:237:17:239:13 | BlockExpr | variables.rs:236:13:239:13 | IfExpr |  |
+| variables.rs:237:15:237:15 | e | variables.rs:236:20:236:36 | ...::Left(...) |  |
+| variables.rs:237:17:239:13 | { ... } | variables.rs:236:13:239:13 | if ... {...} |  |
 | variables.rs:238:17:238:25 | print_i64 | variables.rs:238:28:238:30 | a12 |  |
-| variables.rs:238:17:238:31 | CallExpr | variables.rs:237:17:239:13 | BlockExpr |  |
+| variables.rs:238:17:238:31 | print_i64(...) | variables.rs:237:17:239:13 | { ... } |  |
 | variables.rs:238:17:238:32 | ExprStmt | variables.rs:238:17:238:25 | print_i64 |  |
-| variables.rs:238:27:238:30 | * ... | variables.rs:238:17:238:31 | CallExpr |  |
+| variables.rs:238:27:238:30 | * ... | variables.rs:238:17:238:31 | print_i64(...) |  |
 | variables.rs:238:28:238:30 | a12 | variables.rs:238:27:238:30 | * ... |  |
-| variables.rs:241:9:241:9 | WildcardPat | variables.rs:241:14:241:15 | TupleExpr | match |
-| variables.rs:241:14:241:15 | TupleExpr | variables.rs:231:5:242:5 | MatchExpr |  |
-| variables.rs:252:1:258:1 | enter match_pattern9 | variables.rs:253:5:253:36 | LetStmt |  |
-| variables.rs:252:1:258:1 | exit match_pattern9 (normal) | variables.rs:252:1:258:1 | exit match_pattern9 |  |
-| variables.rs:252:21:258:1 | BlockExpr | variables.rs:252:1:258:1 | exit match_pattern9 (normal) |  |
-| variables.rs:253:5:253:36 | LetStmt | variables.rs:253:14:253:31 | FourValued::Second |  |
+| variables.rs:241:9:241:9 | _ | variables.rs:241:14:241:15 | TupleExpr | match |
+| variables.rs:241:14:241:15 | TupleExpr | variables.rs:231:5:242:5 | match either { ... } |  |
+| variables.rs:252:1:258:1 | enter fn match_pattern9 | variables.rs:253:5:253:36 | let ... = ... |  |
+| variables.rs:252:1:258:1 | exit fn match_pattern9 (normal) | variables.rs:252:1:258:1 | exit fn match_pattern9 |  |
+| variables.rs:252:21:258:1 | { ... } | variables.rs:252:1:258:1 | exit fn match_pattern9 (normal) |  |
+| variables.rs:253:5:253:36 | let ... = ... | variables.rs:253:14:253:31 | ...::Second |  |
 | variables.rs:253:9:253:10 | fv | variables.rs:254:11:254:12 | fv | match |
-| variables.rs:253:14:253:31 | FourValued::Second | variables.rs:253:33:253:34 | 62 |  |
-| variables.rs:253:14:253:35 | CallExpr | variables.rs:253:9:253:10 | fv |  |
-| variables.rs:253:33:253:34 | 62 | variables.rs:253:14:253:35 | CallExpr |  |
-| variables.rs:254:5:257:5 | MatchExpr | variables.rs:252:21:258:1 | BlockExpr |  |
-| variables.rs:254:11:254:12 | fv | variables.rs:255:9:255:30 | TupleStructPat |  |
-| variables.rs:255:9:255:30 | TupleStructPat | variables.rs:255:27:255:29 | a13 | match |
-| variables.rs:255:9:255:30 | TupleStructPat | variables.rs:255:35:255:57 | TupleStructPat | no-match |
-| variables.rs:255:9:255:109 | [match(true)] OrPat | variables.rs:256:16:256:24 | print_i64 | match |
-| variables.rs:255:27:255:29 | a13 | variables.rs:255:9:255:109 | [match(true)] OrPat | match |
-| variables.rs:255:35:255:57 | TupleStructPat | variables.rs:255:54:255:56 | a13 | match |
-| variables.rs:255:35:255:57 | TupleStructPat | variables.rs:255:61:255:82 | TupleStructPat | no-match |
-| variables.rs:255:35:255:82 | [match(false)] OrPat | variables.rs:255:87:255:109 | TupleStructPat | no-match |
-| variables.rs:255:35:255:82 | [match(true)] OrPat | variables.rs:255:9:255:109 | [match(true)] OrPat | match |
-| variables.rs:255:54:255:56 | a13 | variables.rs:255:35:255:82 | [match(true)] OrPat | match |
-| variables.rs:255:61:255:82 | TupleStructPat | variables.rs:255:35:255:82 | [match(false)] OrPat | no-match |
-| variables.rs:255:61:255:82 | TupleStructPat | variables.rs:255:79:255:81 | a13 | match |
-| variables.rs:255:79:255:81 | a13 | variables.rs:255:35:255:82 | [match(true)] OrPat | match |
-| variables.rs:255:87:255:109 | TupleStructPat | variables.rs:255:106:255:108 | a13 | match |
-| variables.rs:255:106:255:108 | a13 | variables.rs:255:9:255:109 | [match(true)] OrPat | match |
+| variables.rs:253:14:253:31 | ...::Second | variables.rs:253:33:253:34 | 62 |  |
+| variables.rs:253:14:253:35 | ...::Second(...) | variables.rs:253:9:253:10 | fv |  |
+| variables.rs:253:33:253:34 | 62 | variables.rs:253:14:253:35 | ...::Second(...) |  |
+| variables.rs:254:5:257:5 | match fv { ... } | variables.rs:252:21:258:1 | { ... } |  |
+| variables.rs:254:11:254:12 | fv | variables.rs:255:9:255:30 | ...::First(...) |  |
+| variables.rs:255:9:255:30 | ...::First(...) | variables.rs:255:27:255:29 | a13 | match |
+| variables.rs:255:9:255:30 | ...::First(...) | variables.rs:255:35:255:57 | ...::Second(...) | no-match |
+| variables.rs:255:9:255:109 | [match(true)] ... \| ... \| ... | variables.rs:256:16:256:24 | print_i64 | match |
+| variables.rs:255:27:255:29 | a13 | variables.rs:255:9:255:109 | [match(true)] ... \| ... \| ... | match |
+| variables.rs:255:35:255:57 | ...::Second(...) | variables.rs:255:54:255:56 | a13 | match |
+| variables.rs:255:35:255:57 | ...::Second(...) | variables.rs:255:61:255:82 | ...::Third(...) | no-match |
+| variables.rs:255:35:255:82 | [match(false)] ... \| ... | variables.rs:255:87:255:109 | ...::Fourth(...) | no-match |
+| variables.rs:255:35:255:82 | [match(true)] ... \| ... | variables.rs:255:9:255:109 | [match(true)] ... \| ... \| ... | match |
+| variables.rs:255:54:255:56 | a13 | variables.rs:255:35:255:82 | [match(true)] ... \| ... | match |
+| variables.rs:255:61:255:82 | ...::Third(...) | variables.rs:255:35:255:82 | [match(false)] ... \| ... | no-match |
+| variables.rs:255:61:255:82 | ...::Third(...) | variables.rs:255:79:255:81 | a13 | match |
+| variables.rs:255:79:255:81 | a13 | variables.rs:255:35:255:82 | [match(true)] ... \| ... | match |
+| variables.rs:255:87:255:109 | ...::Fourth(...) | variables.rs:255:106:255:108 | a13 | match |
+| variables.rs:255:106:255:108 | a13 | variables.rs:255:9:255:109 | [match(true)] ... \| ... \| ... | match |
 | variables.rs:256:16:256:24 | print_i64 | variables.rs:256:26:256:28 | a13 |  |
-| variables.rs:256:16:256:29 | CallExpr | variables.rs:254:5:257:5 | MatchExpr |  |
-| variables.rs:256:26:256:28 | a13 | variables.rs:256:16:256:29 | CallExpr |  |
-| variables.rs:260:1:269:1 | enter param_pattern1 | variables.rs:261:5:261:6 | a8 |  |
-| variables.rs:260:1:269:1 | exit param_pattern1 (normal) | variables.rs:260:1:269:1 | exit param_pattern1 |  |
-| variables.rs:261:5:261:6 | a8 | variables.rs:261:5:261:12 | Param | match |
-| variables.rs:261:5:261:12 | Param | variables.rs:262:5:265:5 | TuplePat |  |
+| variables.rs:256:16:256:29 | print_i64(...) | variables.rs:254:5:257:5 | match fv { ... } |  |
+| variables.rs:256:26:256:28 | a13 | variables.rs:256:16:256:29 | print_i64(...) |  |
+| variables.rs:260:1:269:1 | enter fn param_pattern1 | variables.rs:261:5:261:6 | a8 |  |
+| variables.rs:260:1:269:1 | exit fn param_pattern1 (normal) | variables.rs:260:1:269:1 | exit fn param_pattern1 |  |
+| variables.rs:261:5:261:6 | a8 | variables.rs:261:5:261:12 | ...: ... | match |
+| variables.rs:261:5:261:12 | ...: ... | variables.rs:262:5:265:5 | TuplePat |  |
 | variables.rs:262:5:265:5 | TuplePat | variables.rs:263:9:263:10 | b3 | match |
-| variables.rs:262:5:265:19 | Param | variables.rs:266:5:266:18 | ExprStmt |  |
+| variables.rs:262:5:265:19 | ...: ... | variables.rs:266:5:266:18 | ExprStmt |  |
 | variables.rs:263:9:263:10 | b3 | variables.rs:264:9:264:10 | c1 | match |
-| variables.rs:264:9:264:10 | c1 | variables.rs:262:5:265:19 | Param | match |
-| variables.rs:265:28:269:1 | BlockExpr | variables.rs:260:1:269:1 | exit param_pattern1 (normal) |  |
+| variables.rs:264:9:264:10 | c1 | variables.rs:262:5:265:19 | ...: ... | match |
+| variables.rs:265:28:269:1 | { ... } | variables.rs:260:1:269:1 | exit fn param_pattern1 (normal) |  |
 | variables.rs:266:5:266:13 | print_str | variables.rs:266:15:266:16 | a8 |  |
-| variables.rs:266:5:266:17 | CallExpr | variables.rs:267:5:267:18 | ExprStmt |  |
+| variables.rs:266:5:266:17 | print_str(...) | variables.rs:267:5:267:18 | ExprStmt |  |
 | variables.rs:266:5:266:18 | ExprStmt | variables.rs:266:5:266:13 | print_str |  |
-| variables.rs:266:15:266:16 | a8 | variables.rs:266:5:266:17 | CallExpr |  |
+| variables.rs:266:15:266:16 | a8 | variables.rs:266:5:266:17 | print_str(...) |  |
 | variables.rs:267:5:267:13 | print_str | variables.rs:267:15:267:16 | b3 |  |
-| variables.rs:267:5:267:17 | CallExpr | variables.rs:268:5:268:18 | ExprStmt |  |
+| variables.rs:267:5:267:17 | print_str(...) | variables.rs:268:5:268:18 | ExprStmt |  |
 | variables.rs:267:5:267:18 | ExprStmt | variables.rs:267:5:267:13 | print_str |  |
-| variables.rs:267:15:267:16 | b3 | variables.rs:267:5:267:17 | CallExpr |  |
+| variables.rs:267:15:267:16 | b3 | variables.rs:267:5:267:17 | print_str(...) |  |
 | variables.rs:268:5:268:13 | print_str | variables.rs:268:15:268:16 | c1 |  |
-| variables.rs:268:5:268:17 | CallExpr | variables.rs:265:28:269:1 | BlockExpr |  |
+| variables.rs:268:5:268:17 | print_str(...) | variables.rs:265:28:269:1 | { ... } |  |
 | variables.rs:268:5:268:18 | ExprStmt | variables.rs:268:5:268:13 | print_str |  |
-| variables.rs:268:15:268:16 | c1 | variables.rs:268:5:268:17 | CallExpr |  |
-| variables.rs:271:1:275:1 | enter param_pattern2 | variables.rs:272:6:272:21 | TupleStructPat |  |
-| variables.rs:271:1:275:1 | exit param_pattern2 (normal) | variables.rs:271:1:275:1 | exit param_pattern2 |  |
-| variables.rs:272:5:272:50 | Param | variables.rs:274:5:274:18 | ExprStmt |  |
-| variables.rs:272:6:272:21 | TupleStructPat | variables.rs:272:19:272:20 | a9 | match |
-| variables.rs:272:6:272:21 | TupleStructPat | variables.rs:272:25:272:41 | TupleStructPat | no-match |
-| variables.rs:272:6:272:41 | [match(true)] OrPat | variables.rs:272:5:272:50 | Param | match |
-| variables.rs:272:19:272:20 | a9 | variables.rs:272:6:272:41 | [match(true)] OrPat | match |
-| variables.rs:272:25:272:41 | TupleStructPat | variables.rs:272:39:272:40 | a9 | match |
-| variables.rs:272:39:272:40 | a9 | variables.rs:272:6:272:41 | [match(true)] OrPat | match |
-| variables.rs:273:9:275:1 | BlockExpr | variables.rs:271:1:275:1 | exit param_pattern2 (normal) |  |
+| variables.rs:268:15:268:16 | c1 | variables.rs:268:5:268:17 | print_str(...) |  |
+| variables.rs:271:1:275:1 | enter fn param_pattern2 | variables.rs:272:6:272:21 | ...::Left(...) |  |
+| variables.rs:271:1:275:1 | exit fn param_pattern2 (normal) | variables.rs:271:1:275:1 | exit fn param_pattern2 |  |
+| variables.rs:272:5:272:50 | ...: Either | variables.rs:274:5:274:18 | ExprStmt |  |
+| variables.rs:272:6:272:21 | ...::Left(...) | variables.rs:272:19:272:20 | a9 | match |
+| variables.rs:272:6:272:21 | ...::Left(...) | variables.rs:272:25:272:41 | ...::Right(...) | no-match |
+| variables.rs:272:6:272:41 | [match(true)] ... \| ... | variables.rs:272:5:272:50 | ...: Either | match |
+| variables.rs:272:19:272:20 | a9 | variables.rs:272:6:272:41 | [match(true)] ... \| ... | match |
+| variables.rs:272:25:272:41 | ...::Right(...) | variables.rs:272:39:272:40 | a9 | match |
+| variables.rs:272:39:272:40 | a9 | variables.rs:272:6:272:41 | [match(true)] ... \| ... | match |
+| variables.rs:273:9:275:1 | { ... } | variables.rs:271:1:275:1 | exit fn param_pattern2 (normal) |  |
 | variables.rs:274:5:274:13 | print_i64 | variables.rs:274:15:274:16 | a9 |  |
-| variables.rs:274:5:274:17 | CallExpr | variables.rs:273:9:275:1 | BlockExpr |  |
+| variables.rs:274:5:274:17 | print_i64(...) | variables.rs:273:9:275:1 | { ... } |  |
 | variables.rs:274:5:274:18 | ExprStmt | variables.rs:274:5:274:13 | print_i64 |  |
-| variables.rs:274:15:274:16 | a9 | variables.rs:274:5:274:17 | CallExpr |  |
-| variables.rs:277:1:312:1 | enter destruct_assignment | variables.rs:278:5:282:18 | LetStmt |  |
-| variables.rs:277:1:312:1 | exit destruct_assignment (normal) | variables.rs:277:1:312:1 | exit destruct_assignment |  |
-| variables.rs:277:26:312:1 | BlockExpr | variables.rs:277:1:312:1 | exit destruct_assignment (normal) |  |
-| variables.rs:278:5:282:18 | LetStmt | variables.rs:282:10:282:10 | 1 |  |
+| variables.rs:274:15:274:16 | a9 | variables.rs:274:5:274:17 | print_i64(...) |  |
+| variables.rs:277:1:312:1 | enter fn destruct_assignment | variables.rs:278:5:282:18 | let ... = ... |  |
+| variables.rs:277:1:312:1 | exit fn destruct_assignment (normal) | variables.rs:277:1:312:1 | exit fn destruct_assignment |  |
+| variables.rs:277:26:312:1 | { ... } | variables.rs:277:1:312:1 | exit fn destruct_assignment (normal) |  |
+| variables.rs:278:5:282:18 | let ... = ... | variables.rs:282:10:282:10 | 1 |  |
 | variables.rs:278:9:282:5 | TuplePat | variables.rs:279:9:279:15 | a10 | match |
 | variables.rs:279:9:279:15 | a10 | variables.rs:280:9:280:14 | b4 | match |
 | variables.rs:280:9:280:14 | b4 | variables.rs:281:9:281:14 | c2 | match |
@@ -609,17 +609,17 @@ edges
 | variables.rs:282:13:282:13 | 2 | variables.rs:282:16:282:16 | 3 |  |
 | variables.rs:282:16:282:16 | 3 | variables.rs:282:9:282:17 | TupleExpr |  |
 | variables.rs:283:5:283:13 | print_i64 | variables.rs:283:15:283:17 | a10 |  |
-| variables.rs:283:5:283:18 | CallExpr | variables.rs:284:5:284:18 | ExprStmt |  |
+| variables.rs:283:5:283:18 | print_i64(...) | variables.rs:284:5:284:18 | ExprStmt |  |
 | variables.rs:283:5:283:19 | ExprStmt | variables.rs:283:5:283:13 | print_i64 |  |
-| variables.rs:283:15:283:17 | a10 | variables.rs:283:5:283:18 | CallExpr |  |
+| variables.rs:283:15:283:17 | a10 | variables.rs:283:5:283:18 | print_i64(...) |  |
 | variables.rs:284:5:284:13 | print_i64 | variables.rs:284:15:284:16 | b4 |  |
-| variables.rs:284:5:284:17 | CallExpr | variables.rs:285:5:285:18 | ExprStmt |  |
+| variables.rs:284:5:284:17 | print_i64(...) | variables.rs:285:5:285:18 | ExprStmt |  |
 | variables.rs:284:5:284:18 | ExprStmt | variables.rs:284:5:284:13 | print_i64 |  |
-| variables.rs:284:15:284:16 | b4 | variables.rs:284:5:284:17 | CallExpr |  |
+| variables.rs:284:15:284:16 | b4 | variables.rs:284:5:284:17 | print_i64(...) |  |
 | variables.rs:285:5:285:13 | print_i64 | variables.rs:285:15:285:16 | c2 |  |
-| variables.rs:285:5:285:17 | CallExpr | variables.rs:287:5:295:6 | ExprStmt |  |
+| variables.rs:285:5:285:17 | print_i64(...) | variables.rs:287:5:295:6 | ExprStmt |  |
 | variables.rs:285:5:285:18 | ExprStmt | variables.rs:285:5:285:13 | print_i64 |  |
-| variables.rs:285:15:285:16 | c2 | variables.rs:285:5:285:17 | CallExpr |  |
+| variables.rs:285:15:285:16 | c2 | variables.rs:285:5:285:17 | print_i64(...) |  |
 | variables.rs:287:5:291:5 | TupleExpr | variables.rs:292:9:292:11 | a10 |  |
 | variables.rs:287:5:295:5 | ... = ... | variables.rs:296:5:296:19 | ExprStmt |  |
 | variables.rs:287:5:295:6 | ExprStmt | variables.rs:288:9:288:10 | c2 |  |
@@ -631,105 +631,105 @@ edges
 | variables.rs:293:9:293:10 | b4 | variables.rs:294:9:294:10 | c2 |  |
 | variables.rs:294:9:294:10 | c2 | variables.rs:291:9:295:5 | TupleExpr |  |
 | variables.rs:296:5:296:13 | print_i64 | variables.rs:296:15:296:17 | a10 |  |
-| variables.rs:296:5:296:18 | CallExpr | variables.rs:297:5:297:18 | ExprStmt |  |
+| variables.rs:296:5:296:18 | print_i64(...) | variables.rs:297:5:297:18 | ExprStmt |  |
 | variables.rs:296:5:296:19 | ExprStmt | variables.rs:296:5:296:13 | print_i64 |  |
-| variables.rs:296:15:296:17 | a10 | variables.rs:296:5:296:18 | CallExpr |  |
+| variables.rs:296:15:296:17 | a10 | variables.rs:296:5:296:18 | print_i64(...) |  |
 | variables.rs:297:5:297:13 | print_i64 | variables.rs:297:15:297:16 | b4 |  |
-| variables.rs:297:5:297:17 | CallExpr | variables.rs:298:5:298:18 | ExprStmt |  |
+| variables.rs:297:5:297:17 | print_i64(...) | variables.rs:298:5:298:18 | ExprStmt |  |
 | variables.rs:297:5:297:18 | ExprStmt | variables.rs:297:5:297:13 | print_i64 |  |
-| variables.rs:297:15:297:16 | b4 | variables.rs:297:5:297:17 | CallExpr |  |
+| variables.rs:297:15:297:16 | b4 | variables.rs:297:5:297:17 | print_i64(...) |  |
 | variables.rs:298:5:298:13 | print_i64 | variables.rs:298:15:298:16 | c2 |  |
-| variables.rs:298:5:298:17 | CallExpr | variables.rs:300:5:308:5 | ExprStmt |  |
+| variables.rs:298:5:298:17 | print_i64(...) | variables.rs:300:5:308:5 | ExprStmt |  |
 | variables.rs:298:5:298:18 | ExprStmt | variables.rs:298:5:298:13 | print_i64 |  |
-| variables.rs:298:15:298:16 | c2 | variables.rs:298:5:298:17 | CallExpr |  |
+| variables.rs:298:15:298:16 | c2 | variables.rs:298:5:298:17 | print_i64(...) |  |
 | variables.rs:300:5:308:5 | ExprStmt | variables.rs:300:12:300:12 | 4 |  |
-| variables.rs:300:5:308:5 | MatchExpr | variables.rs:310:5:310:19 | ExprStmt |  |
+| variables.rs:300:5:308:5 | match ... { ... } | variables.rs:310:5:310:19 | ExprStmt |  |
 | variables.rs:300:11:300:16 | TupleExpr | variables.rs:301:9:304:9 | TuplePat |  |
 | variables.rs:300:12:300:12 | 4 | variables.rs:300:15:300:15 | 5 |  |
 | variables.rs:300:15:300:15 | 5 | variables.rs:300:11:300:16 | TupleExpr |  |
 | variables.rs:301:9:304:9 | TuplePat | variables.rs:302:13:302:15 | a10 | match |
 | variables.rs:302:13:302:15 | a10 | variables.rs:303:13:303:14 | b4 | match |
 | variables.rs:303:13:303:14 | b4 | variables.rs:305:13:305:27 | ExprStmt | match |
-| variables.rs:304:14:307:9 | BlockExpr | variables.rs:300:5:308:5 | MatchExpr |  |
+| variables.rs:304:14:307:9 | { ... } | variables.rs:300:5:308:5 | match ... { ... } |  |
 | variables.rs:305:13:305:21 | print_i64 | variables.rs:305:23:305:25 | a10 |  |
-| variables.rs:305:13:305:26 | CallExpr | variables.rs:306:13:306:26 | ExprStmt |  |
+| variables.rs:305:13:305:26 | print_i64(...) | variables.rs:306:13:306:26 | ExprStmt |  |
 | variables.rs:305:13:305:27 | ExprStmt | variables.rs:305:13:305:21 | print_i64 |  |
-| variables.rs:305:23:305:25 | a10 | variables.rs:305:13:305:26 | CallExpr |  |
+| variables.rs:305:23:305:25 | a10 | variables.rs:305:13:305:26 | print_i64(...) |  |
 | variables.rs:306:13:306:21 | print_i64 | variables.rs:306:23:306:24 | b4 |  |
-| variables.rs:306:13:306:25 | CallExpr | variables.rs:304:14:307:9 | BlockExpr |  |
+| variables.rs:306:13:306:25 | print_i64(...) | variables.rs:304:14:307:9 | { ... } |  |
 | variables.rs:306:13:306:26 | ExprStmt | variables.rs:306:13:306:21 | print_i64 |  |
-| variables.rs:306:23:306:24 | b4 | variables.rs:306:13:306:25 | CallExpr |  |
+| variables.rs:306:23:306:24 | b4 | variables.rs:306:13:306:25 | print_i64(...) |  |
 | variables.rs:310:5:310:13 | print_i64 | variables.rs:310:15:310:17 | a10 |  |
-| variables.rs:310:5:310:18 | CallExpr | variables.rs:311:5:311:18 | ExprStmt |  |
+| variables.rs:310:5:310:18 | print_i64(...) | variables.rs:311:5:311:18 | ExprStmt |  |
 | variables.rs:310:5:310:19 | ExprStmt | variables.rs:310:5:310:13 | print_i64 |  |
-| variables.rs:310:15:310:17 | a10 | variables.rs:310:5:310:18 | CallExpr |  |
+| variables.rs:310:15:310:17 | a10 | variables.rs:310:5:310:18 | print_i64(...) |  |
 | variables.rs:311:5:311:13 | print_i64 | variables.rs:311:15:311:16 | b4 |  |
-| variables.rs:311:5:311:17 | CallExpr | variables.rs:277:26:312:1 | BlockExpr |  |
+| variables.rs:311:5:311:17 | print_i64(...) | variables.rs:277:26:312:1 | { ... } |  |
 | variables.rs:311:5:311:18 | ExprStmt | variables.rs:311:5:311:13 | print_i64 |  |
-| variables.rs:311:15:311:16 | b4 | variables.rs:311:5:311:17 | CallExpr |  |
-| variables.rs:314:1:329:1 | enter closure_variable | variables.rs:315:5:317:10 | LetStmt |  |
-| variables.rs:314:1:329:1 | exit closure_variable (normal) | variables.rs:314:1:329:1 | exit closure_variable |  |
-| variables.rs:314:23:329:1 | BlockExpr | variables.rs:314:1:329:1 | exit closure_variable (normal) |  |
-| variables.rs:315:5:317:10 | LetStmt | variables.rs:316:9:317:9 | ClosureExpr |  |
-| variables.rs:315:9:315:23 | example_closure | variables.rs:318:5:319:27 | LetStmt | match |
-| variables.rs:316:9:317:9 | ClosureExpr | variables.rs:315:9:315:23 | example_closure |  |
-| variables.rs:316:9:317:9 | enter ClosureExpr | variables.rs:316:10:316:10 | x |  |
-| variables.rs:316:9:317:9 | exit ClosureExpr (normal) | variables.rs:316:9:317:9 | exit ClosureExpr |  |
-| variables.rs:316:10:316:10 | x | variables.rs:316:10:316:15 | Param | match |
-| variables.rs:316:10:316:15 | Param | variables.rs:317:9:317:9 | x |  |
-| variables.rs:317:9:317:9 | x | variables.rs:316:9:317:9 | exit ClosureExpr (normal) |  |
-| variables.rs:318:5:319:27 | LetStmt | variables.rs:319:9:319:23 | example_closure |  |
+| variables.rs:311:15:311:16 | b4 | variables.rs:311:5:311:17 | print_i64(...) |  |
+| variables.rs:314:1:329:1 | enter fn closure_variable | variables.rs:315:5:317:10 | let ... = ... |  |
+| variables.rs:314:1:329:1 | exit fn closure_variable (normal) | variables.rs:314:1:329:1 | exit fn closure_variable |  |
+| variables.rs:314:23:329:1 | { ... } | variables.rs:314:1:329:1 | exit fn closure_variable (normal) |  |
+| variables.rs:315:5:317:10 | let ... = ... | variables.rs:316:9:317:9 | \|...\| x |  |
+| variables.rs:315:9:315:23 | example_closure | variables.rs:318:5:319:27 | let ... = ... | match |
+| variables.rs:316:9:317:9 | \|...\| x | variables.rs:315:9:315:23 | example_closure |  |
+| variables.rs:316:9:317:9 | enter \|...\| x | variables.rs:316:10:316:10 | x |  |
+| variables.rs:316:9:317:9 | exit \|...\| x (normal) | variables.rs:316:9:317:9 | exit \|...\| x |  |
+| variables.rs:316:10:316:10 | x | variables.rs:316:10:316:15 | ...: i64 | match |
+| variables.rs:316:10:316:15 | ...: i64 | variables.rs:317:9:317:9 | x |  |
+| variables.rs:317:9:317:9 | x | variables.rs:316:9:317:9 | exit \|...\| x (normal) |  |
+| variables.rs:318:5:319:27 | let ... = ... | variables.rs:319:9:319:23 | example_closure |  |
 | variables.rs:318:9:318:10 | n1 | variables.rs:320:5:320:18 | ExprStmt | match |
 | variables.rs:319:9:319:23 | example_closure | variables.rs:319:25:319:25 | 5 |  |
-| variables.rs:319:9:319:26 | CallExpr | variables.rs:318:9:318:10 | n1 |  |
-| variables.rs:319:25:319:25 | 5 | variables.rs:319:9:319:26 | CallExpr |  |
+| variables.rs:319:9:319:26 | example_closure(...) | variables.rs:318:9:318:10 | n1 |  |
+| variables.rs:319:25:319:25 | 5 | variables.rs:319:9:319:26 | example_closure(...) |  |
 | variables.rs:320:5:320:13 | print_i64 | variables.rs:320:15:320:16 | n1 |  |
-| variables.rs:320:5:320:17 | CallExpr | variables.rs:322:5:322:25 | ExprStmt |  |
+| variables.rs:320:5:320:17 | print_i64(...) | variables.rs:322:5:322:25 | ExprStmt |  |
 | variables.rs:320:5:320:18 | ExprStmt | variables.rs:320:5:320:13 | print_i64 |  |
-| variables.rs:320:15:320:16 | n1 | variables.rs:320:5:320:17 | CallExpr |  |
-| variables.rs:322:5:322:22 | immutable_variable | variables.rs:322:5:322:24 | CallExpr |  |
-| variables.rs:322:5:322:24 | CallExpr | variables.rs:323:5:325:10 | LetStmt |  |
+| variables.rs:320:15:320:16 | n1 | variables.rs:320:5:320:17 | print_i64(...) |  |
+| variables.rs:322:5:322:22 | immutable_variable | variables.rs:322:5:322:24 | immutable_variable(...) |  |
+| variables.rs:322:5:322:24 | immutable_variable(...) | variables.rs:323:5:325:10 | let ... = ... |  |
 | variables.rs:322:5:322:25 | ExprStmt | variables.rs:322:5:322:22 | immutable_variable |  |
-| variables.rs:323:5:325:10 | LetStmt | variables.rs:324:9:325:9 | ClosureExpr |  |
-| variables.rs:323:9:323:26 | immutable_variable | variables.rs:326:5:327:30 | LetStmt | match |
-| variables.rs:324:9:325:9 | ClosureExpr | variables.rs:323:9:323:26 | immutable_variable |  |
-| variables.rs:324:9:325:9 | enter ClosureExpr | variables.rs:324:10:324:10 | x |  |
-| variables.rs:324:9:325:9 | exit ClosureExpr (normal) | variables.rs:324:9:325:9 | exit ClosureExpr |  |
-| variables.rs:324:10:324:10 | x | variables.rs:324:10:324:15 | Param | match |
-| variables.rs:324:10:324:15 | Param | variables.rs:325:9:325:9 | x |  |
-| variables.rs:325:9:325:9 | x | variables.rs:324:9:325:9 | exit ClosureExpr (normal) |  |
-| variables.rs:326:5:327:30 | LetStmt | variables.rs:327:9:327:26 | immutable_variable |  |
+| variables.rs:323:5:325:10 | let ... = ... | variables.rs:324:9:325:9 | \|...\| x |  |
+| variables.rs:323:9:323:26 | immutable_variable | variables.rs:326:5:327:30 | let ... = ... | match |
+| variables.rs:324:9:325:9 | \|...\| x | variables.rs:323:9:323:26 | immutable_variable |  |
+| variables.rs:324:9:325:9 | enter \|...\| x | variables.rs:324:10:324:10 | x |  |
+| variables.rs:324:9:325:9 | exit \|...\| x (normal) | variables.rs:324:9:325:9 | exit \|...\| x |  |
+| variables.rs:324:10:324:10 | x | variables.rs:324:10:324:15 | ...: i64 | match |
+| variables.rs:324:10:324:15 | ...: i64 | variables.rs:325:9:325:9 | x |  |
+| variables.rs:325:9:325:9 | x | variables.rs:324:9:325:9 | exit \|...\| x (normal) |  |
+| variables.rs:326:5:327:30 | let ... = ... | variables.rs:327:9:327:26 | immutable_variable |  |
 | variables.rs:326:9:326:10 | n2 | variables.rs:328:5:328:18 | ExprStmt | match |
 | variables.rs:327:9:327:26 | immutable_variable | variables.rs:327:28:327:28 | 6 |  |
-| variables.rs:327:9:327:29 | CallExpr | variables.rs:326:9:326:10 | n2 |  |
-| variables.rs:327:28:327:28 | 6 | variables.rs:327:9:327:29 | CallExpr |  |
+| variables.rs:327:9:327:29 | immutable_variable(...) | variables.rs:326:9:326:10 | n2 |  |
+| variables.rs:327:28:327:28 | 6 | variables.rs:327:9:327:29 | immutable_variable(...) |  |
 | variables.rs:328:5:328:13 | print_i64 | variables.rs:328:15:328:16 | n2 |  |
-| variables.rs:328:5:328:17 | CallExpr | variables.rs:314:23:329:1 | BlockExpr |  |
+| variables.rs:328:5:328:17 | print_i64(...) | variables.rs:314:23:329:1 | { ... } |  |
 | variables.rs:328:5:328:18 | ExprStmt | variables.rs:328:5:328:13 | print_i64 |  |
-| variables.rs:328:15:328:16 | n2 | variables.rs:328:5:328:17 | CallExpr |  |
-| variables.rs:331:1:338:1 | enter for_variable | variables.rs:332:5:332:42 | LetStmt |  |
-| variables.rs:331:1:338:1 | exit for_variable (normal) | variables.rs:331:1:338:1 | exit for_variable |  |
-| variables.rs:331:19:338:1 | BlockExpr | variables.rs:331:1:338:1 | exit for_variable (normal) |  |
-| variables.rs:332:5:332:42 | LetStmt | variables.rs:332:15:332:22 | "apples" |  |
+| variables.rs:328:15:328:16 | n2 | variables.rs:328:5:328:17 | print_i64(...) |  |
+| variables.rs:331:1:338:1 | enter fn for_variable | variables.rs:332:5:332:42 | let ... = ... |  |
+| variables.rs:331:1:338:1 | exit fn for_variable (normal) | variables.rs:331:1:338:1 | exit fn for_variable |  |
+| variables.rs:331:19:338:1 | { ... } | variables.rs:331:1:338:1 | exit fn for_variable (normal) |  |
+| variables.rs:332:5:332:42 | let ... = ... | variables.rs:332:15:332:22 | "apples" |  |
 | variables.rs:332:9:332:9 | v | variables.rs:335:12:335:12 | v | match |
-| variables.rs:332:13:332:41 | RefExpr | variables.rs:332:9:332:9 | v |  |
-| variables.rs:332:14:332:41 | ArrayExpr | variables.rs:332:13:332:41 | RefExpr |  |
+| variables.rs:332:13:332:41 | &... | variables.rs:332:9:332:9 | v |  |
+| variables.rs:332:14:332:41 | [...] | variables.rs:332:13:332:41 | &... |  |
 | variables.rs:332:15:332:22 | "apples" | variables.rs:332:25:332:30 | "cake" |  |
 | variables.rs:332:25:332:30 | "cake" | variables.rs:332:33:332:40 | "coffee" |  |
-| variables.rs:332:33:332:40 | "coffee" | variables.rs:332:14:332:41 | ArrayExpr |  |
-| variables.rs:334:5:337:5 | ForExpr | variables.rs:331:19:338:1 | BlockExpr |  |
-| variables.rs:334:9:334:12 | text | variables.rs:334:5:337:5 | ForExpr | no-match |
+| variables.rs:332:33:332:40 | "coffee" | variables.rs:332:14:332:41 | [...] |  |
+| variables.rs:334:5:337:5 | for ... in ... { ... } | variables.rs:331:19:338:1 | { ... } |  |
+| variables.rs:334:9:334:12 | text | variables.rs:334:5:337:5 | for ... in ... { ... } | no-match |
 | variables.rs:334:9:334:12 | text | variables.rs:336:9:336:24 | ExprStmt | match |
 | variables.rs:335:12:335:12 | v | variables.rs:334:9:334:12 | text |  |
-| variables.rs:335:14:337:5 | BlockExpr | variables.rs:334:9:334:12 | text |  |
+| variables.rs:335:14:337:5 | { ... } | variables.rs:334:9:334:12 | text |  |
 | variables.rs:336:9:336:17 | print_str | variables.rs:336:19:336:22 | text |  |
-| variables.rs:336:9:336:23 | CallExpr | variables.rs:335:14:337:5 | BlockExpr |  |
+| variables.rs:336:9:336:23 | print_str(...) | variables.rs:335:14:337:5 | { ... } |  |
 | variables.rs:336:9:336:24 | ExprStmt | variables.rs:336:9:336:17 | print_str |  |
-| variables.rs:336:19:336:22 | text | variables.rs:336:9:336:23 | CallExpr |  |
-| variables.rs:340:1:346:1 | enter add_assign | variables.rs:341:5:341:18 | LetStmt |  |
-| variables.rs:340:1:346:1 | exit add_assign (normal) | variables.rs:340:1:346:1 | exit add_assign |  |
-| variables.rs:340:17:346:1 | BlockExpr | variables.rs:340:1:346:1 | exit add_assign (normal) |  |
-| variables.rs:341:5:341:18 | LetStmt | variables.rs:341:17:341:17 | 0 |  |
+| variables.rs:336:19:336:22 | text | variables.rs:336:9:336:23 | print_str(...) |  |
+| variables.rs:340:1:346:1 | enter fn add_assign | variables.rs:341:5:341:18 | let ... = 0 |  |
+| variables.rs:340:1:346:1 | exit fn add_assign (normal) | variables.rs:340:1:346:1 | exit fn add_assign |  |
+| variables.rs:340:17:346:1 | { ... } | variables.rs:340:1:346:1 | exit fn add_assign (normal) |  |
+| variables.rs:341:5:341:18 | let ... = 0 | variables.rs:341:17:341:17 | 0 |  |
 | variables.rs:341:9:341:13 | a | variables.rs:342:5:342:11 | ExprStmt | match |
 | variables.rs:341:17:341:17 | 0 | variables.rs:341:9:341:13 | a |  |
 | variables.rs:342:5:342:5 | a | variables.rs:342:10:342:10 | 1 |  |
@@ -737,41 +737,41 @@ edges
 | variables.rs:342:5:342:11 | ExprStmt | variables.rs:342:5:342:5 | a |  |
 | variables.rs:342:10:342:10 | 1 | variables.rs:342:5:342:10 | ... += ... |  |
 | variables.rs:343:5:343:13 | print_i64 | variables.rs:343:15:343:15 | a |  |
-| variables.rs:343:5:343:16 | CallExpr | variables.rs:344:5:344:28 | ExprStmt |  |
+| variables.rs:343:5:343:16 | print_i64(...) | variables.rs:344:5:344:28 | ExprStmt |  |
 | variables.rs:343:5:343:17 | ExprStmt | variables.rs:343:5:343:13 | print_i64 |  |
-| variables.rs:343:15:343:15 | a | variables.rs:343:5:343:16 | CallExpr |  |
+| variables.rs:343:15:343:15 | a | variables.rs:343:5:343:16 | print_i64(...) |  |
 | variables.rs:344:5:344:27 | ... .add_assign(...) | variables.rs:345:5:345:17 | ExprStmt |  |
 | variables.rs:344:5:344:28 | ExprStmt | variables.rs:344:11:344:11 | a |  |
-| variables.rs:344:6:344:11 | RefExpr | variables.rs:344:25:344:26 | 10 |  |
-| variables.rs:344:11:344:11 | a | variables.rs:344:6:344:11 | RefExpr |  |
+| variables.rs:344:6:344:11 | &mut a | variables.rs:344:25:344:26 | 10 |  |
+| variables.rs:344:11:344:11 | a | variables.rs:344:6:344:11 | &mut a |  |
 | variables.rs:344:25:344:26 | 10 | variables.rs:344:5:344:27 | ... .add_assign(...) |  |
 | variables.rs:345:5:345:13 | print_i64 | variables.rs:345:15:345:15 | a |  |
-| variables.rs:345:5:345:16 | CallExpr | variables.rs:340:17:346:1 | BlockExpr |  |
+| variables.rs:345:5:345:16 | print_i64(...) | variables.rs:340:17:346:1 | { ... } |  |
 | variables.rs:345:5:345:17 | ExprStmt | variables.rs:345:5:345:13 | print_i64 |  |
-| variables.rs:345:15:345:15 | a | variables.rs:345:5:345:16 | CallExpr |  |
-| variables.rs:348:1:354:1 | enter mutate | variables.rs:349:5:349:18 | LetStmt |  |
-| variables.rs:348:1:354:1 | exit mutate (normal) | variables.rs:348:1:354:1 | exit mutate |  |
-| variables.rs:348:13:354:1 | BlockExpr | variables.rs:348:1:354:1 | exit mutate (normal) |  |
-| variables.rs:349:5:349:18 | LetStmt | variables.rs:349:17:349:17 | 1 |  |
-| variables.rs:349:9:349:13 | i | variables.rs:350:5:351:15 | LetStmt | match |
+| variables.rs:345:15:345:15 | a | variables.rs:345:5:345:16 | print_i64(...) |  |
+| variables.rs:348:1:354:1 | enter fn mutate | variables.rs:349:5:349:18 | let ... = 1 |  |
+| variables.rs:348:1:354:1 | exit fn mutate (normal) | variables.rs:348:1:354:1 | exit fn mutate |  |
+| variables.rs:348:13:354:1 | { ... } | variables.rs:348:1:354:1 | exit fn mutate (normal) |  |
+| variables.rs:349:5:349:18 | let ... = 1 | variables.rs:349:17:349:17 | 1 |  |
+| variables.rs:349:9:349:13 | i | variables.rs:350:5:351:15 | let ... = ... | match |
 | variables.rs:349:17:349:17 | 1 | variables.rs:349:9:349:13 | i |  |
-| variables.rs:350:5:351:15 | LetStmt | variables.rs:351:14:351:14 | i |  |
+| variables.rs:350:5:351:15 | let ... = ... | variables.rs:351:14:351:14 | i |  |
 | variables.rs:350:9:350:13 | ref_i | variables.rs:352:5:352:15 | ExprStmt | match |
-| variables.rs:351:9:351:14 | RefExpr | variables.rs:350:9:350:13 | ref_i |  |
-| variables.rs:351:14:351:14 | i | variables.rs:351:9:351:14 | RefExpr |  |
+| variables.rs:351:9:351:14 | &mut i | variables.rs:350:9:350:13 | ref_i |  |
+| variables.rs:351:14:351:14 | i | variables.rs:351:9:351:14 | &mut i |  |
 | variables.rs:352:5:352:10 | * ... | variables.rs:352:14:352:14 | 2 |  |
 | variables.rs:352:5:352:14 | ... = ... | variables.rs:353:5:353:17 | ExprStmt |  |
 | variables.rs:352:5:352:15 | ExprStmt | variables.rs:352:6:352:10 | ref_i |  |
 | variables.rs:352:6:352:10 | ref_i | variables.rs:352:5:352:10 | * ... |  |
 | variables.rs:352:14:352:14 | 2 | variables.rs:352:5:352:14 | ... = ... |  |
 | variables.rs:353:5:353:13 | print_i64 | variables.rs:353:15:353:15 | i |  |
-| variables.rs:353:5:353:16 | CallExpr | variables.rs:348:13:354:1 | BlockExpr |  |
+| variables.rs:353:5:353:16 | print_i64(...) | variables.rs:348:13:354:1 | { ... } |  |
 | variables.rs:353:5:353:17 | ExprStmt | variables.rs:353:5:353:13 | print_i64 |  |
-| variables.rs:353:15:353:15 | i | variables.rs:353:5:353:16 | CallExpr |  |
-| variables.rs:356:1:361:1 | enter mutate_param | variables.rs:356:17:356:17 | x |  |
-| variables.rs:356:1:361:1 | exit mutate_param (normal) | variables.rs:356:1:361:1 | exit mutate_param |  |
-| variables.rs:356:17:356:17 | x | variables.rs:356:17:356:28 | Param | match |
-| variables.rs:356:17:356:28 | Param | variables.rs:357:5:359:11 | ExprStmt |  |
+| variables.rs:353:15:353:15 | i | variables.rs:353:5:353:16 | print_i64(...) |  |
+| variables.rs:356:1:361:1 | enter fn mutate_param | variables.rs:356:17:356:17 | x |  |
+| variables.rs:356:1:361:1 | exit fn mutate_param (normal) | variables.rs:356:1:361:1 | exit fn mutate_param |  |
+| variables.rs:356:17:356:17 | x | variables.rs:356:17:356:28 | ...: ... | match |
+| variables.rs:356:17:356:28 | ...: ... | variables.rs:357:5:359:11 | ExprStmt |  |
 | variables.rs:357:5:357:6 | * ... | variables.rs:358:10:358:10 | x |  |
 | variables.rs:357:5:359:10 | ... = ... | variables.rs:360:5:360:13 | ExprStmt |  |
 | variables.rs:357:5:359:11 | ExprStmt | variables.rs:357:6:357:6 | x |  |
@@ -781,16 +781,16 @@ edges
 | variables.rs:358:10:358:10 | x | variables.rs:358:9:358:10 | * ... |  |
 | variables.rs:359:9:359:10 | * ... | variables.rs:358:9:359:10 | ... + ... |  |
 | variables.rs:359:10:359:10 | x | variables.rs:359:9:359:10 | * ... |  |
-| variables.rs:360:5:360:12 | ReturnExpr | variables.rs:356:1:361:1 | exit mutate_param (normal) | return |
+| variables.rs:360:5:360:12 | return x | variables.rs:356:1:361:1 | exit fn mutate_param (normal) | return |
 | variables.rs:360:5:360:13 | ExprStmt | variables.rs:360:12:360:12 | x |  |
-| variables.rs:360:12:360:12 | x | variables.rs:360:5:360:12 | ReturnExpr |  |
-| variables.rs:363:1:369:1 | enter mutate_param2 | variables.rs:363:22:363:22 | x |  |
-| variables.rs:363:1:369:1 | exit mutate_param2 (normal) | variables.rs:363:1:369:1 | exit mutate_param2 |  |
-| variables.rs:363:22:363:22 | x | variables.rs:363:22:363:36 | Param | match |
-| variables.rs:363:22:363:36 | Param | variables.rs:363:39:363:39 | y |  |
-| variables.rs:363:39:363:39 | y | variables.rs:363:39:363:57 | Param | match |
-| variables.rs:363:39:363:57 | Param | variables.rs:364:5:366:11 | ExprStmt |  |
-| variables.rs:363:60:369:1 | BlockExpr | variables.rs:363:1:369:1 | exit mutate_param2 (normal) |  |
+| variables.rs:360:12:360:12 | x | variables.rs:360:5:360:12 | return x |  |
+| variables.rs:363:1:369:1 | enter fn mutate_param2 | variables.rs:363:22:363:22 | x |  |
+| variables.rs:363:1:369:1 | exit fn mutate_param2 (normal) | variables.rs:363:1:369:1 | exit fn mutate_param2 |  |
+| variables.rs:363:22:363:22 | x | variables.rs:363:22:363:36 | ...: ... | match |
+| variables.rs:363:22:363:36 | ...: ... | variables.rs:363:39:363:39 | y |  |
+| variables.rs:363:39:363:39 | y | variables.rs:363:39:363:57 | ...: ... | match |
+| variables.rs:363:39:363:57 | ...: ... | variables.rs:364:5:366:11 | ExprStmt |  |
+| variables.rs:363:60:369:1 | { ... } | variables.rs:363:1:369:1 | exit fn mutate_param2 (normal) |  |
 | variables.rs:364:5:364:6 | * ... | variables.rs:365:10:365:10 | x |  |
 | variables.rs:364:5:366:10 | ... = ... | variables.rs:367:5:368:10 | ExprStmt |  |
 | variables.rs:364:5:366:11 | ExprStmt | variables.rs:364:6:364:6 | x |  |
@@ -801,45 +801,45 @@ edges
 | variables.rs:366:9:366:10 | * ... | variables.rs:365:9:366:10 | ... + ... |  |
 | variables.rs:366:10:366:10 | x | variables.rs:366:9:366:10 | * ... |  |
 | variables.rs:367:5:367:6 | * ... | variables.rs:368:9:368:9 | x |  |
-| variables.rs:367:5:368:9 | ... = ... | variables.rs:363:60:369:1 | BlockExpr |  |
+| variables.rs:367:5:368:9 | ... = ... | variables.rs:363:60:369:1 | { ... } |  |
 | variables.rs:367:5:368:10 | ExprStmt | variables.rs:367:6:367:6 | y |  |
 | variables.rs:367:6:367:6 | y | variables.rs:367:5:367:6 | * ... |  |
 | variables.rs:368:9:368:9 | x | variables.rs:367:5:368:9 | ... = ... |  |
-| variables.rs:371:1:389:1 | enter mutate_arg | variables.rs:372:5:372:18 | LetStmt |  |
-| variables.rs:371:1:389:1 | exit mutate_arg (normal) | variables.rs:371:1:389:1 | exit mutate_arg |  |
-| variables.rs:371:17:389:1 | BlockExpr | variables.rs:371:1:389:1 | exit mutate_arg (normal) |  |
-| variables.rs:372:5:372:18 | LetStmt | variables.rs:372:17:372:17 | 2 |  |
-| variables.rs:372:9:372:13 | x | variables.rs:373:5:374:29 | LetStmt | match |
+| variables.rs:371:1:389:1 | enter fn mutate_arg | variables.rs:372:5:372:18 | let ... = 2 |  |
+| variables.rs:371:1:389:1 | exit fn mutate_arg (normal) | variables.rs:371:1:389:1 | exit fn mutate_arg |  |
+| variables.rs:371:17:389:1 | { ... } | variables.rs:371:1:389:1 | exit fn mutate_arg (normal) |  |
+| variables.rs:372:5:372:18 | let ... = 2 | variables.rs:372:17:372:17 | 2 |  |
+| variables.rs:372:9:372:13 | x | variables.rs:373:5:374:29 | let ... = ... | match |
 | variables.rs:372:17:372:17 | 2 | variables.rs:372:9:372:13 | x |  |
-| variables.rs:373:5:374:29 | LetStmt | variables.rs:374:9:374:20 | mutate_param |  |
+| variables.rs:373:5:374:29 | let ... = ... | variables.rs:374:9:374:20 | mutate_param |  |
 | variables.rs:373:9:373:9 | y | variables.rs:375:5:375:12 | ExprStmt | match |
 | variables.rs:374:9:374:20 | mutate_param | variables.rs:374:27:374:27 | x |  |
-| variables.rs:374:9:374:28 | CallExpr | variables.rs:373:9:373:9 | y |  |
-| variables.rs:374:22:374:27 | RefExpr | variables.rs:374:9:374:28 | CallExpr |  |
-| variables.rs:374:27:374:27 | x | variables.rs:374:22:374:27 | RefExpr |  |
+| variables.rs:374:9:374:28 | mutate_param(...) | variables.rs:373:9:373:9 | y |  |
+| variables.rs:374:22:374:27 | &mut x | variables.rs:374:9:374:28 | mutate_param(...) |  |
+| variables.rs:374:27:374:27 | x | variables.rs:374:22:374:27 | &mut x |  |
 | variables.rs:375:5:375:6 | * ... | variables.rs:375:10:375:11 | 10 |  |
 | variables.rs:375:5:375:11 | ... = ... | variables.rs:377:5:377:17 | ExprStmt |  |
 | variables.rs:375:5:375:12 | ExprStmt | variables.rs:375:6:375:6 | y |  |
 | variables.rs:375:6:375:6 | y | variables.rs:375:5:375:6 | * ... |  |
 | variables.rs:375:10:375:11 | 10 | variables.rs:375:5:375:11 | ... = ... |  |
 | variables.rs:377:5:377:13 | print_i64 | variables.rs:377:15:377:15 | x |  |
-| variables.rs:377:5:377:16 | CallExpr | variables.rs:379:5:379:18 | LetStmt |  |
+| variables.rs:377:5:377:16 | print_i64(...) | variables.rs:379:5:379:18 | let ... = 4 |  |
 | variables.rs:377:5:377:17 | ExprStmt | variables.rs:377:5:377:13 | print_i64 |  |
-| variables.rs:377:15:377:15 | x | variables.rs:377:5:377:16 | CallExpr |  |
-| variables.rs:379:5:379:18 | LetStmt | variables.rs:379:17:379:17 | 4 |  |
-| variables.rs:379:9:379:13 | z | variables.rs:380:5:381:20 | LetStmt | match |
+| variables.rs:377:15:377:15 | x | variables.rs:377:5:377:16 | print_i64(...) |  |
+| variables.rs:379:5:379:18 | let ... = 4 | variables.rs:379:17:379:17 | 4 |  |
+| variables.rs:379:9:379:13 | z | variables.rs:380:5:381:20 | let ... = ... | match |
 | variables.rs:379:17:379:17 | 4 | variables.rs:379:9:379:13 | z |  |
-| variables.rs:380:5:381:20 | LetStmt | variables.rs:381:19:381:19 | x |  |
+| variables.rs:380:5:381:20 | let ... = ... | variables.rs:381:19:381:19 | x |  |
 | variables.rs:380:9:380:9 | w | variables.rs:382:5:385:6 | ExprStmt | match |
-| variables.rs:381:9:381:19 | RefExpr | variables.rs:380:9:380:9 | w |  |
-| variables.rs:381:14:381:19 | RefExpr | variables.rs:381:9:381:19 | RefExpr |  |
-| variables.rs:381:19:381:19 | x | variables.rs:381:14:381:19 | RefExpr |  |
+| variables.rs:381:9:381:19 | &mut ... | variables.rs:380:9:380:9 | w |  |
+| variables.rs:381:14:381:19 | &mut x | variables.rs:381:9:381:19 | &mut ... |  |
+| variables.rs:381:19:381:19 | x | variables.rs:381:14:381:19 | &mut x |  |
 | variables.rs:382:5:382:17 | mutate_param2 | variables.rs:383:14:383:14 | z |  |
-| variables.rs:382:5:385:5 | CallExpr | variables.rs:386:5:386:13 | ExprStmt |  |
+| variables.rs:382:5:385:5 | mutate_param2(...) | variables.rs:386:5:386:13 | ExprStmt |  |
 | variables.rs:382:5:385:6 | ExprStmt | variables.rs:382:5:382:17 | mutate_param2 |  |
-| variables.rs:383:9:383:14 | RefExpr | variables.rs:384:9:384:9 | w |  |
-| variables.rs:383:14:383:14 | z | variables.rs:383:9:383:14 | RefExpr |  |
-| variables.rs:384:9:384:9 | w | variables.rs:382:5:385:5 | CallExpr |  |
+| variables.rs:383:9:383:14 | &mut z | variables.rs:384:9:384:9 | w |  |
+| variables.rs:383:14:383:14 | z | variables.rs:383:9:383:14 | &mut z |  |
+| variables.rs:384:9:384:9 | w | variables.rs:382:5:385:5 | mutate_param2(...) |  |
 | variables.rs:386:5:386:7 | * ... | variables.rs:386:11:386:12 | 11 |  |
 | variables.rs:386:5:386:12 | ... = ... | variables.rs:388:5:388:17 | ExprStmt |  |
 | variables.rs:386:5:386:13 | ExprStmt | variables.rs:386:7:386:7 | w |  |
@@ -847,422 +847,432 @@ edges
 | variables.rs:386:7:386:7 | w | variables.rs:386:6:386:7 | * ... |  |
 | variables.rs:386:11:386:12 | 11 | variables.rs:386:5:386:12 | ... = ... |  |
 | variables.rs:388:5:388:13 | print_i64 | variables.rs:388:15:388:15 | z |  |
-| variables.rs:388:5:388:16 | CallExpr | variables.rs:371:17:389:1 | BlockExpr |  |
+| variables.rs:388:5:388:16 | print_i64(...) | variables.rs:371:17:389:1 | { ... } |  |
 | variables.rs:388:5:388:17 | ExprStmt | variables.rs:388:5:388:13 | print_i64 |  |
-| variables.rs:388:15:388:15 | z | variables.rs:388:5:388:16 | CallExpr |  |
-| variables.rs:391:1:397:1 | enter alias | variables.rs:392:5:392:18 | LetStmt |  |
-| variables.rs:391:1:397:1 | exit alias (normal) | variables.rs:391:1:397:1 | exit alias |  |
-| variables.rs:391:12:397:1 | BlockExpr | variables.rs:391:1:397:1 | exit alias (normal) |  |
-| variables.rs:392:5:392:18 | LetStmt | variables.rs:392:17:392:17 | 1 |  |
-| variables.rs:392:9:392:13 | x | variables.rs:393:5:394:15 | LetStmt | match |
+| variables.rs:388:15:388:15 | z | variables.rs:388:5:388:16 | print_i64(...) |  |
+| variables.rs:391:1:397:1 | enter fn alias | variables.rs:392:5:392:18 | let ... = 1 |  |
+| variables.rs:391:1:397:1 | exit fn alias (normal) | variables.rs:391:1:397:1 | exit fn alias |  |
+| variables.rs:391:12:397:1 | { ... } | variables.rs:391:1:397:1 | exit fn alias (normal) |  |
+| variables.rs:392:5:392:18 | let ... = 1 | variables.rs:392:17:392:17 | 1 |  |
+| variables.rs:392:9:392:13 | x | variables.rs:393:5:394:15 | let ... = ... | match |
 | variables.rs:392:17:392:17 | 1 | variables.rs:392:9:392:13 | x |  |
-| variables.rs:393:5:394:15 | LetStmt | variables.rs:394:14:394:14 | x |  |
+| variables.rs:393:5:394:15 | let ... = ... | variables.rs:394:14:394:14 | x |  |
 | variables.rs:393:9:393:9 | y | variables.rs:395:5:395:11 | ExprStmt | match |
-| variables.rs:394:9:394:14 | RefExpr | variables.rs:393:9:393:9 | y |  |
-| variables.rs:394:14:394:14 | x | variables.rs:394:9:394:14 | RefExpr |  |
+| variables.rs:394:9:394:14 | &mut x | variables.rs:393:9:393:9 | y |  |
+| variables.rs:394:14:394:14 | x | variables.rs:394:9:394:14 | &mut x |  |
 | variables.rs:395:5:395:6 | * ... | variables.rs:395:10:395:10 | 2 |  |
 | variables.rs:395:5:395:10 | ... = ... | variables.rs:396:5:396:17 | ExprStmt |  |
 | variables.rs:395:5:395:11 | ExprStmt | variables.rs:395:6:395:6 | y |  |
 | variables.rs:395:6:395:6 | y | variables.rs:395:5:395:6 | * ... |  |
 | variables.rs:395:10:395:10 | 2 | variables.rs:395:5:395:10 | ... = ... |  |
 | variables.rs:396:5:396:13 | print_i64 | variables.rs:396:15:396:15 | x |  |
-| variables.rs:396:5:396:16 | CallExpr | variables.rs:391:12:397:1 | BlockExpr |  |
+| variables.rs:396:5:396:16 | print_i64(...) | variables.rs:391:12:397:1 | { ... } |  |
 | variables.rs:396:5:396:17 | ExprStmt | variables.rs:396:5:396:13 | print_i64 |  |
-| variables.rs:396:15:396:15 | x | variables.rs:396:5:396:16 | CallExpr |  |
-| variables.rs:399:1:407:1 | enter capture_immut | variables.rs:400:5:400:16 | LetStmt |  |
-| variables.rs:399:1:407:1 | exit capture_immut (normal) | variables.rs:399:1:407:1 | exit capture_immut |  |
-| variables.rs:399:20:407:1 | BlockExpr | variables.rs:399:1:407:1 | exit capture_immut (normal) |  |
-| variables.rs:400:5:400:16 | LetStmt | variables.rs:400:13:400:15 | 100 |  |
-| variables.rs:400:9:400:9 | x | variables.rs:402:5:404:6 | LetStmt | match |
+| variables.rs:396:15:396:15 | x | variables.rs:396:5:396:16 | print_i64(...) |  |
+| variables.rs:399:1:407:1 | enter fn capture_immut | variables.rs:400:5:400:16 | let ... = 100 |  |
+| variables.rs:399:1:407:1 | exit fn capture_immut (normal) | variables.rs:399:1:407:1 | exit fn capture_immut |  |
+| variables.rs:399:20:407:1 | { ... } | variables.rs:399:1:407:1 | exit fn capture_immut (normal) |  |
+| variables.rs:400:5:400:16 | let ... = 100 | variables.rs:400:13:400:15 | 100 |  |
+| variables.rs:400:9:400:9 | x | variables.rs:402:5:404:6 | let ... = ... | match |
 | variables.rs:400:13:400:15 | 100 | variables.rs:400:9:400:9 | x |  |
-| variables.rs:402:5:404:6 | LetStmt | variables.rs:402:15:404:5 | ClosureExpr |  |
+| variables.rs:402:5:404:6 | let ... = ... | variables.rs:402:15:404:5 | \|...\| ... |  |
 | variables.rs:402:9:402:11 | cap | variables.rs:405:5:405:10 | ExprStmt | match |
-| variables.rs:402:15:404:5 | ClosureExpr | variables.rs:402:9:402:11 | cap |  |
-| variables.rs:402:15:404:5 | enter ClosureExpr | variables.rs:403:9:403:21 | ExprStmt |  |
-| variables.rs:402:15:404:5 | exit ClosureExpr (normal) | variables.rs:402:15:404:5 | exit ClosureExpr |  |
-| variables.rs:402:18:404:5 | BlockExpr | variables.rs:402:15:404:5 | exit ClosureExpr (normal) |  |
+| variables.rs:402:15:404:5 | \|...\| ... | variables.rs:402:9:402:11 | cap |  |
+| variables.rs:402:15:404:5 | enter \|...\| ... | variables.rs:403:9:403:21 | ExprStmt |  |
+| variables.rs:402:15:404:5 | exit \|...\| ... (normal) | variables.rs:402:15:404:5 | exit \|...\| ... |  |
+| variables.rs:402:18:404:5 | { ... } | variables.rs:402:15:404:5 | exit \|...\| ... (normal) |  |
 | variables.rs:403:9:403:17 | print_i64 | variables.rs:403:19:403:19 | x |  |
-| variables.rs:403:9:403:20 | CallExpr | variables.rs:402:18:404:5 | BlockExpr |  |
+| variables.rs:403:9:403:20 | print_i64(...) | variables.rs:402:18:404:5 | { ... } |  |
 | variables.rs:403:9:403:21 | ExprStmt | variables.rs:403:9:403:17 | print_i64 |  |
-| variables.rs:403:19:403:19 | x | variables.rs:403:9:403:20 | CallExpr |  |
-| variables.rs:405:5:405:7 | cap | variables.rs:405:5:405:9 | CallExpr |  |
-| variables.rs:405:5:405:9 | CallExpr | variables.rs:406:5:406:17 | ExprStmt |  |
+| variables.rs:403:19:403:19 | x | variables.rs:403:9:403:20 | print_i64(...) |  |
+| variables.rs:405:5:405:7 | cap | variables.rs:405:5:405:9 | cap(...) |  |
+| variables.rs:405:5:405:9 | cap(...) | variables.rs:406:5:406:17 | ExprStmt |  |
 | variables.rs:405:5:405:10 | ExprStmt | variables.rs:405:5:405:7 | cap |  |
 | variables.rs:406:5:406:13 | print_i64 | variables.rs:406:15:406:15 | x |  |
-| variables.rs:406:5:406:16 | CallExpr | variables.rs:399:20:407:1 | BlockExpr |  |
+| variables.rs:406:5:406:16 | print_i64(...) | variables.rs:399:20:407:1 | { ... } |  |
 | variables.rs:406:5:406:17 | ExprStmt | variables.rs:406:5:406:13 | print_i64 |  |
-| variables.rs:406:15:406:15 | x | variables.rs:406:5:406:16 | CallExpr |  |
-| variables.rs:409:1:433:1 | enter capture_mut | variables.rs:410:5:410:18 | LetStmt |  |
-| variables.rs:409:1:433:1 | exit capture_mut (normal) | variables.rs:409:1:433:1 | exit capture_mut |  |
-| variables.rs:409:18:433:1 | BlockExpr | variables.rs:409:1:433:1 | exit capture_mut (normal) |  |
-| variables.rs:410:5:410:18 | LetStmt | variables.rs:410:17:410:17 | 1 |  |
-| variables.rs:410:9:410:13 | x | variables.rs:412:5:414:6 | LetStmt | match |
+| variables.rs:406:15:406:15 | x | variables.rs:406:5:406:16 | print_i64(...) |  |
+| variables.rs:409:1:433:1 | enter fn capture_mut | variables.rs:410:5:410:18 | let ... = 1 |  |
+| variables.rs:409:1:433:1 | exit fn capture_mut (normal) | variables.rs:409:1:433:1 | exit fn capture_mut |  |
+| variables.rs:409:18:433:1 | { ... } | variables.rs:409:1:433:1 | exit fn capture_mut (normal) |  |
+| variables.rs:410:5:410:18 | let ... = 1 | variables.rs:410:17:410:17 | 1 |  |
+| variables.rs:410:9:410:13 | x | variables.rs:412:5:414:6 | let ... = ... | match |
 | variables.rs:410:17:410:17 | 1 | variables.rs:410:9:410:13 | x |  |
-| variables.rs:412:5:414:6 | LetStmt | variables.rs:412:20:414:5 | ClosureExpr |  |
+| variables.rs:412:5:414:6 | let ... = ... | variables.rs:412:20:414:5 | \|...\| ... |  |
 | variables.rs:412:9:412:16 | closure1 | variables.rs:415:5:415:15 | ExprStmt | match |
-| variables.rs:412:20:414:5 | ClosureExpr | variables.rs:412:9:412:16 | closure1 |  |
-| variables.rs:412:20:414:5 | enter ClosureExpr | variables.rs:413:9:413:21 | ExprStmt |  |
-| variables.rs:412:20:414:5 | exit ClosureExpr (normal) | variables.rs:412:20:414:5 | exit ClosureExpr |  |
-| variables.rs:412:23:414:5 | BlockExpr | variables.rs:412:20:414:5 | exit ClosureExpr (normal) |  |
+| variables.rs:412:20:414:5 | \|...\| ... | variables.rs:412:9:412:16 | closure1 |  |
+| variables.rs:412:20:414:5 | enter \|...\| ... | variables.rs:413:9:413:21 | ExprStmt |  |
+| variables.rs:412:20:414:5 | exit \|...\| ... (normal) | variables.rs:412:20:414:5 | exit \|...\| ... |  |
+| variables.rs:412:23:414:5 | { ... } | variables.rs:412:20:414:5 | exit \|...\| ... (normal) |  |
 | variables.rs:413:9:413:17 | print_i64 | variables.rs:413:19:413:19 | x |  |
-| variables.rs:413:9:413:20 | CallExpr | variables.rs:412:23:414:5 | BlockExpr |  |
+| variables.rs:413:9:413:20 | print_i64(...) | variables.rs:412:23:414:5 | { ... } |  |
 | variables.rs:413:9:413:21 | ExprStmt | variables.rs:413:9:413:17 | print_i64 |  |
-| variables.rs:413:19:413:19 | x | variables.rs:413:9:413:20 | CallExpr |  |
-| variables.rs:415:5:415:12 | closure1 | variables.rs:415:5:415:14 | CallExpr |  |
-| variables.rs:415:5:415:14 | CallExpr | variables.rs:416:5:416:17 | ExprStmt |  |
+| variables.rs:413:19:413:19 | x | variables.rs:413:9:413:20 | print_i64(...) |  |
+| variables.rs:415:5:415:12 | closure1 | variables.rs:415:5:415:14 | closure1(...) |  |
+| variables.rs:415:5:415:14 | closure1(...) | variables.rs:416:5:416:17 | ExprStmt |  |
 | variables.rs:415:5:415:15 | ExprStmt | variables.rs:415:5:415:12 | closure1 |  |
 | variables.rs:416:5:416:13 | print_i64 | variables.rs:416:15:416:15 | x |  |
-| variables.rs:416:5:416:16 | CallExpr | variables.rs:418:5:418:18 | LetStmt |  |
+| variables.rs:416:5:416:16 | print_i64(...) | variables.rs:418:5:418:18 | let ... = 2 |  |
 | variables.rs:416:5:416:17 | ExprStmt | variables.rs:416:5:416:13 | print_i64 |  |
-| variables.rs:416:15:416:15 | x | variables.rs:416:5:416:16 | CallExpr |  |
-| variables.rs:418:5:418:18 | LetStmt | variables.rs:418:17:418:17 | 2 |  |
-| variables.rs:418:9:418:13 | y | variables.rs:420:5:422:6 | LetStmt | match |
+| variables.rs:416:15:416:15 | x | variables.rs:416:5:416:16 | print_i64(...) |  |
+| variables.rs:418:5:418:18 | let ... = 2 | variables.rs:418:17:418:17 | 2 |  |
+| variables.rs:418:9:418:13 | y | variables.rs:420:5:422:6 | let ... = ... | match |
 | variables.rs:418:17:418:17 | 2 | variables.rs:418:9:418:13 | y |  |
-| variables.rs:420:5:422:6 | LetStmt | variables.rs:420:24:422:5 | ClosureExpr |  |
+| variables.rs:420:5:422:6 | let ... = ... | variables.rs:420:24:422:5 | \|...\| ... |  |
 | variables.rs:420:9:420:20 | closure2 | variables.rs:423:5:423:15 | ExprStmt | match |
-| variables.rs:420:24:422:5 | ClosureExpr | variables.rs:420:9:420:20 | closure2 |  |
-| variables.rs:420:24:422:5 | enter ClosureExpr | variables.rs:421:9:421:14 | ExprStmt |  |
-| variables.rs:420:24:422:5 | exit ClosureExpr (normal) | variables.rs:420:24:422:5 | exit ClosureExpr |  |
-| variables.rs:420:27:422:5 | BlockExpr | variables.rs:420:24:422:5 | exit ClosureExpr (normal) |  |
+| variables.rs:420:24:422:5 | \|...\| ... | variables.rs:420:9:420:20 | closure2 |  |
+| variables.rs:420:24:422:5 | enter \|...\| ... | variables.rs:421:9:421:14 | ExprStmt |  |
+| variables.rs:420:24:422:5 | exit \|...\| ... (normal) | variables.rs:420:24:422:5 | exit \|...\| ... |  |
+| variables.rs:420:27:422:5 | { ... } | variables.rs:420:24:422:5 | exit \|...\| ... (normal) |  |
 | variables.rs:421:9:421:9 | y | variables.rs:421:13:421:13 | 3 |  |
-| variables.rs:421:9:421:13 | ... = ... | variables.rs:420:27:422:5 | BlockExpr |  |
+| variables.rs:421:9:421:13 | ... = ... | variables.rs:420:27:422:5 | { ... } |  |
 | variables.rs:421:9:421:14 | ExprStmt | variables.rs:421:9:421:9 | y |  |
 | variables.rs:421:13:421:13 | 3 | variables.rs:421:9:421:13 | ... = ... |  |
-| variables.rs:423:5:423:12 | closure2 | variables.rs:423:5:423:14 | CallExpr |  |
-| variables.rs:423:5:423:14 | CallExpr | variables.rs:424:5:424:17 | ExprStmt |  |
+| variables.rs:423:5:423:12 | closure2 | variables.rs:423:5:423:14 | closure2(...) |  |
+| variables.rs:423:5:423:14 | closure2(...) | variables.rs:424:5:424:17 | ExprStmt |  |
 | variables.rs:423:5:423:15 | ExprStmt | variables.rs:423:5:423:12 | closure2 |  |
 | variables.rs:424:5:424:13 | print_i64 | variables.rs:424:15:424:15 | y |  |
-| variables.rs:424:5:424:16 | CallExpr | variables.rs:426:5:426:18 | LetStmt |  |
+| variables.rs:424:5:424:16 | print_i64(...) | variables.rs:426:5:426:18 | let ... = 2 |  |
 | variables.rs:424:5:424:17 | ExprStmt | variables.rs:424:5:424:13 | print_i64 |  |
-| variables.rs:424:15:424:15 | y | variables.rs:424:5:424:16 | CallExpr |  |
-| variables.rs:426:5:426:18 | LetStmt | variables.rs:426:17:426:17 | 2 |  |
-| variables.rs:426:9:426:13 | z | variables.rs:428:5:430:6 | LetStmt | match |
+| variables.rs:424:15:424:15 | y | variables.rs:424:5:424:16 | print_i64(...) |  |
+| variables.rs:426:5:426:18 | let ... = 2 | variables.rs:426:17:426:17 | 2 |  |
+| variables.rs:426:9:426:13 | z | variables.rs:428:5:430:6 | let ... = ... | match |
 | variables.rs:426:17:426:17 | 2 | variables.rs:426:9:426:13 | z |  |
-| variables.rs:428:5:430:6 | LetStmt | variables.rs:428:24:430:5 | ClosureExpr |  |
+| variables.rs:428:5:430:6 | let ... = ... | variables.rs:428:24:430:5 | \|...\| ... |  |
 | variables.rs:428:9:428:20 | closure3 | variables.rs:431:5:431:15 | ExprStmt | match |
-| variables.rs:428:24:430:5 | ClosureExpr | variables.rs:428:9:428:20 | closure3 |  |
-| variables.rs:428:24:430:5 | enter ClosureExpr | variables.rs:429:9:429:24 | ExprStmt |  |
-| variables.rs:428:24:430:5 | exit ClosureExpr (normal) | variables.rs:428:24:430:5 | exit ClosureExpr |  |
-| variables.rs:428:27:430:5 | BlockExpr | variables.rs:428:24:430:5 | exit ClosureExpr (normal) |  |
+| variables.rs:428:24:430:5 | \|...\| ... | variables.rs:428:9:428:20 | closure3 |  |
+| variables.rs:428:24:430:5 | enter \|...\| ... | variables.rs:429:9:429:24 | ExprStmt |  |
+| variables.rs:428:24:430:5 | exit \|...\| ... (normal) | variables.rs:428:24:430:5 | exit \|...\| ... |  |
+| variables.rs:428:27:430:5 | { ... } | variables.rs:428:24:430:5 | exit \|...\| ... (normal) |  |
 | variables.rs:429:9:429:9 | z | variables.rs:429:22:429:22 | 1 |  |
-| variables.rs:429:9:429:23 | ... .add_assign(...) | variables.rs:428:27:430:5 | BlockExpr |  |
+| variables.rs:429:9:429:23 | ... .add_assign(...) | variables.rs:428:27:430:5 | { ... } |  |
 | variables.rs:429:9:429:24 | ExprStmt | variables.rs:429:9:429:9 | z |  |
 | variables.rs:429:22:429:22 | 1 | variables.rs:429:9:429:23 | ... .add_assign(...) |  |
-| variables.rs:431:5:431:12 | closure3 | variables.rs:431:5:431:14 | CallExpr |  |
-| variables.rs:431:5:431:14 | CallExpr | variables.rs:432:5:432:17 | ExprStmt |  |
+| variables.rs:431:5:431:12 | closure3 | variables.rs:431:5:431:14 | closure3(...) |  |
+| variables.rs:431:5:431:14 | closure3(...) | variables.rs:432:5:432:17 | ExprStmt |  |
 | variables.rs:431:5:431:15 | ExprStmt | variables.rs:431:5:431:12 | closure3 |  |
 | variables.rs:432:5:432:13 | print_i64 | variables.rs:432:15:432:15 | z |  |
-| variables.rs:432:5:432:16 | CallExpr | variables.rs:409:18:433:1 | BlockExpr |  |
+| variables.rs:432:5:432:16 | print_i64(...) | variables.rs:409:18:433:1 | { ... } |  |
 | variables.rs:432:5:432:17 | ExprStmt | variables.rs:432:5:432:13 | print_i64 |  |
-| variables.rs:432:15:432:15 | z | variables.rs:432:5:432:16 | CallExpr |  |
-| variables.rs:435:1:443:1 | enter async_block_capture | variables.rs:436:5:436:23 | LetStmt |  |
-| variables.rs:435:1:443:1 | exit async_block_capture (normal) | variables.rs:435:1:443:1 | exit async_block_capture |  |
-| variables.rs:435:32:443:1 | BlockExpr | variables.rs:435:1:443:1 | exit async_block_capture (normal) |  |
-| variables.rs:436:5:436:23 | LetStmt | variables.rs:436:22:436:22 | 0 |  |
-| variables.rs:436:9:436:13 | i | variables.rs:437:5:439:6 | LetStmt | match |
+| variables.rs:432:15:432:15 | z | variables.rs:432:5:432:16 | print_i64(...) |  |
+| variables.rs:435:1:443:1 | enter fn async_block_capture | variables.rs:436:5:436:23 | let ... = 0 |  |
+| variables.rs:435:1:443:1 | exit fn async_block_capture (normal) | variables.rs:435:1:443:1 | exit fn async_block_capture |  |
+| variables.rs:435:32:443:1 | { ... } | variables.rs:435:1:443:1 | exit fn async_block_capture (normal) |  |
+| variables.rs:436:5:436:23 | let ... = 0 | variables.rs:436:22:436:22 | 0 |  |
+| variables.rs:436:9:436:13 | i | variables.rs:437:5:439:6 | let ... = ... | match |
 | variables.rs:436:22:436:22 | 0 | variables.rs:436:9:436:13 | i |  |
-| variables.rs:437:5:439:6 | LetStmt | variables.rs:437:17:439:5 | BlockExpr |  |
+| variables.rs:437:5:439:6 | let ... = ... | variables.rs:437:17:439:5 | { ... } |  |
 | variables.rs:437:9:437:13 | block | variables.rs:441:5:441:16 | ExprStmt | match |
-| variables.rs:437:17:439:5 | BlockExpr | variables.rs:437:9:437:13 | block |  |
-| variables.rs:437:17:439:5 | enter BlockExpr | variables.rs:438:9:438:14 | ExprStmt |  |
-| variables.rs:437:17:439:5 | exit BlockExpr (normal) | variables.rs:437:17:439:5 | exit BlockExpr |  |
+| variables.rs:437:17:439:5 | enter { ... } | variables.rs:438:9:438:14 | ExprStmt |  |
+| variables.rs:437:17:439:5 | exit { ... } (normal) | variables.rs:437:17:439:5 | exit { ... } |  |
+| variables.rs:437:17:439:5 | { ... } | variables.rs:437:9:437:13 | block |  |
 | variables.rs:438:9:438:9 | i | variables.rs:438:13:438:13 | 1 |  |
-| variables.rs:438:9:438:13 | ... = ... | variables.rs:437:17:439:5 | exit BlockExpr (normal) |  |
+| variables.rs:438:9:438:13 | ... = ... | variables.rs:437:17:439:5 | exit { ... } (normal) |  |
 | variables.rs:438:9:438:14 | ExprStmt | variables.rs:438:9:438:9 | i |  |
 | variables.rs:438:13:438:13 | 1 | variables.rs:438:9:438:13 | ... = ... |  |
-| variables.rs:441:5:441:9 | block | variables.rs:441:5:441:15 | AwaitExpr |  |
-| variables.rs:441:5:441:15 | AwaitExpr | variables.rs:442:5:442:17 | ExprStmt |  |
+| variables.rs:441:5:441:9 | block | variables.rs:441:5:441:15 | await block |  |
+| variables.rs:441:5:441:15 | await block | variables.rs:442:5:442:17 | ExprStmt |  |
 | variables.rs:441:5:441:16 | ExprStmt | variables.rs:441:5:441:9 | block |  |
 | variables.rs:442:5:442:13 | print_i64 | variables.rs:442:15:442:15 | i |  |
-| variables.rs:442:5:442:16 | CallExpr | variables.rs:435:32:443:1 | BlockExpr |  |
+| variables.rs:442:5:442:16 | print_i64(...) | variables.rs:435:32:443:1 | { ... } |  |
 | variables.rs:442:5:442:17 | ExprStmt | variables.rs:442:5:442:13 | print_i64 |  |
-| variables.rs:442:15:442:15 | i | variables.rs:442:5:442:16 | CallExpr |  |
-| variables.rs:445:1:459:1 | enter phi | variables.rs:445:8:445:8 | b |  |
-| variables.rs:445:1:459:1 | exit phi (normal) | variables.rs:445:1:459:1 | exit phi |  |
-| variables.rs:445:8:445:8 | b | variables.rs:445:8:445:15 | Param | match |
-| variables.rs:445:8:445:15 | Param | variables.rs:446:5:446:18 | LetStmt |  |
-| variables.rs:445:18:459:1 | BlockExpr | variables.rs:445:1:459:1 | exit phi (normal) |  |
-| variables.rs:446:5:446:18 | LetStmt | variables.rs:446:17:446:17 | 1 |  |
+| variables.rs:442:15:442:15 | i | variables.rs:442:5:442:16 | print_i64(...) |  |
+| variables.rs:445:1:459:1 | enter fn phi | variables.rs:445:8:445:8 | b |  |
+| variables.rs:445:1:459:1 | exit fn phi (normal) | variables.rs:445:1:459:1 | exit fn phi |  |
+| variables.rs:445:8:445:8 | b | variables.rs:445:8:445:15 | ...: bool | match |
+| variables.rs:445:8:445:15 | ...: bool | variables.rs:446:5:446:18 | let ... = 1 |  |
+| variables.rs:445:18:459:1 | { ... } | variables.rs:445:1:459:1 | exit fn phi (normal) |  |
+| variables.rs:446:5:446:18 | let ... = 1 | variables.rs:446:17:446:17 | 1 |  |
 | variables.rs:446:9:446:13 | x | variables.rs:447:5:447:17 | ExprStmt | match |
 | variables.rs:446:17:446:17 | 1 | variables.rs:446:9:446:13 | x |  |
 | variables.rs:447:5:447:13 | print_i64 | variables.rs:447:15:447:15 | x |  |
-| variables.rs:447:5:447:16 | CallExpr | variables.rs:448:5:448:21 | ExprStmt |  |
+| variables.rs:447:5:447:16 | print_i64(...) | variables.rs:448:5:448:21 | ExprStmt |  |
 | variables.rs:447:5:447:17 | ExprStmt | variables.rs:447:5:447:13 | print_i64 |  |
-| variables.rs:447:15:447:15 | x | variables.rs:447:5:447:16 | CallExpr |  |
+| variables.rs:447:15:447:15 | x | variables.rs:447:5:447:16 | print_i64(...) |  |
 | variables.rs:448:5:448:13 | print_i64 | variables.rs:448:15:448:15 | x |  |
-| variables.rs:448:5:448:20 | CallExpr | variables.rs:449:5:457:5 | ExprStmt |  |
+| variables.rs:448:5:448:20 | print_i64(...) | variables.rs:449:5:457:5 | ExprStmt |  |
 | variables.rs:448:5:448:21 | ExprStmt | variables.rs:448:5:448:13 | print_i64 |  |
 | variables.rs:448:15:448:15 | x | variables.rs:448:19:448:19 | 1 |  |
-| variables.rs:448:15:448:19 | ... + ... | variables.rs:448:5:448:20 | CallExpr |  |
+| variables.rs:448:15:448:19 | ... + ... | variables.rs:448:5:448:20 | print_i64(...) |  |
 | variables.rs:448:19:448:19 | 1 | variables.rs:448:15:448:19 | ... + ... |  |
 | variables.rs:449:5:457:5 | ExprStmt | variables.rs:449:8:449:8 | b |  |
-| variables.rs:449:5:457:5 | IfExpr | variables.rs:458:5:458:17 | ExprStmt |  |
+| variables.rs:449:5:457:5 | if b {...} else {...} | variables.rs:458:5:458:17 | ExprStmt |  |
 | variables.rs:449:8:449:8 | b | variables.rs:450:9:450:14 | ExprStmt | true |
 | variables.rs:449:8:449:8 | b | variables.rs:454:9:454:14 | ExprStmt | false |
-| variables.rs:449:10:453:5 | BlockExpr | variables.rs:449:5:457:5 | IfExpr |  |
+| variables.rs:449:10:453:5 | { ... } | variables.rs:449:5:457:5 | if b {...} else {...} |  |
 | variables.rs:450:9:450:9 | x | variables.rs:450:13:450:13 | 2 |  |
 | variables.rs:450:9:450:13 | ... = ... | variables.rs:451:9:451:21 | ExprStmt |  |
 | variables.rs:450:9:450:14 | ExprStmt | variables.rs:450:9:450:9 | x |  |
 | variables.rs:450:13:450:13 | 2 | variables.rs:450:9:450:13 | ... = ... |  |
 | variables.rs:451:9:451:17 | print_i64 | variables.rs:451:19:451:19 | x |  |
-| variables.rs:451:9:451:20 | CallExpr | variables.rs:452:9:452:25 | ExprStmt |  |
+| variables.rs:451:9:451:20 | print_i64(...) | variables.rs:452:9:452:25 | ExprStmt |  |
 | variables.rs:451:9:451:21 | ExprStmt | variables.rs:451:9:451:17 | print_i64 |  |
-| variables.rs:451:19:451:19 | x | variables.rs:451:9:451:20 | CallExpr |  |
+| variables.rs:451:19:451:19 | x | variables.rs:451:9:451:20 | print_i64(...) |  |
 | variables.rs:452:9:452:17 | print_i64 | variables.rs:452:19:452:19 | x |  |
-| variables.rs:452:9:452:24 | CallExpr | variables.rs:449:10:453:5 | BlockExpr |  |
+| variables.rs:452:9:452:24 | print_i64(...) | variables.rs:449:10:453:5 | { ... } |  |
 | variables.rs:452:9:452:25 | ExprStmt | variables.rs:452:9:452:17 | print_i64 |  |
 | variables.rs:452:19:452:19 | x | variables.rs:452:23:452:23 | 1 |  |
-| variables.rs:452:19:452:23 | ... + ... | variables.rs:452:9:452:24 | CallExpr |  |
+| variables.rs:452:19:452:23 | ... + ... | variables.rs:452:9:452:24 | print_i64(...) |  |
 | variables.rs:452:23:452:23 | 1 | variables.rs:452:19:452:23 | ... + ... |  |
-| variables.rs:453:12:457:5 | BlockExpr | variables.rs:449:5:457:5 | IfExpr |  |
+| variables.rs:453:12:457:5 | { ... } | variables.rs:449:5:457:5 | if b {...} else {...} |  |
 | variables.rs:454:9:454:9 | x | variables.rs:454:13:454:13 | 3 |  |
 | variables.rs:454:9:454:13 | ... = ... | variables.rs:455:9:455:21 | ExprStmt |  |
 | variables.rs:454:9:454:14 | ExprStmt | variables.rs:454:9:454:9 | x |  |
 | variables.rs:454:13:454:13 | 3 | variables.rs:454:9:454:13 | ... = ... |  |
 | variables.rs:455:9:455:17 | print_i64 | variables.rs:455:19:455:19 | x |  |
-| variables.rs:455:9:455:20 | CallExpr | variables.rs:456:9:456:25 | ExprStmt |  |
+| variables.rs:455:9:455:20 | print_i64(...) | variables.rs:456:9:456:25 | ExprStmt |  |
 | variables.rs:455:9:455:21 | ExprStmt | variables.rs:455:9:455:17 | print_i64 |  |
-| variables.rs:455:19:455:19 | x | variables.rs:455:9:455:20 | CallExpr |  |
+| variables.rs:455:19:455:19 | x | variables.rs:455:9:455:20 | print_i64(...) |  |
 | variables.rs:456:9:456:17 | print_i64 | variables.rs:456:19:456:19 | x |  |
-| variables.rs:456:9:456:24 | CallExpr | variables.rs:453:12:457:5 | BlockExpr |  |
+| variables.rs:456:9:456:24 | print_i64(...) | variables.rs:453:12:457:5 | { ... } |  |
 | variables.rs:456:9:456:25 | ExprStmt | variables.rs:456:9:456:17 | print_i64 |  |
 | variables.rs:456:19:456:19 | x | variables.rs:456:23:456:23 | 1 |  |
-| variables.rs:456:19:456:23 | ... + ... | variables.rs:456:9:456:24 | CallExpr |  |
+| variables.rs:456:19:456:23 | ... + ... | variables.rs:456:9:456:24 | print_i64(...) |  |
 | variables.rs:456:23:456:23 | 1 | variables.rs:456:19:456:23 | ... + ... |  |
 | variables.rs:458:5:458:13 | print_i64 | variables.rs:458:15:458:15 | x |  |
-| variables.rs:458:5:458:16 | CallExpr | variables.rs:445:18:459:1 | BlockExpr |  |
+| variables.rs:458:5:458:16 | print_i64(...) | variables.rs:445:18:459:1 | { ... } |  |
 | variables.rs:458:5:458:17 | ExprStmt | variables.rs:458:5:458:13 | print_i64 |  |
-| variables.rs:458:15:458:15 | x | variables.rs:458:5:458:16 | CallExpr |  |
-| variables.rs:461:1:474:1 | enter phi_read | variables.rs:461:13:461:14 | b1 |  |
-| variables.rs:461:1:474:1 | exit phi_read (normal) | variables.rs:461:1:474:1 | exit phi_read |  |
-| variables.rs:461:13:461:14 | b1 | variables.rs:461:13:461:21 | Param | match |
-| variables.rs:461:13:461:21 | Param | variables.rs:461:24:461:25 | b2 |  |
-| variables.rs:461:24:461:25 | b2 | variables.rs:461:24:461:32 | Param | match |
-| variables.rs:461:24:461:32 | Param | variables.rs:462:5:462:14 | LetStmt |  |
-| variables.rs:461:35:474:1 | BlockExpr | variables.rs:461:1:474:1 | exit phi_read (normal) |  |
-| variables.rs:462:5:462:14 | LetStmt | variables.rs:462:13:462:13 | 1 |  |
+| variables.rs:458:15:458:15 | x | variables.rs:458:5:458:16 | print_i64(...) |  |
+| variables.rs:461:1:474:1 | enter fn phi_read | variables.rs:461:13:461:14 | b1 |  |
+| variables.rs:461:1:474:1 | exit fn phi_read (normal) | variables.rs:461:1:474:1 | exit fn phi_read |  |
+| variables.rs:461:13:461:14 | b1 | variables.rs:461:13:461:21 | ...: bool | match |
+| variables.rs:461:13:461:21 | ...: bool | variables.rs:461:24:461:25 | b2 |  |
+| variables.rs:461:24:461:25 | b2 | variables.rs:461:24:461:32 | ...: bool | match |
+| variables.rs:461:24:461:32 | ...: bool | variables.rs:462:5:462:14 | let ... = 1 |  |
+| variables.rs:461:35:474:1 | { ... } | variables.rs:461:1:474:1 | exit fn phi_read (normal) |  |
+| variables.rs:462:5:462:14 | let ... = 1 | variables.rs:462:13:462:13 | 1 |  |
 | variables.rs:462:9:462:9 | x | variables.rs:463:5:467:5 | ExprStmt | match |
 | variables.rs:462:13:462:13 | 1 | variables.rs:462:9:462:9 | x |  |
 | variables.rs:463:5:467:5 | ExprStmt | variables.rs:463:8:463:9 | b1 |  |
-| variables.rs:463:5:467:5 | IfExpr | variables.rs:469:8:469:9 | b2 |  |
+| variables.rs:463:5:467:5 | if b1 {...} else {...} | variables.rs:469:8:469:9 | b2 |  |
 | variables.rs:463:8:463:9 | b1 | variables.rs:464:9:464:21 | ExprStmt | true |
 | variables.rs:463:8:463:9 | b1 | variables.rs:466:9:466:21 | ExprStmt | false |
-| variables.rs:463:11:465:5 | BlockExpr | variables.rs:463:5:467:5 | IfExpr |  |
+| variables.rs:463:11:465:5 | { ... } | variables.rs:463:5:467:5 | if b1 {...} else {...} |  |
 | variables.rs:464:9:464:17 | print_i64 | variables.rs:464:19:464:19 | x |  |
-| variables.rs:464:9:464:20 | CallExpr | variables.rs:463:11:465:5 | BlockExpr |  |
+| variables.rs:464:9:464:20 | print_i64(...) | variables.rs:463:11:465:5 | { ... } |  |
 | variables.rs:464:9:464:21 | ExprStmt | variables.rs:464:9:464:17 | print_i64 |  |
-| variables.rs:464:19:464:19 | x | variables.rs:464:9:464:20 | CallExpr |  |
-| variables.rs:465:12:467:5 | BlockExpr | variables.rs:463:5:467:5 | IfExpr |  |
+| variables.rs:464:19:464:19 | x | variables.rs:464:9:464:20 | print_i64(...) |  |
+| variables.rs:465:12:467:5 | { ... } | variables.rs:463:5:467:5 | if b1 {...} else {...} |  |
 | variables.rs:466:9:466:17 | print_i64 | variables.rs:466:19:466:19 | x |  |
-| variables.rs:466:9:466:20 | CallExpr | variables.rs:465:12:467:5 | BlockExpr |  |
+| variables.rs:466:9:466:20 | print_i64(...) | variables.rs:465:12:467:5 | { ... } |  |
 | variables.rs:466:9:466:21 | ExprStmt | variables.rs:466:9:466:17 | print_i64 |  |
-| variables.rs:466:19:466:19 | x | variables.rs:466:9:466:20 | CallExpr |  |
-| variables.rs:469:5:473:5 | IfExpr | variables.rs:461:35:474:1 | BlockExpr |  |
+| variables.rs:466:19:466:19 | x | variables.rs:466:9:466:20 | print_i64(...) |  |
+| variables.rs:469:5:473:5 | if b2 {...} else {...} | variables.rs:461:35:474:1 | { ... } |  |
 | variables.rs:469:8:469:9 | b2 | variables.rs:470:9:470:21 | ExprStmt | true |
 | variables.rs:469:8:469:9 | b2 | variables.rs:472:9:472:21 | ExprStmt | false |
-| variables.rs:469:11:471:5 | BlockExpr | variables.rs:469:5:473:5 | IfExpr |  |
+| variables.rs:469:11:471:5 | { ... } | variables.rs:469:5:473:5 | if b2 {...} else {...} |  |
 | variables.rs:470:9:470:17 | print_i64 | variables.rs:470:19:470:19 | x |  |
-| variables.rs:470:9:470:20 | CallExpr | variables.rs:469:11:471:5 | BlockExpr |  |
+| variables.rs:470:9:470:20 | print_i64(...) | variables.rs:469:11:471:5 | { ... } |  |
 | variables.rs:470:9:470:21 | ExprStmt | variables.rs:470:9:470:17 | print_i64 |  |
-| variables.rs:470:19:470:19 | x | variables.rs:470:9:470:20 | CallExpr |  |
-| variables.rs:471:12:473:5 | BlockExpr | variables.rs:469:5:473:5 | IfExpr |  |
+| variables.rs:470:19:470:19 | x | variables.rs:470:9:470:20 | print_i64(...) |  |
+| variables.rs:471:12:473:5 | { ... } | variables.rs:469:5:473:5 | if b2 {...} else {...} |  |
 | variables.rs:472:9:472:17 | print_i64 | variables.rs:472:19:472:19 | x |  |
-| variables.rs:472:9:472:20 | CallExpr | variables.rs:471:12:473:5 | BlockExpr |  |
+| variables.rs:472:9:472:20 | print_i64(...) | variables.rs:471:12:473:5 | { ... } |  |
 | variables.rs:472:9:472:21 | ExprStmt | variables.rs:472:9:472:17 | print_i64 |  |
-| variables.rs:472:19:472:19 | x | variables.rs:472:9:472:20 | CallExpr |  |
-| variables.rs:482:5:484:5 | enter my_get | variables.rs:483:9:483:24 | ExprStmt |  |
-| variables.rs:482:5:484:5 | exit my_get (normal) | variables.rs:482:5:484:5 | exit my_get |  |
-| variables.rs:483:9:483:23 | ReturnExpr | variables.rs:482:5:484:5 | exit my_get (normal) | return |
+| variables.rs:472:19:472:19 | x | variables.rs:472:9:472:20 | print_i64(...) |  |
+| variables.rs:482:5:484:5 | enter fn my_get | variables.rs:482:20:482:23 | self |  |
+| variables.rs:482:5:484:5 | exit fn my_get (normal) | variables.rs:482:5:484:5 | exit fn my_get |  |
+| variables.rs:482:15:482:23 | SelfParam | variables.rs:483:9:483:24 | ExprStmt |  |
+| variables.rs:482:20:482:23 | self | variables.rs:482:15:482:23 | SelfParam |  |
+| variables.rs:483:9:483:23 | return ... | variables.rs:482:5:484:5 | exit fn my_get (normal) | return |
 | variables.rs:483:9:483:24 | ExprStmt | variables.rs:483:16:483:19 | self |  |
-| variables.rs:483:16:483:19 | self | variables.rs:483:16:483:23 | FieldExpr |  |
-| variables.rs:483:16:483:23 | FieldExpr | variables.rs:483:9:483:23 | ReturnExpr |  |
-| variables.rs:487:1:494:1 | enter structs | variables.rs:488:5:488:36 | LetStmt |  |
-| variables.rs:487:1:494:1 | exit structs (normal) | variables.rs:487:1:494:1 | exit structs |  |
-| variables.rs:487:14:494:1 | BlockExpr | variables.rs:487:1:494:1 | exit structs (normal) |  |
-| variables.rs:488:5:488:36 | LetStmt | variables.rs:488:33:488:33 | 1 |  |
-| variables.rs:488:9:488:13 | a | variables.rs:489:5:489:26 | ExprStmt | match |
-| variables.rs:488:17:488:35 | RecordExpr | variables.rs:488:9:488:13 | a |  |
-| variables.rs:488:33:488:33 | 1 | variables.rs:488:17:488:35 | RecordExpr |  |
-| variables.rs:489:5:489:13 | print_i64 | variables.rs:489:15:489:15 | a |  |
-| variables.rs:489:5:489:25 | CallExpr | variables.rs:490:5:490:14 | ExprStmt |  |
-| variables.rs:489:5:489:26 | ExprStmt | variables.rs:489:5:489:13 | print_i64 |  |
-| variables.rs:489:15:489:15 | a | variables.rs:489:15:489:24 | ... .my_get(...) |  |
-| variables.rs:489:15:489:24 | ... .my_get(...) | variables.rs:489:5:489:25 | CallExpr |  |
-| variables.rs:490:5:490:5 | a | variables.rs:490:5:490:9 | FieldExpr |  |
-| variables.rs:490:5:490:9 | FieldExpr | variables.rs:490:13:490:13 | 5 |  |
-| variables.rs:490:5:490:13 | ... = ... | variables.rs:491:5:491:26 | ExprStmt |  |
-| variables.rs:490:5:490:14 | ExprStmt | variables.rs:490:5:490:5 | a |  |
-| variables.rs:490:13:490:13 | 5 | variables.rs:490:5:490:13 | ... = ... |  |
-| variables.rs:491:5:491:13 | print_i64 | variables.rs:491:15:491:15 | a |  |
-| variables.rs:491:5:491:25 | CallExpr | variables.rs:492:5:492:28 | ExprStmt |  |
-| variables.rs:491:5:491:26 | ExprStmt | variables.rs:491:5:491:13 | print_i64 |  |
-| variables.rs:491:15:491:15 | a | variables.rs:491:15:491:24 | ... .my_get(...) |  |
-| variables.rs:491:15:491:24 | ... .my_get(...) | variables.rs:491:5:491:25 | CallExpr |  |
-| variables.rs:492:5:492:5 | a | variables.rs:492:25:492:25 | 2 |  |
-| variables.rs:492:5:492:27 | ... = ... | variables.rs:493:5:493:26 | ExprStmt |  |
-| variables.rs:492:5:492:28 | ExprStmt | variables.rs:492:5:492:5 | a |  |
-| variables.rs:492:9:492:27 | RecordExpr | variables.rs:492:5:492:27 | ... = ... |  |
-| variables.rs:492:25:492:25 | 2 | variables.rs:492:9:492:27 | RecordExpr |  |
+| variables.rs:483:16:483:19 | self | variables.rs:483:16:483:23 | self.val |  |
+| variables.rs:483:16:483:23 | self.val | variables.rs:483:9:483:23 | return ... |  |
+| variables.rs:486:5:488:5 | enter fn id | variables.rs:486:11:486:14 | self |  |
+| variables.rs:486:5:488:5 | exit fn id (normal) | variables.rs:486:5:488:5 | exit fn id |  |
+| variables.rs:486:11:486:14 | SelfParam | variables.rs:487:9:487:12 | self |  |
+| variables.rs:486:11:486:14 | self | variables.rs:486:11:486:14 | SelfParam |  |
+| variables.rs:486:25:488:5 | { ... } | variables.rs:486:5:488:5 | exit fn id (normal) |  |
+| variables.rs:487:9:487:12 | self | variables.rs:486:25:488:5 | { ... } |  |
+| variables.rs:491:1:498:1 | enter fn structs | variables.rs:492:5:492:36 | let ... = ... |  |
+| variables.rs:491:1:498:1 | exit fn structs (normal) | variables.rs:491:1:498:1 | exit fn structs |  |
+| variables.rs:491:14:498:1 | { ... } | variables.rs:491:1:498:1 | exit fn structs (normal) |  |
+| variables.rs:492:5:492:36 | let ... = ... | variables.rs:492:33:492:33 | 1 |  |
+| variables.rs:492:9:492:13 | a | variables.rs:493:5:493:26 | ExprStmt | match |
+| variables.rs:492:17:492:35 | MyStruct {...} | variables.rs:492:9:492:13 | a |  |
+| variables.rs:492:33:492:33 | 1 | variables.rs:492:17:492:35 | MyStruct {...} |  |
 | variables.rs:493:5:493:13 | print_i64 | variables.rs:493:15:493:15 | a |  |
-| variables.rs:493:5:493:25 | CallExpr | variables.rs:487:14:494:1 | BlockExpr |  |
+| variables.rs:493:5:493:25 | print_i64(...) | variables.rs:494:5:494:14 | ExprStmt |  |
 | variables.rs:493:5:493:26 | ExprStmt | variables.rs:493:5:493:13 | print_i64 |  |
 | variables.rs:493:15:493:15 | a | variables.rs:493:15:493:24 | ... .my_get(...) |  |
-| variables.rs:493:15:493:24 | ... .my_get(...) | variables.rs:493:5:493:25 | CallExpr |  |
-| variables.rs:496:1:503:1 | enter ref_arg | variables.rs:497:5:497:15 | LetStmt |  |
-| variables.rs:496:1:503:1 | exit ref_arg (normal) | variables.rs:496:1:503:1 | exit ref_arg |  |
-| variables.rs:496:14:503:1 | BlockExpr | variables.rs:496:1:503:1 | exit ref_arg (normal) |  |
-| variables.rs:497:5:497:15 | LetStmt | variables.rs:497:13:497:14 | 16 |  |
-| variables.rs:497:9:497:9 | x | variables.rs:498:5:498:22 | ExprStmt | match |
-| variables.rs:497:13:497:14 | 16 | variables.rs:497:9:497:9 | x |  |
-| variables.rs:498:5:498:17 | print_i64_ref | variables.rs:498:20:498:20 | x |  |
-| variables.rs:498:5:498:21 | CallExpr | variables.rs:499:5:499:17 | ExprStmt |  |
-| variables.rs:498:5:498:22 | ExprStmt | variables.rs:498:5:498:17 | print_i64_ref |  |
-| variables.rs:498:19:498:20 | RefExpr | variables.rs:498:5:498:21 | CallExpr |  |
-| variables.rs:498:20:498:20 | x | variables.rs:498:19:498:20 | RefExpr |  |
-| variables.rs:499:5:499:13 | print_i64 | variables.rs:499:15:499:15 | x |  |
-| variables.rs:499:5:499:16 | CallExpr | variables.rs:501:5:501:15 | LetStmt |  |
-| variables.rs:499:5:499:17 | ExprStmt | variables.rs:499:5:499:13 | print_i64 |  |
-| variables.rs:499:15:499:15 | x | variables.rs:499:5:499:16 | CallExpr |  |
-| variables.rs:501:5:501:15 | LetStmt | variables.rs:501:13:501:14 | 17 |  |
-| variables.rs:501:9:501:9 | z | variables.rs:502:5:502:22 | ExprStmt | match |
-| variables.rs:501:13:501:14 | 17 | variables.rs:501:9:501:9 | z |  |
-| variables.rs:502:5:502:17 | print_i64_ref | variables.rs:502:20:502:20 | z |  |
-| variables.rs:502:5:502:21 | CallExpr | variables.rs:496:14:503:1 | BlockExpr |  |
+| variables.rs:493:15:493:24 | ... .my_get(...) | variables.rs:493:5:493:25 | print_i64(...) |  |
+| variables.rs:494:5:494:5 | a | variables.rs:494:5:494:9 | a.val |  |
+| variables.rs:494:5:494:9 | a.val | variables.rs:494:13:494:13 | 5 |  |
+| variables.rs:494:5:494:13 | ... = ... | variables.rs:495:5:495:26 | ExprStmt |  |
+| variables.rs:494:5:494:14 | ExprStmt | variables.rs:494:5:494:5 | a |  |
+| variables.rs:494:13:494:13 | 5 | variables.rs:494:5:494:13 | ... = ... |  |
+| variables.rs:495:5:495:13 | print_i64 | variables.rs:495:15:495:15 | a |  |
+| variables.rs:495:5:495:25 | print_i64(...) | variables.rs:496:5:496:28 | ExprStmt |  |
+| variables.rs:495:5:495:26 | ExprStmt | variables.rs:495:5:495:13 | print_i64 |  |
+| variables.rs:495:15:495:15 | a | variables.rs:495:15:495:24 | ... .my_get(...) |  |
+| variables.rs:495:15:495:24 | ... .my_get(...) | variables.rs:495:5:495:25 | print_i64(...) |  |
+| variables.rs:496:5:496:5 | a | variables.rs:496:25:496:25 | 2 |  |
+| variables.rs:496:5:496:27 | ... = ... | variables.rs:497:5:497:26 | ExprStmt |  |
+| variables.rs:496:5:496:28 | ExprStmt | variables.rs:496:5:496:5 | a |  |
+| variables.rs:496:9:496:27 | MyStruct {...} | variables.rs:496:5:496:27 | ... = ... |  |
+| variables.rs:496:25:496:25 | 2 | variables.rs:496:9:496:27 | MyStruct {...} |  |
+| variables.rs:497:5:497:13 | print_i64 | variables.rs:497:15:497:15 | a |  |
+| variables.rs:497:5:497:25 | print_i64(...) | variables.rs:491:14:498:1 | { ... } |  |
+| variables.rs:497:5:497:26 | ExprStmt | variables.rs:497:5:497:13 | print_i64 |  |
+| variables.rs:497:15:497:15 | a | variables.rs:497:15:497:24 | ... .my_get(...) |  |
+| variables.rs:497:15:497:24 | ... .my_get(...) | variables.rs:497:5:497:25 | print_i64(...) |  |
+| variables.rs:500:1:507:1 | enter fn ref_arg | variables.rs:501:5:501:15 | let ... = 16 |  |
+| variables.rs:500:1:507:1 | exit fn ref_arg (normal) | variables.rs:500:1:507:1 | exit fn ref_arg |  |
+| variables.rs:500:14:507:1 | { ... } | variables.rs:500:1:507:1 | exit fn ref_arg (normal) |  |
+| variables.rs:501:5:501:15 | let ... = 16 | variables.rs:501:13:501:14 | 16 |  |
+| variables.rs:501:9:501:9 | x | variables.rs:502:5:502:22 | ExprStmt | match |
+| variables.rs:501:13:501:14 | 16 | variables.rs:501:9:501:9 | x |  |
+| variables.rs:502:5:502:17 | print_i64_ref | variables.rs:502:20:502:20 | x |  |
+| variables.rs:502:5:502:21 | print_i64_ref(...) | variables.rs:503:5:503:17 | ExprStmt |  |
 | variables.rs:502:5:502:22 | ExprStmt | variables.rs:502:5:502:17 | print_i64_ref |  |
-| variables.rs:502:19:502:20 | RefExpr | variables.rs:502:5:502:21 | CallExpr |  |
-| variables.rs:502:20:502:20 | z | variables.rs:502:19:502:20 | RefExpr |  |
-| variables.rs:510:3:512:3 | enter bar | variables.rs:511:5:511:32 | ExprStmt |  |
-| variables.rs:510:3:512:3 | exit bar (normal) | variables.rs:510:3:512:3 | exit bar |  |
-| variables.rs:510:21:512:3 | BlockExpr | variables.rs:510:3:512:3 | exit bar (normal) |  |
-| variables.rs:511:5:511:9 | * ... | variables.rs:511:29:511:29 | 3 |  |
-| variables.rs:511:5:511:31 | ... = ... | variables.rs:510:21:512:3 | BlockExpr |  |
-| variables.rs:511:5:511:32 | ExprStmt | variables.rs:511:6:511:9 | self |  |
-| variables.rs:511:6:511:9 | self | variables.rs:511:5:511:9 | * ... |  |
-| variables.rs:511:13:511:31 | RecordExpr | variables.rs:511:5:511:31 | ... = ... |  |
-| variables.rs:511:29:511:29 | 3 | variables.rs:511:13:511:31 | RecordExpr |  |
-| variables.rs:515:1:520:1 | enter ref_methodcall_receiver | variables.rs:516:3:516:34 | LetStmt |  |
-| variables.rs:515:1:520:1 | exit ref_methodcall_receiver (normal) | variables.rs:515:1:520:1 | exit ref_methodcall_receiver |  |
-| variables.rs:515:30:520:1 | BlockExpr | variables.rs:515:1:520:1 | exit ref_methodcall_receiver (normal) |  |
-| variables.rs:516:3:516:34 | LetStmt | variables.rs:516:31:516:31 | 1 |  |
-| variables.rs:516:7:516:11 | a | variables.rs:517:3:517:10 | ExprStmt | match |
-| variables.rs:516:15:516:33 | RecordExpr | variables.rs:516:7:516:11 | a |  |
-| variables.rs:516:31:516:31 | 1 | variables.rs:516:15:516:33 | RecordExpr |  |
-| variables.rs:517:3:517:3 | a | variables.rs:517:3:517:9 | ... .bar(...) |  |
-| variables.rs:517:3:517:9 | ... .bar(...) | variables.rs:519:3:519:19 | ExprStmt |  |
-| variables.rs:517:3:517:10 | ExprStmt | variables.rs:517:3:517:3 | a |  |
-| variables.rs:519:3:519:11 | print_i64 | variables.rs:519:13:519:13 | a |  |
-| variables.rs:519:3:519:18 | CallExpr | variables.rs:515:30:520:1 | BlockExpr |  |
-| variables.rs:519:3:519:19 | ExprStmt | variables.rs:519:3:519:11 | print_i64 |  |
-| variables.rs:519:13:519:13 | a | variables.rs:519:13:519:17 | FieldExpr |  |
-| variables.rs:519:13:519:17 | FieldExpr | variables.rs:519:3:519:18 | CallExpr |  |
-| variables.rs:522:1:556:1 | enter main | variables.rs:523:5:523:25 | ExprStmt |  |
-| variables.rs:522:1:556:1 | exit main (normal) | variables.rs:522:1:556:1 | exit main |  |
-| variables.rs:522:11:556:1 | BlockExpr | variables.rs:522:1:556:1 | exit main (normal) |  |
-| variables.rs:523:5:523:22 | immutable_variable | variables.rs:523:5:523:24 | CallExpr |  |
-| variables.rs:523:5:523:24 | CallExpr | variables.rs:524:5:524:23 | ExprStmt |  |
-| variables.rs:523:5:523:25 | ExprStmt | variables.rs:523:5:523:22 | immutable_variable |  |
-| variables.rs:524:5:524:20 | mutable_variable | variables.rs:524:5:524:22 | CallExpr |  |
-| variables.rs:524:5:524:22 | CallExpr | variables.rs:525:5:525:40 | ExprStmt |  |
-| variables.rs:524:5:524:23 | ExprStmt | variables.rs:524:5:524:20 | mutable_variable |  |
-| variables.rs:525:5:525:37 | mutable_variable_immutable_borrow | variables.rs:525:5:525:39 | CallExpr |  |
-| variables.rs:525:5:525:39 | CallExpr | variables.rs:526:5:526:23 | ExprStmt |  |
-| variables.rs:525:5:525:40 | ExprStmt | variables.rs:525:5:525:37 | mutable_variable_immutable_borrow |  |
-| variables.rs:526:5:526:20 | variable_shadow1 | variables.rs:526:5:526:22 | CallExpr |  |
-| variables.rs:526:5:526:22 | CallExpr | variables.rs:527:5:527:23 | ExprStmt |  |
-| variables.rs:526:5:526:23 | ExprStmt | variables.rs:526:5:526:20 | variable_shadow1 |  |
-| variables.rs:527:5:527:20 | variable_shadow2 | variables.rs:527:5:527:22 | CallExpr |  |
-| variables.rs:527:5:527:22 | CallExpr | variables.rs:528:5:528:19 | ExprStmt |  |
-| variables.rs:527:5:527:23 | ExprStmt | variables.rs:527:5:527:20 | variable_shadow2 |  |
-| variables.rs:528:5:528:16 | let_pattern1 | variables.rs:528:5:528:18 | CallExpr |  |
-| variables.rs:528:5:528:18 | CallExpr | variables.rs:529:5:529:19 | ExprStmt |  |
-| variables.rs:528:5:528:19 | ExprStmt | variables.rs:528:5:528:16 | let_pattern1 |  |
-| variables.rs:529:5:529:16 | let_pattern2 | variables.rs:529:5:529:18 | CallExpr |  |
-| variables.rs:529:5:529:18 | CallExpr | variables.rs:530:5:530:19 | ExprStmt |  |
-| variables.rs:529:5:529:19 | ExprStmt | variables.rs:529:5:529:16 | let_pattern2 |  |
-| variables.rs:530:5:530:16 | let_pattern3 | variables.rs:530:5:530:18 | CallExpr |  |
-| variables.rs:530:5:530:18 | CallExpr | variables.rs:531:5:531:19 | ExprStmt |  |
-| variables.rs:530:5:530:19 | ExprStmt | variables.rs:530:5:530:16 | let_pattern3 |  |
-| variables.rs:531:5:531:16 | let_pattern4 | variables.rs:531:5:531:18 | CallExpr |  |
-| variables.rs:531:5:531:18 | CallExpr | variables.rs:532:5:532:21 | ExprStmt |  |
-| variables.rs:531:5:531:19 | ExprStmt | variables.rs:531:5:531:16 | let_pattern4 |  |
-| variables.rs:532:5:532:18 | match_pattern1 | variables.rs:532:5:532:20 | CallExpr |  |
-| variables.rs:532:5:532:20 | CallExpr | variables.rs:533:5:533:21 | ExprStmt |  |
-| variables.rs:532:5:532:21 | ExprStmt | variables.rs:532:5:532:18 | match_pattern1 |  |
-| variables.rs:533:5:533:18 | match_pattern2 | variables.rs:533:5:533:20 | CallExpr |  |
-| variables.rs:533:5:533:20 | CallExpr | variables.rs:534:5:534:21 | ExprStmt |  |
-| variables.rs:533:5:533:21 | ExprStmt | variables.rs:533:5:533:18 | match_pattern2 |  |
-| variables.rs:534:5:534:18 | match_pattern3 | variables.rs:534:5:534:20 | CallExpr |  |
-| variables.rs:534:5:534:20 | CallExpr | variables.rs:535:5:535:21 | ExprStmt |  |
-| variables.rs:534:5:534:21 | ExprStmt | variables.rs:534:5:534:18 | match_pattern3 |  |
-| variables.rs:535:5:535:18 | match_pattern4 | variables.rs:535:5:535:20 | CallExpr |  |
-| variables.rs:535:5:535:20 | CallExpr | variables.rs:536:5:536:21 | ExprStmt |  |
-| variables.rs:535:5:535:21 | ExprStmt | variables.rs:535:5:535:18 | match_pattern4 |  |
-| variables.rs:536:5:536:18 | match_pattern5 | variables.rs:536:5:536:20 | CallExpr |  |
-| variables.rs:536:5:536:20 | CallExpr | variables.rs:537:5:537:21 | ExprStmt |  |
-| variables.rs:536:5:536:21 | ExprStmt | variables.rs:536:5:536:18 | match_pattern5 |  |
-| variables.rs:537:5:537:18 | match_pattern6 | variables.rs:537:5:537:20 | CallExpr |  |
-| variables.rs:537:5:537:20 | CallExpr | variables.rs:538:5:538:21 | ExprStmt |  |
-| variables.rs:537:5:537:21 | ExprStmt | variables.rs:537:5:537:18 | match_pattern6 |  |
-| variables.rs:538:5:538:18 | match_pattern7 | variables.rs:538:5:538:20 | CallExpr |  |
-| variables.rs:538:5:538:20 | CallExpr | variables.rs:539:5:539:21 | ExprStmt |  |
-| variables.rs:538:5:538:21 | ExprStmt | variables.rs:538:5:538:18 | match_pattern7 |  |
-| variables.rs:539:5:539:18 | match_pattern8 | variables.rs:539:5:539:20 | CallExpr |  |
-| variables.rs:539:5:539:20 | CallExpr | variables.rs:540:5:540:21 | ExprStmt |  |
-| variables.rs:539:5:539:21 | ExprStmt | variables.rs:539:5:539:18 | match_pattern8 |  |
-| variables.rs:540:5:540:18 | match_pattern9 | variables.rs:540:5:540:20 | CallExpr |  |
-| variables.rs:540:5:540:20 | CallExpr | variables.rs:541:5:541:36 | ExprStmt |  |
-| variables.rs:540:5:540:21 | ExprStmt | variables.rs:540:5:540:18 | match_pattern9 |  |
-| variables.rs:541:5:541:18 | param_pattern1 | variables.rs:541:20:541:22 | "a" |  |
-| variables.rs:541:5:541:35 | CallExpr | variables.rs:542:5:542:37 | ExprStmt |  |
-| variables.rs:541:5:541:36 | ExprStmt | variables.rs:541:5:541:18 | param_pattern1 |  |
-| variables.rs:541:20:541:22 | "a" | variables.rs:541:26:541:28 | "b" |  |
-| variables.rs:541:25:541:34 | TupleExpr | variables.rs:541:5:541:35 | CallExpr |  |
-| variables.rs:541:26:541:28 | "b" | variables.rs:541:31:541:33 | "c" |  |
-| variables.rs:541:31:541:33 | "c" | variables.rs:541:25:541:34 | TupleExpr |  |
-| variables.rs:542:5:542:18 | param_pattern2 | variables.rs:542:20:542:31 | Either::Left |  |
-| variables.rs:542:5:542:36 | CallExpr | variables.rs:543:5:543:26 | ExprStmt |  |
-| variables.rs:542:5:542:37 | ExprStmt | variables.rs:542:5:542:18 | param_pattern2 |  |
-| variables.rs:542:20:542:31 | Either::Left | variables.rs:542:33:542:34 | 45 |  |
-| variables.rs:542:20:542:35 | CallExpr | variables.rs:542:5:542:36 | CallExpr |  |
-| variables.rs:542:33:542:34 | 45 | variables.rs:542:20:542:35 | CallExpr |  |
-| variables.rs:543:5:543:23 | destruct_assignment | variables.rs:543:5:543:25 | CallExpr |  |
-| variables.rs:543:5:543:25 | CallExpr | variables.rs:544:5:544:23 | ExprStmt |  |
-| variables.rs:543:5:543:26 | ExprStmt | variables.rs:543:5:543:23 | destruct_assignment |  |
-| variables.rs:544:5:544:20 | closure_variable | variables.rs:544:5:544:22 | CallExpr |  |
-| variables.rs:544:5:544:22 | CallExpr | variables.rs:545:5:545:19 | ExprStmt |  |
-| variables.rs:544:5:544:23 | ExprStmt | variables.rs:544:5:544:20 | closure_variable |  |
-| variables.rs:545:5:545:16 | for_variable | variables.rs:545:5:545:18 | CallExpr |  |
-| variables.rs:545:5:545:18 | CallExpr | variables.rs:546:5:546:17 | ExprStmt |  |
-| variables.rs:545:5:545:19 | ExprStmt | variables.rs:545:5:545:16 | for_variable |  |
-| variables.rs:546:5:546:14 | add_assign | variables.rs:546:5:546:16 | CallExpr |  |
-| variables.rs:546:5:546:16 | CallExpr | variables.rs:547:5:547:13 | ExprStmt |  |
-| variables.rs:546:5:546:17 | ExprStmt | variables.rs:546:5:546:14 | add_assign |  |
-| variables.rs:547:5:547:10 | mutate | variables.rs:547:5:547:12 | CallExpr |  |
-| variables.rs:547:5:547:12 | CallExpr | variables.rs:548:5:548:17 | ExprStmt |  |
-| variables.rs:547:5:547:13 | ExprStmt | variables.rs:547:5:547:10 | mutate |  |
-| variables.rs:548:5:548:14 | mutate_arg | variables.rs:548:5:548:16 | CallExpr |  |
-| variables.rs:548:5:548:16 | CallExpr | variables.rs:549:5:549:12 | ExprStmt |  |
-| variables.rs:548:5:548:17 | ExprStmt | variables.rs:548:5:548:14 | mutate_arg |  |
-| variables.rs:549:5:549:9 | alias | variables.rs:549:5:549:11 | CallExpr |  |
-| variables.rs:549:5:549:11 | CallExpr | variables.rs:550:5:550:18 | ExprStmt |  |
-| variables.rs:549:5:549:12 | ExprStmt | variables.rs:549:5:549:9 | alias |  |
-| variables.rs:550:5:550:15 | capture_mut | variables.rs:550:5:550:17 | CallExpr |  |
-| variables.rs:550:5:550:17 | CallExpr | variables.rs:551:5:551:20 | ExprStmt |  |
-| variables.rs:550:5:550:18 | ExprStmt | variables.rs:550:5:550:15 | capture_mut |  |
-| variables.rs:551:5:551:17 | capture_immut | variables.rs:551:5:551:19 | CallExpr |  |
-| variables.rs:551:5:551:19 | CallExpr | variables.rs:552:5:552:26 | ExprStmt |  |
-| variables.rs:551:5:551:20 | ExprStmt | variables.rs:551:5:551:17 | capture_immut |  |
-| variables.rs:552:5:552:23 | async_block_capture | variables.rs:552:5:552:25 | CallExpr |  |
-| variables.rs:552:5:552:25 | CallExpr | variables.rs:553:5:553:14 | ExprStmt |  |
-| variables.rs:552:5:552:26 | ExprStmt | variables.rs:552:5:552:23 | async_block_capture |  |
-| variables.rs:553:5:553:11 | structs | variables.rs:553:5:553:13 | CallExpr |  |
-| variables.rs:553:5:553:13 | CallExpr | variables.rs:554:5:554:14 | ExprStmt |  |
-| variables.rs:553:5:553:14 | ExprStmt | variables.rs:553:5:553:11 | structs |  |
-| variables.rs:554:5:554:11 | ref_arg | variables.rs:554:5:554:13 | CallExpr |  |
-| variables.rs:554:5:554:13 | CallExpr | variables.rs:555:5:555:30 | ExprStmt |  |
-| variables.rs:554:5:554:14 | ExprStmt | variables.rs:554:5:554:11 | ref_arg |  |
-| variables.rs:555:5:555:27 | ref_methodcall_receiver | variables.rs:555:5:555:29 | CallExpr |  |
-| variables.rs:555:5:555:29 | CallExpr | variables.rs:522:11:556:1 | BlockExpr |  |
-| variables.rs:555:5:555:30 | ExprStmt | variables.rs:555:5:555:27 | ref_methodcall_receiver |  |
+| variables.rs:502:19:502:20 | &x | variables.rs:502:5:502:21 | print_i64_ref(...) |  |
+| variables.rs:502:20:502:20 | x | variables.rs:502:19:502:20 | &x |  |
+| variables.rs:503:5:503:13 | print_i64 | variables.rs:503:15:503:15 | x |  |
+| variables.rs:503:5:503:16 | print_i64(...) | variables.rs:505:5:505:15 | let ... = 17 |  |
+| variables.rs:503:5:503:17 | ExprStmt | variables.rs:503:5:503:13 | print_i64 |  |
+| variables.rs:503:15:503:15 | x | variables.rs:503:5:503:16 | print_i64(...) |  |
+| variables.rs:505:5:505:15 | let ... = 17 | variables.rs:505:13:505:14 | 17 |  |
+| variables.rs:505:9:505:9 | z | variables.rs:506:5:506:22 | ExprStmt | match |
+| variables.rs:505:13:505:14 | 17 | variables.rs:505:9:505:9 | z |  |
+| variables.rs:506:5:506:17 | print_i64_ref | variables.rs:506:20:506:20 | z |  |
+| variables.rs:506:5:506:21 | print_i64_ref(...) | variables.rs:500:14:507:1 | { ... } |  |
+| variables.rs:506:5:506:22 | ExprStmt | variables.rs:506:5:506:17 | print_i64_ref |  |
+| variables.rs:506:19:506:20 | &z | variables.rs:506:5:506:21 | print_i64_ref(...) |  |
+| variables.rs:506:20:506:20 | z | variables.rs:506:19:506:20 | &z |  |
+| variables.rs:514:3:516:3 | enter fn bar | variables.rs:514:15:514:18 | self |  |
+| variables.rs:514:3:516:3 | exit fn bar (normal) | variables.rs:514:3:516:3 | exit fn bar |  |
+| variables.rs:514:10:514:18 | SelfParam | variables.rs:515:5:515:32 | ExprStmt |  |
+| variables.rs:514:15:514:18 | self | variables.rs:514:10:514:18 | SelfParam |  |
+| variables.rs:514:21:516:3 | { ... } | variables.rs:514:3:516:3 | exit fn bar (normal) |  |
+| variables.rs:515:5:515:9 | * ... | variables.rs:515:29:515:29 | 3 |  |
+| variables.rs:515:5:515:31 | ... = ... | variables.rs:514:21:516:3 | { ... } |  |
+| variables.rs:515:5:515:32 | ExprStmt | variables.rs:515:6:515:9 | self |  |
+| variables.rs:515:6:515:9 | self | variables.rs:515:5:515:9 | * ... |  |
+| variables.rs:515:13:515:31 | MyStruct {...} | variables.rs:515:5:515:31 | ... = ... |  |
+| variables.rs:515:29:515:29 | 3 | variables.rs:515:13:515:31 | MyStruct {...} |  |
+| variables.rs:519:1:524:1 | enter fn ref_methodcall_receiver | variables.rs:520:3:520:34 | let ... = ... |  |
+| variables.rs:519:1:524:1 | exit fn ref_methodcall_receiver (normal) | variables.rs:519:1:524:1 | exit fn ref_methodcall_receiver |  |
+| variables.rs:519:30:524:1 | { ... } | variables.rs:519:1:524:1 | exit fn ref_methodcall_receiver (normal) |  |
+| variables.rs:520:3:520:34 | let ... = ... | variables.rs:520:31:520:31 | 1 |  |
+| variables.rs:520:7:520:11 | a | variables.rs:521:3:521:10 | ExprStmt | match |
+| variables.rs:520:15:520:33 | MyStruct {...} | variables.rs:520:7:520:11 | a |  |
+| variables.rs:520:31:520:31 | 1 | variables.rs:520:15:520:33 | MyStruct {...} |  |
+| variables.rs:521:3:521:3 | a | variables.rs:521:3:521:9 | ... .bar(...) |  |
+| variables.rs:521:3:521:9 | ... .bar(...) | variables.rs:523:3:523:19 | ExprStmt |  |
+| variables.rs:521:3:521:10 | ExprStmt | variables.rs:521:3:521:3 | a |  |
+| variables.rs:523:3:523:11 | print_i64 | variables.rs:523:13:523:13 | a |  |
+| variables.rs:523:3:523:18 | print_i64(...) | variables.rs:519:30:524:1 | { ... } |  |
+| variables.rs:523:3:523:19 | ExprStmt | variables.rs:523:3:523:11 | print_i64 |  |
+| variables.rs:523:13:523:13 | a | variables.rs:523:13:523:17 | a.val |  |
+| variables.rs:523:13:523:17 | a.val | variables.rs:523:3:523:18 | print_i64(...) |  |
+| variables.rs:526:1:560:1 | enter fn main | variables.rs:527:5:527:25 | ExprStmt |  |
+| variables.rs:526:1:560:1 | exit fn main (normal) | variables.rs:526:1:560:1 | exit fn main |  |
+| variables.rs:526:11:560:1 | { ... } | variables.rs:526:1:560:1 | exit fn main (normal) |  |
+| variables.rs:527:5:527:22 | immutable_variable | variables.rs:527:5:527:24 | immutable_variable(...) |  |
+| variables.rs:527:5:527:24 | immutable_variable(...) | variables.rs:528:5:528:23 | ExprStmt |  |
+| variables.rs:527:5:527:25 | ExprStmt | variables.rs:527:5:527:22 | immutable_variable |  |
+| variables.rs:528:5:528:20 | mutable_variable | variables.rs:528:5:528:22 | mutable_variable(...) |  |
+| variables.rs:528:5:528:22 | mutable_variable(...) | variables.rs:529:5:529:40 | ExprStmt |  |
+| variables.rs:528:5:528:23 | ExprStmt | variables.rs:528:5:528:20 | mutable_variable |  |
+| variables.rs:529:5:529:37 | mutable_variable_immutable_borrow | variables.rs:529:5:529:39 | mutable_variable_immutable_borrow(...) |  |
+| variables.rs:529:5:529:39 | mutable_variable_immutable_borrow(...) | variables.rs:530:5:530:23 | ExprStmt |  |
+| variables.rs:529:5:529:40 | ExprStmt | variables.rs:529:5:529:37 | mutable_variable_immutable_borrow |  |
+| variables.rs:530:5:530:20 | variable_shadow1 | variables.rs:530:5:530:22 | variable_shadow1(...) |  |
+| variables.rs:530:5:530:22 | variable_shadow1(...) | variables.rs:531:5:531:23 | ExprStmt |  |
+| variables.rs:530:5:530:23 | ExprStmt | variables.rs:530:5:530:20 | variable_shadow1 |  |
+| variables.rs:531:5:531:20 | variable_shadow2 | variables.rs:531:5:531:22 | variable_shadow2(...) |  |
+| variables.rs:531:5:531:22 | variable_shadow2(...) | variables.rs:532:5:532:19 | ExprStmt |  |
+| variables.rs:531:5:531:23 | ExprStmt | variables.rs:531:5:531:20 | variable_shadow2 |  |
+| variables.rs:532:5:532:16 | let_pattern1 | variables.rs:532:5:532:18 | let_pattern1(...) |  |
+| variables.rs:532:5:532:18 | let_pattern1(...) | variables.rs:533:5:533:19 | ExprStmt |  |
+| variables.rs:532:5:532:19 | ExprStmt | variables.rs:532:5:532:16 | let_pattern1 |  |
+| variables.rs:533:5:533:16 | let_pattern2 | variables.rs:533:5:533:18 | let_pattern2(...) |  |
+| variables.rs:533:5:533:18 | let_pattern2(...) | variables.rs:534:5:534:19 | ExprStmt |  |
+| variables.rs:533:5:533:19 | ExprStmt | variables.rs:533:5:533:16 | let_pattern2 |  |
+| variables.rs:534:5:534:16 | let_pattern3 | variables.rs:534:5:534:18 | let_pattern3(...) |  |
+| variables.rs:534:5:534:18 | let_pattern3(...) | variables.rs:535:5:535:19 | ExprStmt |  |
+| variables.rs:534:5:534:19 | ExprStmt | variables.rs:534:5:534:16 | let_pattern3 |  |
+| variables.rs:535:5:535:16 | let_pattern4 | variables.rs:535:5:535:18 | let_pattern4(...) |  |
+| variables.rs:535:5:535:18 | let_pattern4(...) | variables.rs:536:5:536:21 | ExprStmt |  |
+| variables.rs:535:5:535:19 | ExprStmt | variables.rs:535:5:535:16 | let_pattern4 |  |
+| variables.rs:536:5:536:18 | match_pattern1 | variables.rs:536:5:536:20 | match_pattern1(...) |  |
+| variables.rs:536:5:536:20 | match_pattern1(...) | variables.rs:537:5:537:21 | ExprStmt |  |
+| variables.rs:536:5:536:21 | ExprStmt | variables.rs:536:5:536:18 | match_pattern1 |  |
+| variables.rs:537:5:537:18 | match_pattern2 | variables.rs:537:5:537:20 | match_pattern2(...) |  |
+| variables.rs:537:5:537:20 | match_pattern2(...) | variables.rs:538:5:538:21 | ExprStmt |  |
+| variables.rs:537:5:537:21 | ExprStmt | variables.rs:537:5:537:18 | match_pattern2 |  |
+| variables.rs:538:5:538:18 | match_pattern3 | variables.rs:538:5:538:20 | match_pattern3(...) |  |
+| variables.rs:538:5:538:20 | match_pattern3(...) | variables.rs:539:5:539:21 | ExprStmt |  |
+| variables.rs:538:5:538:21 | ExprStmt | variables.rs:538:5:538:18 | match_pattern3 |  |
+| variables.rs:539:5:539:18 | match_pattern4 | variables.rs:539:5:539:20 | match_pattern4(...) |  |
+| variables.rs:539:5:539:20 | match_pattern4(...) | variables.rs:540:5:540:21 | ExprStmt |  |
+| variables.rs:539:5:539:21 | ExprStmt | variables.rs:539:5:539:18 | match_pattern4 |  |
+| variables.rs:540:5:540:18 | match_pattern5 | variables.rs:540:5:540:20 | match_pattern5(...) |  |
+| variables.rs:540:5:540:20 | match_pattern5(...) | variables.rs:541:5:541:21 | ExprStmt |  |
+| variables.rs:540:5:540:21 | ExprStmt | variables.rs:540:5:540:18 | match_pattern5 |  |
+| variables.rs:541:5:541:18 | match_pattern6 | variables.rs:541:5:541:20 | match_pattern6(...) |  |
+| variables.rs:541:5:541:20 | match_pattern6(...) | variables.rs:542:5:542:21 | ExprStmt |  |
+| variables.rs:541:5:541:21 | ExprStmt | variables.rs:541:5:541:18 | match_pattern6 |  |
+| variables.rs:542:5:542:18 | match_pattern7 | variables.rs:542:5:542:20 | match_pattern7(...) |  |
+| variables.rs:542:5:542:20 | match_pattern7(...) | variables.rs:543:5:543:21 | ExprStmt |  |
+| variables.rs:542:5:542:21 | ExprStmt | variables.rs:542:5:542:18 | match_pattern7 |  |
+| variables.rs:543:5:543:18 | match_pattern8 | variables.rs:543:5:543:20 | match_pattern8(...) |  |
+| variables.rs:543:5:543:20 | match_pattern8(...) | variables.rs:544:5:544:21 | ExprStmt |  |
+| variables.rs:543:5:543:21 | ExprStmt | variables.rs:543:5:543:18 | match_pattern8 |  |
+| variables.rs:544:5:544:18 | match_pattern9 | variables.rs:544:5:544:20 | match_pattern9(...) |  |
+| variables.rs:544:5:544:20 | match_pattern9(...) | variables.rs:545:5:545:36 | ExprStmt |  |
+| variables.rs:544:5:544:21 | ExprStmt | variables.rs:544:5:544:18 | match_pattern9 |  |
+| variables.rs:545:5:545:18 | param_pattern1 | variables.rs:545:20:545:22 | "a" |  |
+| variables.rs:545:5:545:35 | param_pattern1(...) | variables.rs:546:5:546:37 | ExprStmt |  |
+| variables.rs:545:5:545:36 | ExprStmt | variables.rs:545:5:545:18 | param_pattern1 |  |
+| variables.rs:545:20:545:22 | "a" | variables.rs:545:26:545:28 | "b" |  |
+| variables.rs:545:25:545:34 | TupleExpr | variables.rs:545:5:545:35 | param_pattern1(...) |  |
+| variables.rs:545:26:545:28 | "b" | variables.rs:545:31:545:33 | "c" |  |
+| variables.rs:545:31:545:33 | "c" | variables.rs:545:25:545:34 | TupleExpr |  |
+| variables.rs:546:5:546:18 | param_pattern2 | variables.rs:546:20:546:31 | ...::Left |  |
+| variables.rs:546:5:546:36 | param_pattern2(...) | variables.rs:547:5:547:26 | ExprStmt |  |
+| variables.rs:546:5:546:37 | ExprStmt | variables.rs:546:5:546:18 | param_pattern2 |  |
+| variables.rs:546:20:546:31 | ...::Left | variables.rs:546:33:546:34 | 45 |  |
+| variables.rs:546:20:546:35 | ...::Left(...) | variables.rs:546:5:546:36 | param_pattern2(...) |  |
+| variables.rs:546:33:546:34 | 45 | variables.rs:546:20:546:35 | ...::Left(...) |  |
+| variables.rs:547:5:547:23 | destruct_assignment | variables.rs:547:5:547:25 | destruct_assignment(...) |  |
+| variables.rs:547:5:547:25 | destruct_assignment(...) | variables.rs:548:5:548:23 | ExprStmt |  |
+| variables.rs:547:5:547:26 | ExprStmt | variables.rs:547:5:547:23 | destruct_assignment |  |
+| variables.rs:548:5:548:20 | closure_variable | variables.rs:548:5:548:22 | closure_variable(...) |  |
+| variables.rs:548:5:548:22 | closure_variable(...) | variables.rs:549:5:549:19 | ExprStmt |  |
+| variables.rs:548:5:548:23 | ExprStmt | variables.rs:548:5:548:20 | closure_variable |  |
+| variables.rs:549:5:549:16 | for_variable | variables.rs:549:5:549:18 | for_variable(...) |  |
+| variables.rs:549:5:549:18 | for_variable(...) | variables.rs:550:5:550:17 | ExprStmt |  |
+| variables.rs:549:5:549:19 | ExprStmt | variables.rs:549:5:549:16 | for_variable |  |
+| variables.rs:550:5:550:14 | add_assign | variables.rs:550:5:550:16 | add_assign(...) |  |
+| variables.rs:550:5:550:16 | add_assign(...) | variables.rs:551:5:551:13 | ExprStmt |  |
+| variables.rs:550:5:550:17 | ExprStmt | variables.rs:550:5:550:14 | add_assign |  |
+| variables.rs:551:5:551:10 | mutate | variables.rs:551:5:551:12 | mutate(...) |  |
+| variables.rs:551:5:551:12 | mutate(...) | variables.rs:552:5:552:17 | ExprStmt |  |
+| variables.rs:551:5:551:13 | ExprStmt | variables.rs:551:5:551:10 | mutate |  |
+| variables.rs:552:5:552:14 | mutate_arg | variables.rs:552:5:552:16 | mutate_arg(...) |  |
+| variables.rs:552:5:552:16 | mutate_arg(...) | variables.rs:553:5:553:12 | ExprStmt |  |
+| variables.rs:552:5:552:17 | ExprStmt | variables.rs:552:5:552:14 | mutate_arg |  |
+| variables.rs:553:5:553:9 | alias | variables.rs:553:5:553:11 | alias(...) |  |
+| variables.rs:553:5:553:11 | alias(...) | variables.rs:554:5:554:18 | ExprStmt |  |
+| variables.rs:553:5:553:12 | ExprStmt | variables.rs:553:5:553:9 | alias |  |
+| variables.rs:554:5:554:15 | capture_mut | variables.rs:554:5:554:17 | capture_mut(...) |  |
+| variables.rs:554:5:554:17 | capture_mut(...) | variables.rs:555:5:555:20 | ExprStmt |  |
+| variables.rs:554:5:554:18 | ExprStmt | variables.rs:554:5:554:15 | capture_mut |  |
+| variables.rs:555:5:555:17 | capture_immut | variables.rs:555:5:555:19 | capture_immut(...) |  |
+| variables.rs:555:5:555:19 | capture_immut(...) | variables.rs:556:5:556:26 | ExprStmt |  |
+| variables.rs:555:5:555:20 | ExprStmt | variables.rs:555:5:555:17 | capture_immut |  |
+| variables.rs:556:5:556:23 | async_block_capture | variables.rs:556:5:556:25 | async_block_capture(...) |  |
+| variables.rs:556:5:556:25 | async_block_capture(...) | variables.rs:557:5:557:14 | ExprStmt |  |
+| variables.rs:556:5:556:26 | ExprStmt | variables.rs:556:5:556:23 | async_block_capture |  |
+| variables.rs:557:5:557:11 | structs | variables.rs:557:5:557:13 | structs(...) |  |
+| variables.rs:557:5:557:13 | structs(...) | variables.rs:558:5:558:14 | ExprStmt |  |
+| variables.rs:557:5:557:14 | ExprStmt | variables.rs:557:5:557:11 | structs |  |
+| variables.rs:558:5:558:11 | ref_arg | variables.rs:558:5:558:13 | ref_arg(...) |  |
+| variables.rs:558:5:558:13 | ref_arg(...) | variables.rs:559:5:559:30 | ExprStmt |  |
+| variables.rs:558:5:558:14 | ExprStmt | variables.rs:558:5:558:11 | ref_arg |  |
+| variables.rs:559:5:559:27 | ref_methodcall_receiver | variables.rs:559:5:559:29 | ref_methodcall_receiver(...) |  |
+| variables.rs:559:5:559:29 | ref_methodcall_receiver(...) | variables.rs:526:11:560:1 | { ... } |  |
+| variables.rs:559:5:559:30 | ExprStmt | variables.rs:559:5:559:27 | ref_methodcall_receiver |  |
 breakTarget
 continueTarget
diff --git a/rust/ql/test/library-tests/variables/Ssa.expected b/rust/ql/test/library-tests/variables/Ssa.expected
index f17152793a3..ac6ec176a29 100644
--- a/rust/ql/test/library-tests/variables/Ssa.expected
+++ b/rust/ql/test/library-tests/variables/Ssa.expected
@@ -5,8 +5,8 @@ nonSsaVariable
 | variables.rs:379:13:379:13 | z |
 | variables.rs:392:13:392:13 | x |
 | variables.rs:426:13:426:13 | z |
-| variables.rs:488:13:488:13 | a |
-| variables.rs:516:11:516:11 | a |
+| variables.rs:492:13:492:13 | a |
+| variables.rs:520:11:520:11 | a |
 definition
 | variables.rs:3:14:3:14 | s | variables.rs:3:14:3:14 | s |
 | variables.rs:7:14:7:14 | i | variables.rs:7:14:7:14 | i |
@@ -120,12 +120,12 @@ definition
 | variables.rs:418:9:418:13 | y | variables.rs:418:13:418:13 | y |
 | variables.rs:420:9:420:20 | closure2 | variables.rs:420:13:420:20 | closure2 |
 | variables.rs:421:9:421:9 | y | variables.rs:418:13:418:13 | y |
-| variables.rs:423:5:423:14 | CallExpr | variables.rs:418:13:418:13 | y |
+| variables.rs:423:5:423:14 | closure2(...) | variables.rs:418:13:418:13 | y |
 | variables.rs:428:9:428:20 | closure3 | variables.rs:428:13:428:20 | closure3 |
 | variables.rs:436:9:436:13 | i | variables.rs:436:13:436:13 | i |
 | variables.rs:437:9:437:13 | block | variables.rs:437:9:437:13 | block |
 | variables.rs:438:9:438:9 | i | variables.rs:436:13:436:13 | i |
-| variables.rs:441:5:441:15 | AwaitExpr | variables.rs:436:13:436:13 | i |
+| variables.rs:441:5:441:15 | await block | variables.rs:436:13:436:13 | i |
 | variables.rs:445:8:445:8 | b | variables.rs:445:8:445:8 | b |
 | variables.rs:446:9:446:13 | x | variables.rs:446:13:446:13 | x |
 | variables.rs:449:5:457:5 | phi | variables.rs:446:13:446:13 | x |
@@ -134,8 +134,11 @@ definition
 | variables.rs:461:13:461:14 | b1 | variables.rs:461:13:461:14 | b1 |
 | variables.rs:461:24:461:25 | b2 | variables.rs:461:24:461:25 | b2 |
 | variables.rs:462:9:462:9 | x | variables.rs:462:9:462:9 | x |
-| variables.rs:497:9:497:9 | x | variables.rs:497:9:497:9 | x |
-| variables.rs:501:9:501:9 | z | variables.rs:501:9:501:9 | z |
+| variables.rs:482:15:482:23 | SelfParam | variables.rs:482:20:482:23 | self |
+| variables.rs:486:11:486:14 | SelfParam | variables.rs:486:11:486:14 | self |
+| variables.rs:501:9:501:9 | x | variables.rs:501:9:501:9 | x |
+| variables.rs:505:9:505:9 | z | variables.rs:505:9:505:9 | z |
+| variables.rs:514:10:514:18 | SelfParam | variables.rs:514:15:514:18 | self |
 read
 | variables.rs:3:14:3:14 | s | variables.rs:3:14:3:14 | s | variables.rs:4:20:4:20 | s |
 | variables.rs:7:14:7:14 | i | variables.rs:7:14:7:14 | i | variables.rs:8:20:8:20 | i |
@@ -239,10 +242,10 @@ read
 | variables.rs:412:9:412:16 | closure1 | variables.rs:412:9:412:16 | closure1 | variables.rs:415:5:415:12 | closure1 |
 | variables.rs:412:20:414:5 | <captured entry> x | variables.rs:410:13:410:13 | x | variables.rs:413:19:413:19 | x |
 | variables.rs:420:9:420:20 | closure2 | variables.rs:420:13:420:20 | closure2 | variables.rs:423:5:423:12 | closure2 |
-| variables.rs:423:5:423:14 | CallExpr | variables.rs:418:13:418:13 | y | variables.rs:424:15:424:15 | y |
+| variables.rs:423:5:423:14 | closure2(...) | variables.rs:418:13:418:13 | y | variables.rs:424:15:424:15 | y |
 | variables.rs:428:9:428:20 | closure3 | variables.rs:428:13:428:20 | closure3 | variables.rs:431:5:431:12 | closure3 |
 | variables.rs:437:9:437:13 | block | variables.rs:437:9:437:13 | block | variables.rs:441:5:441:9 | block |
-| variables.rs:441:5:441:15 | AwaitExpr | variables.rs:436:13:436:13 | i | variables.rs:442:15:442:15 | i |
+| variables.rs:441:5:441:15 | await block | variables.rs:436:13:436:13 | i | variables.rs:442:15:442:15 | i |
 | variables.rs:445:8:445:8 | b | variables.rs:445:8:445:8 | b | variables.rs:449:8:449:8 | b |
 | variables.rs:446:9:446:13 | x | variables.rs:446:13:446:13 | x | variables.rs:447:15:447:15 | x |
 | variables.rs:446:9:446:13 | x | variables.rs:446:13:446:13 | x | variables.rs:448:15:448:15 | x |
@@ -257,7 +260,10 @@ read
 | variables.rs:462:9:462:9 | x | variables.rs:462:9:462:9 | x | variables.rs:466:19:466:19 | x |
 | variables.rs:462:9:462:9 | x | variables.rs:462:9:462:9 | x | variables.rs:470:19:470:19 | x |
 | variables.rs:462:9:462:9 | x | variables.rs:462:9:462:9 | x | variables.rs:472:19:472:19 | x |
-| variables.rs:497:9:497:9 | x | variables.rs:497:9:497:9 | x | variables.rs:499:15:499:15 | x |
+| variables.rs:482:15:482:23 | SelfParam | variables.rs:482:20:482:23 | self | variables.rs:483:16:483:19 | self |
+| variables.rs:486:11:486:14 | SelfParam | variables.rs:486:11:486:14 | self | variables.rs:487:9:487:12 | self |
+| variables.rs:501:9:501:9 | x | variables.rs:501:9:501:9 | x | variables.rs:503:15:503:15 | x |
+| variables.rs:514:10:514:18 | SelfParam | variables.rs:514:15:514:18 | self | variables.rs:515:6:515:9 | self |
 firstRead
 | variables.rs:3:14:3:14 | s | variables.rs:3:14:3:14 | s | variables.rs:4:20:4:20 | s |
 | variables.rs:7:14:7:14 | i | variables.rs:7:14:7:14 | i | variables.rs:8:20:8:20 | i |
@@ -343,10 +349,10 @@ firstRead
 | variables.rs:412:9:412:16 | closure1 | variables.rs:412:9:412:16 | closure1 | variables.rs:415:5:415:12 | closure1 |
 | variables.rs:412:20:414:5 | <captured entry> x | variables.rs:410:13:410:13 | x | variables.rs:413:19:413:19 | x |
 | variables.rs:420:9:420:20 | closure2 | variables.rs:420:13:420:20 | closure2 | variables.rs:423:5:423:12 | closure2 |
-| variables.rs:423:5:423:14 | CallExpr | variables.rs:418:13:418:13 | y | variables.rs:424:15:424:15 | y |
+| variables.rs:423:5:423:14 | closure2(...) | variables.rs:418:13:418:13 | y | variables.rs:424:15:424:15 | y |
 | variables.rs:428:9:428:20 | closure3 | variables.rs:428:13:428:20 | closure3 | variables.rs:431:5:431:12 | closure3 |
 | variables.rs:437:9:437:13 | block | variables.rs:437:9:437:13 | block | variables.rs:441:5:441:9 | block |
-| variables.rs:441:5:441:15 | AwaitExpr | variables.rs:436:13:436:13 | i | variables.rs:442:15:442:15 | i |
+| variables.rs:441:5:441:15 | await block | variables.rs:436:13:436:13 | i | variables.rs:442:15:442:15 | i |
 | variables.rs:445:8:445:8 | b | variables.rs:445:8:445:8 | b | variables.rs:449:8:449:8 | b |
 | variables.rs:446:9:446:13 | x | variables.rs:446:13:446:13 | x | variables.rs:447:15:447:15 | x |
 | variables.rs:449:5:457:5 | phi | variables.rs:446:13:446:13 | x | variables.rs:458:15:458:15 | x |
@@ -356,7 +362,10 @@ firstRead
 | variables.rs:461:24:461:25 | b2 | variables.rs:461:24:461:25 | b2 | variables.rs:469:8:469:9 | b2 |
 | variables.rs:462:9:462:9 | x | variables.rs:462:9:462:9 | x | variables.rs:464:19:464:19 | x |
 | variables.rs:462:9:462:9 | x | variables.rs:462:9:462:9 | x | variables.rs:466:19:466:19 | x |
-| variables.rs:497:9:497:9 | x | variables.rs:497:9:497:9 | x | variables.rs:499:15:499:15 | x |
+| variables.rs:482:15:482:23 | SelfParam | variables.rs:482:20:482:23 | self | variables.rs:483:16:483:19 | self |
+| variables.rs:486:11:486:14 | SelfParam | variables.rs:486:11:486:14 | self | variables.rs:487:9:487:12 | self |
+| variables.rs:501:9:501:9 | x | variables.rs:501:9:501:9 | x | variables.rs:503:15:503:15 | x |
+| variables.rs:514:10:514:18 | SelfParam | variables.rs:514:15:514:18 | self | variables.rs:515:6:515:9 | self |
 lastRead
 | variables.rs:3:14:3:14 | s | variables.rs:3:14:3:14 | s | variables.rs:4:20:4:20 | s |
 | variables.rs:7:14:7:14 | i | variables.rs:7:14:7:14 | i | variables.rs:8:20:8:20 | i |
@@ -443,10 +452,10 @@ lastRead
 | variables.rs:412:9:412:16 | closure1 | variables.rs:412:9:412:16 | closure1 | variables.rs:415:5:415:12 | closure1 |
 | variables.rs:412:20:414:5 | <captured entry> x | variables.rs:410:13:410:13 | x | variables.rs:413:19:413:19 | x |
 | variables.rs:420:9:420:20 | closure2 | variables.rs:420:13:420:20 | closure2 | variables.rs:423:5:423:12 | closure2 |
-| variables.rs:423:5:423:14 | CallExpr | variables.rs:418:13:418:13 | y | variables.rs:424:15:424:15 | y |
+| variables.rs:423:5:423:14 | closure2(...) | variables.rs:418:13:418:13 | y | variables.rs:424:15:424:15 | y |
 | variables.rs:428:9:428:20 | closure3 | variables.rs:428:13:428:20 | closure3 | variables.rs:431:5:431:12 | closure3 |
 | variables.rs:437:9:437:13 | block | variables.rs:437:9:437:13 | block | variables.rs:441:5:441:9 | block |
-| variables.rs:441:5:441:15 | AwaitExpr | variables.rs:436:13:436:13 | i | variables.rs:442:15:442:15 | i |
+| variables.rs:441:5:441:15 | await block | variables.rs:436:13:436:13 | i | variables.rs:442:15:442:15 | i |
 | variables.rs:445:8:445:8 | b | variables.rs:445:8:445:8 | b | variables.rs:449:8:449:8 | b |
 | variables.rs:446:9:446:13 | x | variables.rs:446:13:446:13 | x | variables.rs:448:15:448:15 | x |
 | variables.rs:449:5:457:5 | phi | variables.rs:446:13:446:13 | x | variables.rs:458:15:458:15 | x |
@@ -456,7 +465,10 @@ lastRead
 | variables.rs:461:24:461:25 | b2 | variables.rs:461:24:461:25 | b2 | variables.rs:469:8:469:9 | b2 |
 | variables.rs:462:9:462:9 | x | variables.rs:462:9:462:9 | x | variables.rs:470:19:470:19 | x |
 | variables.rs:462:9:462:9 | x | variables.rs:462:9:462:9 | x | variables.rs:472:19:472:19 | x |
-| variables.rs:497:9:497:9 | x | variables.rs:497:9:497:9 | x | variables.rs:499:15:499:15 | x |
+| variables.rs:482:15:482:23 | SelfParam | variables.rs:482:20:482:23 | self | variables.rs:483:16:483:19 | self |
+| variables.rs:486:11:486:14 | SelfParam | variables.rs:486:11:486:14 | self | variables.rs:487:9:487:12 | self |
+| variables.rs:501:9:501:9 | x | variables.rs:501:9:501:9 | x | variables.rs:503:15:503:15 | x |
+| variables.rs:514:10:514:18 | SelfParam | variables.rs:514:15:514:18 | self | variables.rs:515:6:515:9 | self |
 adjacentReads
 | variables.rs:35:9:35:10 | x3 | variables.rs:35:9:35:10 | x3 | variables.rs:36:15:36:16 | x3 | variables.rs:38:9:38:10 | x3 |
 | variables.rs:43:9:43:10 | x4 | variables.rs:43:9:43:10 | x4 | variables.rs:44:15:44:16 | x4 | variables.rs:49:15:49:16 | x4 |
diff --git a/rust/ql/test/library-tests/variables/variables.expected b/rust/ql/test/library-tests/variables/variables.expected
index 6760f9bcdde..dd3c3cf6c10 100644
--- a/rust/ql/test/library-tests/variables/variables.expected
+++ b/rust/ql/test/library-tests/variables/variables.expected
@@ -1,5 +1,4 @@
 testFailures
-failures
 variable
 | variables.rs:3:14:3:14 | s |
 | variables.rs:7:14:7:14 | i |
@@ -95,10 +94,13 @@ variable
 | variables.rs:461:13:461:14 | b1 |
 | variables.rs:461:24:461:25 | b2 |
 | variables.rs:462:9:462:9 | x |
-| variables.rs:488:13:488:13 | a |
-| variables.rs:497:9:497:9 | x |
-| variables.rs:501:9:501:9 | z |
-| variables.rs:516:11:516:11 | a |
+| variables.rs:482:20:482:23 | self |
+| variables.rs:486:11:486:14 | self |
+| variables.rs:492:13:492:13 | a |
+| variables.rs:501:9:501:9 | x |
+| variables.rs:505:9:505:9 | z |
+| variables.rs:514:15:514:18 | self |
+| variables.rs:520:11:520:11 | a |
 variableAccess
 | variables.rs:4:20:4:20 | s | variables.rs:3:14:3:14 | s |
 | variables.rs:8:20:8:20 | i | variables.rs:7:14:7:14 | i |
@@ -246,16 +248,19 @@ variableAccess
 | variables.rs:469:8:469:9 | b2 | variables.rs:461:24:461:25 | b2 |
 | variables.rs:470:19:470:19 | x | variables.rs:462:9:462:9 | x |
 | variables.rs:472:19:472:19 | x | variables.rs:462:9:462:9 | x |
-| variables.rs:489:15:489:15 | a | variables.rs:488:13:488:13 | a |
-| variables.rs:490:5:490:5 | a | variables.rs:488:13:488:13 | a |
-| variables.rs:491:15:491:15 | a | variables.rs:488:13:488:13 | a |
-| variables.rs:492:5:492:5 | a | variables.rs:488:13:488:13 | a |
-| variables.rs:493:15:493:15 | a | variables.rs:488:13:488:13 | a |
-| variables.rs:498:20:498:20 | x | variables.rs:497:9:497:9 | x |
-| variables.rs:499:15:499:15 | x | variables.rs:497:9:497:9 | x |
-| variables.rs:502:20:502:20 | z | variables.rs:501:9:501:9 | z |
-| variables.rs:517:3:517:3 | a | variables.rs:516:11:516:11 | a |
-| variables.rs:519:13:519:13 | a | variables.rs:516:11:516:11 | a |
+| variables.rs:483:16:483:19 | self | variables.rs:482:20:482:23 | self |
+| variables.rs:487:9:487:12 | self | variables.rs:486:11:486:14 | self |
+| variables.rs:493:15:493:15 | a | variables.rs:492:13:492:13 | a |
+| variables.rs:494:5:494:5 | a | variables.rs:492:13:492:13 | a |
+| variables.rs:495:15:495:15 | a | variables.rs:492:13:492:13 | a |
+| variables.rs:496:5:496:5 | a | variables.rs:492:13:492:13 | a |
+| variables.rs:497:15:497:15 | a | variables.rs:492:13:492:13 | a |
+| variables.rs:502:20:502:20 | x | variables.rs:501:9:501:9 | x |
+| variables.rs:503:15:503:15 | x | variables.rs:501:9:501:9 | x |
+| variables.rs:506:20:506:20 | z | variables.rs:505:9:505:9 | z |
+| variables.rs:515:6:515:9 | self | variables.rs:514:15:514:18 | self |
+| variables.rs:521:3:521:3 | a | variables.rs:520:11:520:11 | a |
+| variables.rs:523:13:523:13 | a | variables.rs:520:11:520:11 | a |
 variableWriteAccess
 | variables.rs:23:5:23:6 | x2 | variables.rs:21:13:21:14 | x2 |
 | variables.rs:30:5:30:5 | x | variables.rs:28:13:28:13 | x |
@@ -266,7 +271,7 @@ variableWriteAccess
 | variables.rs:438:9:438:9 | i | variables.rs:436:13:436:13 | i |
 | variables.rs:450:9:450:9 | x | variables.rs:446:13:446:13 | x |
 | variables.rs:454:9:454:9 | x | variables.rs:446:13:446:13 | x |
-| variables.rs:492:5:492:5 | a | variables.rs:488:13:488:13 | a |
+| variables.rs:496:5:496:5 | a | variables.rs:492:13:492:13 | a |
 variableReadAccess
 | variables.rs:4:20:4:20 | s | variables.rs:3:14:3:14 | s |
 | variables.rs:8:20:8:20 | i | variables.rs:7:14:7:14 | i |
@@ -396,13 +401,16 @@ variableReadAccess
 | variables.rs:469:8:469:9 | b2 | variables.rs:461:24:461:25 | b2 |
 | variables.rs:470:19:470:19 | x | variables.rs:462:9:462:9 | x |
 | variables.rs:472:19:472:19 | x | variables.rs:462:9:462:9 | x |
-| variables.rs:489:15:489:15 | a | variables.rs:488:13:488:13 | a |
-| variables.rs:490:5:490:5 | a | variables.rs:488:13:488:13 | a |
-| variables.rs:491:15:491:15 | a | variables.rs:488:13:488:13 | a |
-| variables.rs:493:15:493:15 | a | variables.rs:488:13:488:13 | a |
-| variables.rs:499:15:499:15 | x | variables.rs:497:9:497:9 | x |
-| variables.rs:517:3:517:3 | a | variables.rs:516:11:516:11 | a |
-| variables.rs:519:13:519:13 | a | variables.rs:516:11:516:11 | a |
+| variables.rs:483:16:483:19 | self | variables.rs:482:20:482:23 | self |
+| variables.rs:487:9:487:12 | self | variables.rs:486:11:486:14 | self |
+| variables.rs:493:15:493:15 | a | variables.rs:492:13:492:13 | a |
+| variables.rs:494:5:494:5 | a | variables.rs:492:13:492:13 | a |
+| variables.rs:495:15:495:15 | a | variables.rs:492:13:492:13 | a |
+| variables.rs:497:15:497:15 | a | variables.rs:492:13:492:13 | a |
+| variables.rs:503:15:503:15 | x | variables.rs:501:9:501:9 | x |
+| variables.rs:515:6:515:9 | self | variables.rs:514:15:514:18 | self |
+| variables.rs:521:3:521:3 | a | variables.rs:520:11:520:11 | a |
+| variables.rs:523:13:523:13 | a | variables.rs:520:11:520:11 | a |
 variableInitializer
 | variables.rs:16:9:16:10 | x1 | variables.rs:16:14:16:16 | "a" |
 | variables.rs:21:13:21:14 | x2 | variables.rs:21:18:21:18 | 4 |
@@ -411,49 +419,49 @@ variableInitializer
 | variables.rs:37:9:37:10 | x3 | variables.rs:38:9:38:14 | ... + ... |
 | variables.rs:43:9:43:10 | x4 | variables.rs:43:14:43:16 | "a" |
 | variables.rs:46:13:46:14 | x4 | variables.rs:46:18:46:20 | "b" |
-| variables.rs:75:9:75:10 | p1 | variables.rs:75:14:75:37 | RecordExpr |
-| variables.rs:85:9:85:10 | s1 | variables.rs:85:14:85:41 | CallExpr |
-| variables.rs:102:9:102:10 | s1 | variables.rs:102:14:102:41 | CallExpr |
-| variables.rs:111:9:111:10 | x6 | variables.rs:111:14:111:20 | CallExpr |
+| variables.rs:75:9:75:10 | p1 | variables.rs:75:14:75:37 | Point {...} |
+| variables.rs:85:9:85:10 | s1 | variables.rs:85:14:85:41 | Some(...) |
+| variables.rs:102:9:102:10 | s1 | variables.rs:102:14:102:41 | Some(...) |
+| variables.rs:111:9:111:10 | x6 | variables.rs:111:14:111:20 | Some(...) |
 | variables.rs:112:9:112:10 | y1 | variables.rs:112:14:112:15 | 10 |
 | variables.rs:128:9:128:15 | numbers | variables.rs:128:19:128:35 | TupleExpr |
-| variables.rs:155:9:155:10 | p2 | variables.rs:155:14:155:37 | RecordExpr |
-| variables.rs:169:9:169:11 | msg | variables.rs:169:15:169:38 | RecordExpr |
-| variables.rs:189:9:189:14 | either | variables.rs:189:18:189:33 | CallExpr |
-| variables.rs:203:9:203:10 | tv | variables.rs:203:14:203:36 | CallExpr |
-| variables.rs:219:9:219:14 | either | variables.rs:219:18:219:33 | CallExpr |
-| variables.rs:229:9:229:14 | either | variables.rs:229:18:229:33 | CallExpr |
-| variables.rs:253:9:253:10 | fv | variables.rs:253:14:253:35 | CallExpr |
-| variables.rs:315:9:315:23 | example_closure | variables.rs:316:9:317:9 | ClosureExpr |
-| variables.rs:318:9:318:10 | n1 | variables.rs:319:9:319:26 | CallExpr |
-| variables.rs:323:9:323:26 | immutable_variable | variables.rs:324:9:325:9 | ClosureExpr |
-| variables.rs:326:9:326:10 | n2 | variables.rs:327:9:327:29 | CallExpr |
-| variables.rs:332:9:332:9 | v | variables.rs:332:13:332:41 | RefExpr |
+| variables.rs:155:9:155:10 | p2 | variables.rs:155:14:155:37 | Point {...} |
+| variables.rs:169:9:169:11 | msg | variables.rs:169:15:169:38 | ...::Hello {...} |
+| variables.rs:189:9:189:14 | either | variables.rs:189:18:189:33 | ...::Left(...) |
+| variables.rs:203:9:203:10 | tv | variables.rs:203:14:203:36 | ...::Second(...) |
+| variables.rs:219:9:219:14 | either | variables.rs:219:18:219:33 | ...::Left(...) |
+| variables.rs:229:9:229:14 | either | variables.rs:229:18:229:33 | ...::Left(...) |
+| variables.rs:253:9:253:10 | fv | variables.rs:253:14:253:35 | ...::Second(...) |
+| variables.rs:315:9:315:23 | example_closure | variables.rs:316:9:317:9 | \|...\| x |
+| variables.rs:318:9:318:10 | n1 | variables.rs:319:9:319:26 | example_closure(...) |
+| variables.rs:323:9:323:26 | immutable_variable | variables.rs:324:9:325:9 | \|...\| x |
+| variables.rs:326:9:326:10 | n2 | variables.rs:327:9:327:29 | immutable_variable(...) |
+| variables.rs:332:9:332:9 | v | variables.rs:332:13:332:41 | &... |
 | variables.rs:341:13:341:13 | a | variables.rs:341:17:341:17 | 0 |
 | variables.rs:349:13:349:13 | i | variables.rs:349:17:349:17 | 1 |
-| variables.rs:350:9:350:13 | ref_i | variables.rs:351:9:351:14 | RefExpr |
+| variables.rs:350:9:350:13 | ref_i | variables.rs:351:9:351:14 | &mut i |
 | variables.rs:372:13:372:13 | x | variables.rs:372:17:372:17 | 2 |
-| variables.rs:373:9:373:9 | y | variables.rs:374:9:374:28 | CallExpr |
+| variables.rs:373:9:373:9 | y | variables.rs:374:9:374:28 | mutate_param(...) |
 | variables.rs:379:13:379:13 | z | variables.rs:379:17:379:17 | 4 |
-| variables.rs:380:9:380:9 | w | variables.rs:381:9:381:19 | RefExpr |
+| variables.rs:380:9:380:9 | w | variables.rs:381:9:381:19 | &mut ... |
 | variables.rs:392:13:392:13 | x | variables.rs:392:17:392:17 | 1 |
-| variables.rs:393:9:393:9 | y | variables.rs:394:9:394:14 | RefExpr |
+| variables.rs:393:9:393:9 | y | variables.rs:394:9:394:14 | &mut x |
 | variables.rs:400:9:400:9 | x | variables.rs:400:13:400:15 | 100 |
-| variables.rs:402:9:402:11 | cap | variables.rs:402:15:404:5 | ClosureExpr |
+| variables.rs:402:9:402:11 | cap | variables.rs:402:15:404:5 | \|...\| ... |
 | variables.rs:410:13:410:13 | x | variables.rs:410:17:410:17 | 1 |
-| variables.rs:412:9:412:16 | closure1 | variables.rs:412:20:414:5 | ClosureExpr |
+| variables.rs:412:9:412:16 | closure1 | variables.rs:412:20:414:5 | \|...\| ... |
 | variables.rs:418:13:418:13 | y | variables.rs:418:17:418:17 | 2 |
-| variables.rs:420:13:420:20 | closure2 | variables.rs:420:24:422:5 | ClosureExpr |
+| variables.rs:420:13:420:20 | closure2 | variables.rs:420:24:422:5 | \|...\| ... |
 | variables.rs:426:13:426:13 | z | variables.rs:426:17:426:17 | 2 |
-| variables.rs:428:13:428:20 | closure3 | variables.rs:428:24:430:5 | ClosureExpr |
+| variables.rs:428:13:428:20 | closure3 | variables.rs:428:24:430:5 | \|...\| ... |
 | variables.rs:436:13:436:13 | i | variables.rs:436:22:436:22 | 0 |
-| variables.rs:437:9:437:13 | block | variables.rs:437:17:439:5 | BlockExpr |
+| variables.rs:437:9:437:13 | block | variables.rs:437:17:439:5 | { ... } |
 | variables.rs:446:13:446:13 | x | variables.rs:446:17:446:17 | 1 |
 | variables.rs:462:9:462:9 | x | variables.rs:462:13:462:13 | 1 |
-| variables.rs:488:13:488:13 | a | variables.rs:488:17:488:35 | RecordExpr |
-| variables.rs:497:9:497:9 | x | variables.rs:497:13:497:14 | 16 |
-| variables.rs:501:9:501:9 | z | variables.rs:501:13:501:14 | 17 |
-| variables.rs:516:11:516:11 | a | variables.rs:516:15:516:33 | RecordExpr |
+| variables.rs:492:13:492:13 | a | variables.rs:492:17:492:35 | MyStruct {...} |
+| variables.rs:501:9:501:9 | x | variables.rs:501:13:501:14 | 16 |
+| variables.rs:505:9:505:9 | z | variables.rs:505:13:505:14 | 17 |
+| variables.rs:520:11:520:11 | a | variables.rs:520:15:520:33 | MyStruct {...} |
 capturedVariable
 | variables.rs:400:9:400:9 | x |
 | variables.rs:410:13:410:13 | x |
diff --git a/rust/ql/test/library-tests/variables/variables.rs b/rust/ql/test/library-tests/variables/variables.rs
index 8dd00c7ebb2..4bab6d12aea 100644
--- a/rust/ql/test/library-tests/variables/variables.rs
+++ b/rust/ql/test/library-tests/variables/variables.rs
@@ -117,7 +117,7 @@ fn match_pattern1() {
         =>
         {
             print_i64(y1)// $ read_access=y1_2
-        } 
+        }
         None => print_str("NONE"),
     }
 
@@ -480,7 +480,11 @@ struct MyStruct {
 
 impl MyStruct {
     fn my_get(&mut self) -> i64 {
-        return self.val;
+        return self.val; // $ read_access=self
+    }
+
+    fn id(self) -> Self {
+        self // $ read_access=self
     }
 }
 
@@ -508,7 +512,7 @@ trait Bar {
 
 impl MyStruct {
   fn bar(&mut self) {
-    *self = MyStruct { val: 3 };
+    *self = MyStruct { val: 3 }; // $ read_access=self
   }
 }
 
diff --git a/rust/ql/test/query-tests/diagnostics/AstConsistencyCounts.expected b/rust/ql/test/query-tests/diagnostics/AstConsistencyCounts.expected
index 62ee879ab1e..72147226e42 100644
--- a/rust/ql/test/query-tests/diagnostics/AstConsistencyCounts.expected
+++ b/rust/ql/test/query-tests/diagnostics/AstConsistencyCounts.expected
@@ -2,3 +2,4 @@
 | Multiple parents | 0 |
 | Multiple primary QL classes | 0 |
 | Multiple toStrings | 0 |
+| No location | 0 |
diff --git a/rust/ql/test/query-tests/diagnostics/CONSISTENCY/ExtractionConsistency.expected b/rust/ql/test/query-tests/diagnostics/CONSISTENCY/ExtractionConsistency.expected
index bdfa4a9792d..f1c469a407d 100644
--- a/rust/ql/test/query-tests/diagnostics/CONSISTENCY/ExtractionConsistency.expected
+++ b/rust/ql/test/query-tests/diagnostics/CONSISTENCY/ExtractionConsistency.expected
@@ -4,5 +4,5 @@ extractionWarning
 | does_not_compile.rs:2:13:2:12 | expected SEMICOLON |
 | does_not_compile.rs:2:21:2:20 | expected SEMICOLON |
 | does_not_compile.rs:2:26:2:25 | expected SEMICOLON |
-| does_not_compile.rs:2:32:2:31 | expected field name or number |
 | error.rs:2:5:2:17 | An error! |
+| my_macro.rs:17:9:17:27 | macro expansion failed: could not resolve macro 'myUndefinedMacro' |
diff --git a/rust/ql/test/query-tests/diagnostics/CfgConsistencyCounts.expected b/rust/ql/test/query-tests/diagnostics/CfgConsistencyCounts.expected
index 7df2863da9e..7056936908c 100644
--- a/rust/ql/test/query-tests/diagnostics/CfgConsistencyCounts.expected
+++ b/rust/ql/test/query-tests/diagnostics/CfgConsistencyCounts.expected
@@ -1,5 +1,6 @@
 | CFG scope lacks initial AST node | 0 |
 | Dead end | 0 |
+| Missing CFG child | 0 |
 | Multiple successors of the same type | 0 |
 | Multiple toStrings | 0 |
 | Non-PostOrderTree Expr node | 0 |
diff --git a/rust/ql/test/query-tests/diagnostics/ExtractedFiles.expected b/rust/ql/test/query-tests/diagnostics/ExtractedFiles.expected
index bc8dc8cccf1..c5ebb707230 100644
--- a/rust/ql/test/query-tests/diagnostics/ExtractedFiles.expected
+++ b/rust/ql/test/query-tests/diagnostics/ExtractedFiles.expected
@@ -5,4 +5,3 @@
 | main.rs:0:0:0:0 | main.rs | File successfully extracted. |
 | my_macro.rs:0:0:0:0 | my_macro.rs | File successfully extracted. |
 | my_struct.rs:0:0:0:0 | my_struct.rs | File successfully extracted. |
-| options.yml:0:0:0:0 | options.yml | File successfully extracted. |
diff --git a/rust/ql/test/query-tests/diagnostics/ExtractionWarnings.expected b/rust/ql/test/query-tests/diagnostics/ExtractionWarnings.expected
index 1ebd7e23221..7f14093f20e 100644
--- a/rust/ql/test/query-tests/diagnostics/ExtractionWarnings.expected
+++ b/rust/ql/test/query-tests/diagnostics/ExtractionWarnings.expected
@@ -3,5 +3,5 @@
 | does_not_compile.rs:2:13:2:12 | expected SEMICOLON | Extraction warning in does_not_compile.rs with message expected SEMICOLON | 1 |
 | does_not_compile.rs:2:21:2:20 | expected SEMICOLON | Extraction warning in does_not_compile.rs with message expected SEMICOLON | 1 |
 | does_not_compile.rs:2:26:2:25 | expected SEMICOLON | Extraction warning in does_not_compile.rs with message expected SEMICOLON | 1 |
-| does_not_compile.rs:2:32:2:31 | expected field name or number | Extraction warning in does_not_compile.rs with message expected field name or number | 1 |
 | error.rs:2:5:2:17 | An error! | Extraction warning in error.rs with message An error! | 1 |
+| my_macro.rs:17:9:17:27 | macro expansion failed: could not resolve macro 'myUndefinedMacro' | Extraction warning in my_macro.rs with message macro expansion failed: could not resolve macro 'myUndefinedMacro' | 1 |
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected b/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
index 6facd293859..5fa7b20e01b 100644
--- a/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfCode.expected
@@ -1 +1 @@
-| 59 |
+| 60 |
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected b/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
index 6facd293859..5fa7b20e01b 100644
--- a/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfUserCode.expected
@@ -1 +1 @@
-| 59 |
+| 60 |
diff --git a/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected b/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
index b3465471096..f53c931e56e 100644
--- a/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
+++ b/rust/ql/test/query-tests/diagnostics/LinesOfUserCodeInFiles.expected
@@ -1,8 +1,9 @@
 | my_struct.rs:0:0:0:0 | my_struct.rs | 20 |
 | comments.rs:0:0:0:0 | comments.rs | 13 |
 | main.rs:0:0:0:0 | main.rs | 8 |
-| my_macro.rs:0:0:0:0 | my_macro.rs | 7 |
+| my_macro.rs:0:0:0:0 | my_macro.rs | 8 |
 | lib.rs:0:0:0:0 | lib.rs | 5 |
 | does_not_compile.rs:0:0:0:0 | does_not_compile.rs | 3 |
 | error.rs:0:0:0:0 | error.rs | 3 |
+| Cargo.toml:0:0:0:0 | Cargo.toml | 0 |
 | options.yml:0:0:0:0 | options.yml | 0 |
diff --git a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
index aeba0ac1ee6..9372843039c 100644
--- a/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
+++ b/rust/ql/test/query-tests/diagnostics/SummaryStats.expected
@@ -1,12 +1,17 @@
-| Elements extracted | 376 |
+| Elements extracted | 404 |
 | Elements unextracted | 0 |
 | Extraction errors | 0 |
 | Extraction warnings | 7 |
-| Files extracted - total | 8 |
-| Files extracted - with errors | 2 |
-| Files extracted - without errors | 6 |
+| Files extracted - total | 7 |
+| Files extracted - with errors | 3 |
+| Files extracted - without errors | 4 |
 | Inconsistencies - AST | 0 |
 | Inconsistencies - CFG | 0 |
 | Inconsistencies - data flow | 0 |
-| Lines of code extracted | 59 |
-| Lines of user code extracted | 59 |
+| Lines of code extracted | 60 |
+| Lines of user code extracted | 60 |
+| Macro calls - resolved | 8 |
+| Macro calls - total | 9 |
+| Macro calls - unresolved | 1 |
+| Taint sources - active | 0 |
+| Taint sources - total | 0 |
diff --git a/rust/ql/test/query-tests/diagnostics/UnresolvedMacroCalls.expected b/rust/ql/test/query-tests/diagnostics/UnresolvedMacroCalls.expected
new file mode 100644
index 00000000000..72f78794ab2
--- /dev/null
+++ b/rust/ql/test/query-tests/diagnostics/UnresolvedMacroCalls.expected
@@ -0,0 +1 @@
+| my_macro.rs:17:9:17:27 | myUndefinedMacro!... | Macro call was not resolved to a target. |
diff --git a/rust/ql/test/query-tests/diagnostics/UnresolvedMacroCalls.qlref b/rust/ql/test/query-tests/diagnostics/UnresolvedMacroCalls.qlref
new file mode 100644
index 00000000000..77f337e2703
--- /dev/null
+++ b/rust/ql/test/query-tests/diagnostics/UnresolvedMacroCalls.qlref
@@ -0,0 +1 @@
+queries/diagnostics/UnresolvedMacroCalls.ql
diff --git a/rust/ql/test/query-tests/diagnostics/does_not_compile.rs b/rust/ql/test/query-tests/diagnostics/does_not_compile.rs
index 9aedaffcd93..15f85e1ab4b 100644
--- a/rust/ql/test/query-tests/diagnostics/does_not_compile.rs
+++ b/rust/ql/test/query-tests/diagnostics/does_not_compile.rs
@@ -1,3 +1,3 @@
 pub fn my_func() {
-	This is not correct Rust code.
+	This is not correct Rust code
 }
diff --git a/rust/ql/test/query-tests/diagnostics/my_macro.rs b/rust/ql/test/query-tests/diagnostics/my_macro.rs
index d8a0cc2812b..3b24857aa6c 100644
--- a/rust/ql/test/query-tests/diagnostics/my_macro.rs
+++ b/rust/ql/test/query-tests/diagnostics/my_macro.rs
@@ -1,6 +1,6 @@
 /**
- * total lines in this file: 18
- * of which code: 10
+ * total lines in this file: 19
+ * of which code: 11
  * of which only comments: 6
  * of which blank: 2
  */
@@ -14,5 +14,6 @@ macro_rules! myMacro {
 pub fn my_func() {
     if true {
         myMacro!();
+        myUndefinedMacro!();
     }
 }
diff --git a/rust/ql/test/query-tests/security/CWE-089/.gitignore b/rust/ql/test/query-tests/security/CWE-089/.gitignore
new file mode 100644
index 00000000000..bdcfa82b5d5
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-089/.gitignore
@@ -0,0 +1,2 @@
+# sqlite database
+*.db*
diff --git a/rust/ql/test/query-tests/security/CWE-089/.sqlx/query-c996a36820ff0b98021fa553b09b6da5ed65c28f666a68c4d73a1918f0eaa6f6.json b/rust/ql/test/query-tests/security/CWE-089/.sqlx/query-c996a36820ff0b98021fa553b09b6da5ed65c28f666a68c4d73a1918f0eaa6f6.json
new file mode 100644
index 00000000000..a4493e90c37
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-089/.sqlx/query-c996a36820ff0b98021fa553b09b6da5ed65c28f666a68c4d73a1918f0eaa6f6.json
@@ -0,0 +1,32 @@
+{
+  "db_name": "SQLite",
+  "query": "SELECT * FROM people WHERE firstname=$1",
+  "describe": {
+    "columns": [
+      {
+        "name": "id",
+        "ordinal": 0,
+        "type_info": "Integer"
+      },
+      {
+        "name": "firstname",
+        "ordinal": 1,
+        "type_info": "Text"
+      },
+      {
+        "name": "lastname",
+        "ordinal": 2,
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "c996a36820ff0b98021fa553b09b6da5ed65c28f666a68c4d73a1918f0eaa6f6"
+}
diff --git a/rust/ql/test/query-tests/security/CWE-089/SqlInjection.expected b/rust/ql/test/query-tests/security/CWE-089/SqlInjection.expected
new file mode 100644
index 00000000000..58f42bec0c8
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-089/SqlInjection.expected
@@ -0,0 +1,4 @@
+#select
+edges
+nodes
+subpaths
diff --git a/rust/ql/test/query-tests/security/CWE-089/SqlInjection.qlref b/rust/ql/test/query-tests/security/CWE-089/SqlInjection.qlref
new file mode 100644
index 00000000000..504d27ff30c
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-089/SqlInjection.qlref
@@ -0,0 +1,2 @@
+query: queries/security/CWE-089/SqlInjection.ql
+postprocess: utils/InlineExpectationsTestQuery.ql
diff --git a/rust/ql/test/extractor-tests/generated/WherePred/WherePred_getTy.expected b/rust/ql/test/query-tests/security/CWE-089/SqlSinks.expected
similarity index 100%
rename from rust/ql/test/extractor-tests/generated/WherePred/WherePred_getTy.expected
rename to rust/ql/test/query-tests/security/CWE-089/SqlSinks.expected
diff --git a/rust/ql/test/query-tests/security/CWE-089/SqlSinks.ql b/rust/ql/test/query-tests/security/CWE-089/SqlSinks.ql
new file mode 100644
index 00000000000..ac5efd72db9
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-089/SqlSinks.ql
@@ -0,0 +1,19 @@
+import rust
+import codeql.rust.security.SqlInjectionExtensions
+import utils.InlineExpectationsTest
+
+module SqlSinksTest implements TestSig {
+  string getARelevantTag() { result = "sql-sink" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    exists(SqlInjection::Sink sink |
+      location = sink.getLocation() and
+      location.getFile().getBaseName() != "" and
+      element = sink.toString() and
+      tag = "sql-sink" and
+      value = ""
+    )
+  }
+}
+
+import MakeTest<SqlSinksTest>
diff --git a/rust/ql/test/query-tests/security/CWE-089/cargo.toml.manual b/rust/ql/test/query-tests/security/CWE-089/cargo.toml.manual
new file mode 100644
index 00000000000..0f9f0b75510
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-089/cargo.toml.manual
@@ -0,0 +1,15 @@
+[workspace]
+
+[package]
+name = "CWE-089-Test"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+reqwest = { version = "0.12.9", features = ["blocking"] }
+sqlx = { version = "0.8", features = ["mysql", "sqlite", "postgres", "runtime-async-std", "tls-native-tls"] }
+futures = { version = "0.3" }
+
+[[bin]]
+name = "sqlx"
+path = "./sqlx.rs"
diff --git a/rust/ql/test/query-tests/security/CWE-089/migrations/20241031153051_create.sql b/rust/ql/test/query-tests/security/CWE-089/migrations/20241031153051_create.sql
new file mode 100644
index 00000000000..c7d989a7258
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-089/migrations/20241031153051_create.sql
@@ -0,0 +1,12 @@
+CREATE TABLE IF NOT EXISTS people
+(
+    id INTEGER PRIMARY KEY NOT NULL,
+    firstname TEXT NOT NULL,
+    lastname TEXT NOT NULL
+);
+
+INSERT INTO people
+VALUES (1, "Alice", "Adams");
+
+INSERT INTO people
+VALUES (2, "Bob", "Becket");
diff --git a/rust/ql/test/query-tests/security/CWE-089/options.yml b/rust/ql/test/query-tests/security/CWE-089/options.yml
new file mode 100644
index 00000000000..24744b7dfb4
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-089/options.yml
@@ -0,0 +1,5 @@
+qltest_cargo_check: true
+qltest_dependencies:
+    - reqwest = { version = "0.12.9", features = ["blocking"] }
+    - sqlx = { version = "0.8", features = ["mysql", "sqlite", "postgres", "runtime-async-std", "tls-native-tls"] }
+    - futures = { version = "0.3" }
diff --git a/rust/ql/test/query-tests/security/CWE-089/sqlx.rs b/rust/ql/test/query-tests/security/CWE-089/sqlx.rs
new file mode 100644
index 00000000000..173f6c730b2
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-089/sqlx.rs
@@ -0,0 +1,218 @@
+use sqlx::Connection;
+use sqlx::Executor;
+
+/**
+ * This test is designed to be "run" in two ways:
+ *  - you can extract and analyze the code here using the CodeQL test runner in the usual way,
+ *    verifying the that various vulnerabilities are detected.
+ *  - you can compile and run the code using `cargo`, verifying that it really is a complete
+ *    program that compiles, runs and executes SQL commands (the sqlite ones, at least).
+ *
+ * To do the latter:
+ *
+ * Install `sqlx`:
+ * ```
+ * cargo install sqlx-cli
+ * ```
+ *
+ * Create the database:
+ * ```
+ * export DATABASE_URL="sqlite:sqlite_database.db"
+ * sqlx db create
+ * sqlx migrate run
+ * ```
+ *
+ * Build and run with the provided `cargo.toml.manual`:
+ * ```
+ * cp cargo.toml.manual cargo.toml
+ * cargo run
+ * ```
+ *
+ * You can also rebuild the sqlx 'query cache' in the `.sqlx` subdirectory
+ * with:
+ * ```
+ * cargo sqlx prepare
+ * ```
+ * This allows the code (in particular the `prepare!` macro) to be built
+ * in the test without setting `DATABASE_URL` first.
+ */
+
+async fn test_sqlx_mysql(url: &str, enable_remote: bool) -> Result<(), sqlx::Error> {
+    // connect through a MySql connection pool
+    let pool = sqlx::mysql::MySqlPool::connect(url).await?;
+    let mut conn = pool.acquire().await?;
+
+    // construct queries (with extra variants)
+    let const_string = String::from("Alice");
+    let arg_string = std::env::args().nth(1).unwrap_or(String::from("Alice")); // $ MISSING: Source=args1
+    let remote_string = reqwest::blocking::get("http://example.com/").unwrap().text().unwrap_or(String::from("Alice")); // $ MISSING: Source=remote1
+    let remote_number = remote_string.parse::<i32>().unwrap_or(0);
+    let safe_query_1 = String::from("SELECT * FROM people WHERE firstname='Alice'");
+    let safe_query_2 = String::from("SELECT * FROM people WHERE firstname='") + &const_string + "'";
+    let safe_query_3 = format!("SELECT * FROM people WHERE firstname='{remote_number}'");
+    let unsafe_query_1 = &arg_string;
+    let unsafe_query_2 = &remote_string;
+    let unsafe_query_3 = String::from("SELECT * FROM people WHERE firstname='") + &remote_string + "'";
+    let unsafe_query_4 = format!("SELECT * FROM people WHERE firstname='{remote_string}'");
+    let prepared_query_1 = String::from("SELECT * FROM people WHERE firstname=?"); // (prepared arguments are safe)
+
+    // direct execution
+    let _ = conn.execute(safe_query_1.as_str()).await?; // $ sql-sink
+    let _ = conn.execute(safe_query_2.as_str()).await?; // $ sql-sink
+    let _ = conn.execute(safe_query_3.as_str()).await?; // $ sql-sink
+    let _ = conn.execute(unsafe_query_1.as_str()).await?; // $ sql-sink MISSING: Alert[sql-injection]=args1
+    if enable_remote {
+        let _ = conn.execute(unsafe_query_2.as_str()).await?; // $ sql-sink MISSING: Alert[sql-injection]=remote1
+        let _ = conn.execute(unsafe_query_3.as_str()).await?; // $ sql-sink MISSING: Alert[sql-injection]=remote1
+        let _ = conn.execute(unsafe_query_4.as_str()).await?; // $ sql-sink MISSING: Alert[sql-injection]=remote1
+    }
+
+    // prepared queries
+    let _ = sqlx::query(safe_query_1.as_str()).execute(&pool).await?; // $ sql-sink
+    let _ = sqlx::query(safe_query_2.as_str()).execute(&pool).await?; // $ sql-sink
+    let _ = sqlx::query(safe_query_3.as_str()).execute(&pool).await?; // $ sql-sink
+    let _ = sqlx::query(unsafe_query_1.as_str()).execute(&pool).await?; // $ sql-sink MISSING: Alert[sql-injection]=args1
+    if enable_remote {
+        let _ = sqlx::query(unsafe_query_2.as_str()).execute(&pool).await?; // $ sql-sink MISSING: Alert[sql-injection]=remote1
+        let _ = sqlx::query(unsafe_query_3.as_str()).execute(&pool).await?; // $ sql-sink MISSING: Alert[sql-injection]=remote1
+        let _ = sqlx::query(unsafe_query_4.as_str()).execute(&pool).await?; // $ sql-sink MISSING: Alert[sql-injection]=remote1
+    }
+    let _ = sqlx::query(prepared_query_1.as_str()).bind(const_string).execute(&pool).await?; // $ sql-sink
+    let _ = sqlx::query(prepared_query_1.as_str()).bind(arg_string).execute(&pool).await?; // $ sql-sink
+    if enable_remote {
+        let _ = sqlx::query(prepared_query_1.as_str()).bind(remote_string).execute(&pool).await?; // $ sql-sink
+        let _ = sqlx::query(prepared_query_1.as_str()).bind(remote_number).execute(&pool).await?; // $ sql-sink
+    }
+
+    Ok(())
+}
+
+async fn test_sqlx_sqlite(url: &str, enable_remote: bool) -> Result<(), sqlx::Error> {
+    // connect through Sqlite, no connection pool
+    let mut conn = sqlx::sqlite::SqliteConnection::connect(url).await?;
+
+    // construct queries
+    let const_string = String::from("Alice");
+    let remote_string = reqwest::blocking::get("http://example.com/").unwrap().text().unwrap_or(String::from("Alice")); // $ MISSING: Source=remote2
+    let safe_query_1 = String::from("SELECT * FROM people WHERE firstname='") + &const_string + "'";
+    let unsafe_query_1 = String::from("SELECT * FROM people WHERE firstname='") + &remote_string + "'";
+    let prepared_query_1 = String::from("SELECT * FROM people WHERE firstname=?"); // (prepared arguments are safe)
+
+    // direct execution (with extra variants)
+    let _ = conn.execute(safe_query_1.as_str()).await?; // $ sql-sink
+    if enable_remote {
+        let _ = conn.execute(unsafe_query_1.as_str()).await?; // $ sql-sink MISSING: Alert[sql-injection]=remote2
+    }
+    // ...
+    let _ = sqlx::raw_sql(safe_query_1.as_str()).execute(&mut conn).await?; // $ sql-sink
+    if enable_remote {
+        let _ = sqlx::raw_sql(unsafe_query_1.as_str()).execute(&mut conn).await?; // $ sql-sink MISSING: Alert[sql-injection]=remote2
+    }
+
+    // prepared queries (with extra variants)
+    let _ = sqlx::query(safe_query_1.as_str()).execute(&mut conn).await?; // $ sql-sink
+    let _ = sqlx::query(prepared_query_1.as_str()).bind(&const_string).execute(&mut conn).await?; // $ sql-sink
+    if enable_remote {
+        let _ = sqlx::query(unsafe_query_1.as_str()).execute(&mut conn).await?; // $ sql-sink MISSING: Alert[sql-injection]=remote2
+        let _ = sqlx::query(prepared_query_1.as_str()).bind(&remote_string).execute(&mut conn).await?; // $ sql-sink
+    }
+    // ...
+    let _ = sqlx::query(safe_query_1.as_str()).fetch(&mut conn); // $ sql-sink
+    let _ = sqlx::query(prepared_query_1.as_str()).bind(&const_string).fetch(&mut conn); // $ sql-sink
+    if enable_remote {
+        let _ = sqlx::query(unsafe_query_1.as_str()).fetch(&mut conn); // $ sql-sink MISSING: Alert[sql-injection]=remote2
+        let _ = sqlx::query(prepared_query_1.as_str()).bind(&remote_string).fetch(&mut conn); // $ sql-sink
+    }
+    // ...
+    let row1: (i64, String, String) = sqlx::query_as(safe_query_1.as_str()).fetch_one(&mut conn).await?; // $ sql-sink
+    println!("  row1 = {:?}", row1);
+    let row2: (i64, String, String) = sqlx::query_as(prepared_query_1.as_str()).bind(&const_string).fetch_one(&mut conn).await?; // $ sql-sink
+    println!("  row2 = {:?}", row2);
+    if enable_remote {
+        let _: (i64, String, String) = sqlx::query_as(unsafe_query_1.as_str()).fetch_one(&mut conn).await?; // $ sql-sink MISSING: Alert[sql-injection]=remote2
+        let _: (i64, String, String) = sqlx::query_as(prepared_query_1.as_str()).bind(&remote_string).fetch_one(&mut conn).await?; // $ sql-sink
+    }
+    // ...
+    let row3: (i64, String, String) = sqlx::query_as(safe_query_1.as_str()).fetch_optional(&mut conn).await?.expect("no data"); // $ sql-sink
+    println!("  row3 = {:?}", row3);
+    let row4: (i64, String, String) = sqlx::query_as(prepared_query_1.as_str()).bind(&const_string).fetch_optional(&mut conn).await?.expect("no data"); // $ sql-sink
+    println!("  row4 = {:?}", row4);
+    if enable_remote {
+        let _: (i64, String, String) = sqlx::query_as(unsafe_query_1.as_str()).fetch_optional(&mut conn).await?.expect("no data"); // $ sql-sink $ MISSING: Alert[sql-injection]=remote2
+        let _: (i64, String, String) = sqlx::query_as(prepared_query_1.as_str()).bind(&remote_string).fetch_optional(&mut conn).await?.expect("no data"); // $ sql-sink
+    }
+    // ...
+    let _ = sqlx::query(safe_query_1.as_str()).fetch_all(&mut conn).await?; // $ sql-sink
+    let _ = sqlx::query(prepared_query_1.as_str()).bind(&const_string).fetch_all(&mut conn).await?; // $ sql-sink
+    let _ = sqlx::query("SELECT * FROM people WHERE firstname=?").bind(&const_string).fetch_all(&mut conn).await?; // $ sql-sink
+    if enable_remote {
+        let _ = sqlx::query(unsafe_query_1.as_str()).fetch_all(&mut conn).await?; // $ sql-sink MISSING: Alert[sql-injection]=remote2
+        let _ = sqlx::query(prepared_query_1.as_str()).bind(&remote_string).fetch_all(&mut conn).await?; // $ sql-sink
+        let _ = sqlx::query("SELECT * FROM people WHERE firstname=?").bind(&remote_string).fetch_all(&mut conn).await?; // $ sql-sink
+    }
+    // ...
+    let _ = sqlx::query!("SELECT * FROM people WHERE firstname=$1", const_string).fetch_all(&mut conn).await?; // $ MISSING: sql-sink (only takes string literals, so can't be vulnerable)
+    if enable_remote {
+        let _ = sqlx::query!("SELECT * FROM people WHERE firstname=$1", remote_string).fetch_all(&mut conn).await?; // $ MISSING: sql-sink
+    }
+
+    Ok(())
+}
+
+async fn test_sqlx_postgres(url: &str, enable_remote: bool) -> Result<(), sqlx::Error> {
+    // connect through a PostGres connection pool
+    let pool = sqlx::postgres::PgPool::connect(url).await?;
+    let mut conn = pool.acquire().await?;
+
+    // construct queries
+    let const_string = String::from("Alice");
+    let remote_string = reqwest::blocking::get("http://example.com/").unwrap().text().unwrap_or(String::from("Alice")); // $ MISSING: Source=remote3
+    let safe_query_1 = String::from("SELECT * FROM people WHERE firstname='") + &const_string + "'";
+    let unsafe_query_1 = String::from("SELECT * FROM people WHERE firstname='") + &remote_string + "'";
+    let prepared_query_1 = String::from("SELECT * FROM people WHERE firstname=$1"); // (prepared arguments are safe)
+
+    // direct execution
+    let _ = conn.execute(safe_query_1.as_str()).await?; // $ sql-sink
+    if enable_remote {
+        let _ = conn.execute(unsafe_query_1.as_str()).await?; // $ sql-sink MISSING: Alert[sql-injection]=remote3
+    }
+
+    // prepared queries
+    let _ = sqlx::query(safe_query_1.as_str()).execute(&pool).await?; // $ sql-sink
+    let _ = sqlx::query(prepared_query_1.as_str()).bind(&const_string).execute(&pool).await?; // $ sql-sink
+    if enable_remote {
+        let _ = sqlx::query(unsafe_query_1.as_str()).execute(&pool).await?; // $ sql-sink MISSING: Alert[sql-injection]=remote3
+        let _ = sqlx::query(prepared_query_1.as_str()).bind(&remote_string).execute(&pool).await?; // $ sql-sink
+    }
+
+    Ok(())
+}
+
+fn main() {
+    println!("--- CWE-089 sqlx.rs test ---");
+
+    // we don't *actually* use data from a remote source unless we're explicitly told to at the
+    // command line; that's because this test is designed to be runnable, and we don't really
+    // want to expose the test database to potential SQL injection from http://example.com/ -
+    // no matter how unlikely, local and compartmentalized that may seem.
+    let enable_remote = std::env::args().nth(1) == Some(String::from("ENABLE_REMOTE"));
+    println!("enable_remote = {enable_remote}");
+
+    println!("test_sqlx_mysql...");
+    match futures::executor::block_on(test_sqlx_mysql("", enable_remote)) {
+        Ok(_) => println!("  successful!"),
+        Err(e) => println!("  error: {}", e),
+    }
+
+    println!("test_sqlx_sqlite...");
+    match futures::executor::block_on(test_sqlx_sqlite("sqlite:sqlite_database.db", enable_remote)) {
+        Ok(_) => println!("  successful!"),
+        Err(e) => println!("  error: {}", e),
+    }
+
+    println!("test_sqlx_postgres...");
+    match futures::executor::block_on(test_sqlx_postgres("", enable_remote)) {
+        Ok(_) => println!("  successful!"),
+        Err(e) => println!("  error: {}", e),
+    }
+}
diff --git a/rust/ql/test/query-tests/security/CWE-696/BadCTorInitialization.expected b/rust/ql/test/query-tests/security/CWE-696/BadCTorInitialization.expected
new file mode 100644
index 00000000000..311e1828f53
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-696/BadCTorInitialization.expected
@@ -0,0 +1,44 @@
+#select
+| test.rs:31:9:31:25 | ...::stdout(...) | test.rs:29:1:29:13 | Attr | test.rs:31:9:31:25 | ...::stdout(...) | Call to ...::stdout(...) in a function with the ctor attribute. |
+| test.rs:36:9:36:25 | ...::stdout(...) | test.rs:34:1:34:13 | Attr | test.rs:36:9:36:25 | ...::stdout(...) | Call to ...::stdout(...) in a function with the dtor attribute. |
+| test.rs:43:9:43:25 | ...::stdout(...) | test.rs:40:1:40:13 | Attr | test.rs:43:9:43:25 | ...::stdout(...) | Call to ...::stdout(...) in a function with the dtor attribute. |
+| test.rs:53:9:53:16 | stdout(...) | test.rs:51:1:51:7 | Attr | test.rs:53:9:53:16 | stdout(...) | Call to stdout(...) in a function with the ctor attribute. |
+| test.rs:58:9:58:16 | stderr(...) | test.rs:56:1:56:7 | Attr | test.rs:58:9:58:16 | stderr(...) | Call to stderr(...) in a function with the ctor attribute. |
+| test.rs:63:14:63:28 | ...::_print(...) | test.rs:61:1:61:7 | Attr | test.rs:63:14:63:28 | ...::_print(...) | Call to ...::_print(...) in a function with the ctor attribute. |
+| test.rs:69:9:69:24 | ...::stdin(...) | test.rs:66:1:66:7 | Attr | test.rs:69:9:69:24 | ...::stdin(...) | Call to ...::stdin(...) in a function with the ctor attribute. |
+| test.rs:90:5:90:35 | ...::sleep(...) | test.rs:88:1:88:7 | Attr | test.rs:90:5:90:35 | ...::sleep(...) | Call to ...::sleep(...) in a function with the ctor attribute. |
+| test.rs:97:5:97:23 | ...::exit(...) | test.rs:95:1:95:7 | Attr | test.rs:97:5:97:23 | ...::exit(...) | Call to ...::exit(...) in a function with the ctor attribute. |
+| test.rs:126:9:126:16 | stderr(...) | test.rs:129:1:129:7 | Attr | test.rs:126:9:126:16 | stderr(...) | Call to stderr(...) in a function with the ctor attribute. |
+| test.rs:126:9:126:16 | stderr(...) | test.rs:145:1:145:7 | Attr | test.rs:126:9:126:16 | stderr(...) | Call to stderr(...) in a function with the ctor attribute. |
+| test.rs:126:9:126:44 | ... .write_all(...) | test.rs:129:1:129:7 | Attr | test.rs:126:9:126:44 | ... .write_all(...) | Call to ... .write_all(...) in a function with the ctor attribute. |
+| test.rs:126:9:126:44 | ... .write_all(...) | test.rs:145:1:145:7 | Attr | test.rs:126:9:126:44 | ... .write_all(...) | Call to ... .write_all(...) in a function with the ctor attribute. |
+| test.rs:171:5:171:15 | ...::stdout(...) | test.rs:169:1:169:7 | Attr | test.rs:171:5:171:15 | ...::stdout(...) | Call to ...::stdout(...) in a function with the ctor attribute. |
+edges
+| test.rs:29:1:29:13 | Attr | test.rs:29:1:32:1 | fn bad1_1 |
+| test.rs:29:1:32:1 | fn bad1_1 | test.rs:31:9:31:25 | ...::stdout(...) |
+| test.rs:34:1:34:13 | Attr | test.rs:34:1:37:1 | fn bad1_2 |
+| test.rs:34:1:37:1 | fn bad1_2 | test.rs:36:9:36:25 | ...::stdout(...) |
+| test.rs:39:1:44:1 | fn bad1_3 | test.rs:43:9:43:25 | ...::stdout(...) |
+| test.rs:40:1:40:13 | Attr | test.rs:39:1:44:1 | fn bad1_3 |
+| test.rs:51:1:51:7 | Attr | test.rs:51:1:54:1 | fn bad2_1 |
+| test.rs:51:1:54:1 | fn bad2_1 | test.rs:53:9:53:16 | stdout(...) |
+| test.rs:56:1:56:7 | Attr | test.rs:56:1:59:1 | fn bad2_2 |
+| test.rs:56:1:59:1 | fn bad2_2 | test.rs:58:9:58:16 | stderr(...) |
+| test.rs:61:1:61:7 | Attr | test.rs:61:1:64:1 | fn bad2_3 |
+| test.rs:61:1:64:1 | fn bad2_3 | test.rs:63:14:63:28 | ...::_print(...) |
+| test.rs:66:1:66:7 | Attr | test.rs:66:1:70:1 | fn bad2_4 |
+| test.rs:66:1:70:1 | fn bad2_4 | test.rs:69:9:69:24 | ...::stdin(...) |
+| test.rs:88:1:88:7 | Attr | test.rs:88:1:91:1 | fn bad2_7 |
+| test.rs:88:1:91:1 | fn bad2_7 | test.rs:90:5:90:35 | ...::sleep(...) |
+| test.rs:95:1:95:7 | Attr | test.rs:95:1:98:1 | fn bad2_8 |
+| test.rs:95:1:98:1 | fn bad2_8 | test.rs:97:5:97:23 | ...::exit(...) |
+| test.rs:125:1:127:1 | fn call_target3_1 | test.rs:126:9:126:16 | stderr(...) |
+| test.rs:125:1:127:1 | fn call_target3_1 | test.rs:126:9:126:44 | ... .write_all(...) |
+| test.rs:129:1:129:7 | Attr | test.rs:129:1:132:1 | fn bad3_1 |
+| test.rs:129:1:132:1 | fn bad3_1 | test.rs:131:5:131:20 | call_target3_1(...) |
+| test.rs:131:5:131:20 | call_target3_1(...) | test.rs:125:1:127:1 | fn call_target3_1 |
+| test.rs:145:1:145:7 | Attr | test.rs:145:1:149:1 | fn bad3_3 |
+| test.rs:145:1:149:1 | fn bad3_3 | test.rs:147:5:147:20 | call_target3_1(...) |
+| test.rs:147:5:147:20 | call_target3_1(...) | test.rs:125:1:127:1 | fn call_target3_1 |
+| test.rs:169:1:169:7 | Attr | test.rs:169:1:172:1 | fn bad4_1 |
+| test.rs:169:1:172:1 | fn bad4_1 | test.rs:171:5:171:15 | ...::stdout(...) |
diff --git a/rust/ql/test/query-tests/security/CWE-696/BadCTorInitialization.qlref b/rust/ql/test/query-tests/security/CWE-696/BadCTorInitialization.qlref
new file mode 100644
index 00000000000..2b71705c98b
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-696/BadCTorInitialization.qlref
@@ -0,0 +1,2 @@
+query: queries/security/CWE-696/BadCtorInitialization.ql
+postprocess: utils/InlineExpectationsTestQuery.ql
diff --git a/rust/ql/test/query-tests/security/CWE-696/options.yml b/rust/ql/test/query-tests/security/CWE-696/options.yml
new file mode 100644
index 00000000000..cc3dc0f3519
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-696/options.yml
@@ -0,0 +1,4 @@
+qltest_cargo_check: true
+qltest_dependencies:
+    - ctor = { version = "0.2.9" }
+    - libc-print = { version = "0.1.23" }
diff --git a/rust/ql/test/query-tests/security/CWE-696/test.rs b/rust/ql/test/query-tests/security/CWE-696/test.rs
new file mode 100644
index 00000000000..5cd7f451f2c
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-696/test.rs
@@ -0,0 +1,172 @@
+
+// --- attribute variants ---
+
+use std::io::Write;
+
+fn harmless1_1() {
+    // ...
+}
+
+#[ctor::ctor]
+fn harmless1_2() {
+    // ...
+}
+
+#[ctor::dtor]
+fn harmless1_3() {
+    // ...
+}
+
+fn harmless1_4() {
+    _ = std::io::stdout().write(b"Hello, world!");
+}
+
+#[rustfmt::skip]
+fn harmless1_5() {
+    _ = std::io::stdout().write(b"Hello, world!");
+}
+
+#[ctor::ctor] // $ Source=source1_1
+fn bad1_1() {
+    _ = std::io::stdout().write(b"Hello, world!"); // $ Alert[rust/ctor-initialization]=source1_1
+}
+
+#[ctor::dtor] // $ Source=source1_2
+fn bad1_2() {
+    _ = std::io::stdout().write(b"Hello, world!"); // $ Alert[rust/ctor-initialization]=source1_2
+}
+
+#[rustfmt::skip]
+#[ctor::dtor] // $ Source=source1_3
+#[rustfmt::skip]
+fn bad1_3() {
+    _ = std::io::stdout().write(b"Hello, world!"); // $ Alert[rust/ctor-initialization]=source1_3
+}
+
+// --- code variants ---
+
+use ctor::ctor;
+use std::io::*;
+
+#[ctor] // $ Source=source2_1
+fn bad2_1() {
+    _ = stdout().write(b"Hello, world!"); // $ Alert[rust/ctor-initialization]=source2_1
+}
+
+#[ctor] // $ Source=source2_2
+fn bad2_2() {
+    _ = stderr().write_all(b"Hello, world!"); // $ Alert[rust/ctor-initialization]=source2_2
+}
+
+#[ctor] // $ Source=source2_3
+fn bad2_3() {
+    println!("Hello, world!"); // $ Alert[rust/ctor-initialization]=source2_3
+}
+
+#[ctor] // $ Source=source2_4
+fn bad2_4() {
+    let mut buff = String::new();
+    _ = std::io::stdin().read_line(&mut buff); // $ Alert[rust/ctor-initialization]=source2_4
+}
+
+use std::fs;
+
+#[ctor] // $ MISSING: Source=source2_5
+fn bad2_5() {
+    let _buff = fs::File::create("hello.txt").unwrap(); // $ MISSING: Alert[rust/ctor-initialization]=source2_5
+}
+
+#[ctor] // $ MISSING: Source=source2_6
+fn bad2_6() {
+    let _t = std::time::Instant::now(); // $ MISSING: Alert[rust/ctor-initialization]=source2_6
+}
+
+use std::time::Duration;
+
+const DURATION2_7: Duration = Duration::new(1, 0);
+
+#[ctor] // $ Source=source2_7
+fn bad2_7() {
+    std::thread::sleep(DURATION2_7); // $ Alert[rust/ctor-initialization]=source2_7
+}
+
+use std::process;
+
+#[ctor] // $ Source=source2_8
+fn bad2_8() {
+    process::exit(1234); // $ Alert[rust/ctor-initialization]=source2_8
+}
+
+#[ctor::ctor]
+fn harmless2_9() {
+    libc_print::libc_println!("Hello, world!"); // does not use the std library
+}
+
+#[ctor::ctor]
+fn harmless2_10() {
+    core::assert!(true); // core library should be OK in this context
+}
+
+extern crate alloc;
+use alloc::alloc::{alloc, dealloc, Layout};
+
+#[ctor::ctor]
+unsafe fn harmless2_11() {
+    let layout = Layout::new::<u64>();
+    let ptr = alloc(layout); // alloc library should be OK in this context
+
+    if !ptr.is_null() {
+        dealloc(ptr, layout);
+    }
+}
+
+// --- transitive cases ---
+
+fn call_target3_1() {
+    _ = stderr().write_all(b"Hello, world!"); // $ Alert=source3_1 Alert=source3_3 MISSING: Alert=source3_4
+}
+
+#[ctor] // $ Source=source3_1
+fn bad3_1() {
+    call_target3_1();
+}
+
+fn call_target3_2() {
+    for _x in 0..10 {
+        // ...
+    }
+}
+
+#[ctor]
+fn harmless3_2() {
+    call_target3_2();
+}
+
+#[ctor] // $ Source=source3_3
+fn bad3_3() {
+    call_target3_1();
+    call_target3_2();
+}
+
+#[ctor] // $ MISSING: Source=source3_4
+fn bad3_4() {
+    bad3_3();
+}
+
+fn harmless3_5() {
+    call_target3_1();
+    call_target3_2();
+}
+
+// --- macros ---
+
+macro_rules! macro4_1 {
+    () => {
+        _ = std::io::stdout().write(b"Hello, world!");
+    };
+}
+
+#[ctor] // $ Source=source4_1
+fn bad4_1() {
+    macro4_1!(); // $ Alert[rust/ctor-initialization]=source4_1
+}
diff --git a/rust/ql/test/query-tests/unusedentities/CONSISTENCY/DataFlowConsistency.expected b/rust/ql/test/query-tests/unusedentities/CONSISTENCY/DataFlowConsistency.expected
deleted file mode 100644
index 0a61a151c20..00000000000
--- a/rust/ql/test/query-tests/unusedentities/CONSISTENCY/DataFlowConsistency.expected
+++ /dev/null
@@ -1,5 +0,0 @@
-uniqueEnclosingCallable
-| main.rs:194:25:194:25 | x | Node should have one enclosing callable but has 0. |
-| main.rs:198:28:198:28 | x | Node should have one enclosing callable but has 0. |
-| main.rs:202:28:202:28 | x | Node should have one enclosing callable but has 0. |
-| main.rs:206:28:206:28 | x | Node should have one enclosing callable but has 0. |
diff --git a/rust/ql/test/utils/InlineFlowTest.qll b/rust/ql/test/utils/InlineFlowTest.qll
index b4960a055ee..dcf8ad8c445 100644
--- a/rust/ql/test/utils/InlineFlowTest.qll
+++ b/rust/ql/test/utils/InlineFlowTest.qll
@@ -5,26 +5,27 @@
 
 import rust
 private import codeql.dataflow.test.InlineFlowTest
+private import codeql.rust.controlflow.CfgNodes
 private import codeql.rust.dataflow.DataFlow
 private import codeql.rust.dataflow.internal.DataFlowImpl
 private import codeql.rust.dataflow.internal.TaintTrackingImpl
 private import internal.InlineExpectationsTestImpl as InlineExpectationsTestImpl
 
 // Holds if the target expression of `call` is a path and the string representation of the path is `name`.
-private predicate callTargetName(CallExpr call, string name) {
-  call.getExpr().(PathExpr).toString() = name
+private predicate callTargetName(CallExprCfgNode call, string name) {
+  call.getFunction().(PathExprCfgNode).toString() = name
 }
 
 private module FlowTestImpl implements InputSig<Location, RustDataFlow> {
   predicate defaultSource(DataFlow::Node source) { callTargetName(source.asExpr(), "source") }
 
   predicate defaultSink(DataFlow::Node sink) {
-    any(CallExpr call | callTargetName(call, "sink")).getArgList().getAnArg() = sink.asExpr()
+    any(CallExprCfgNode call | callTargetName(call, "sink")).getArgument(_) = sink.asExpr()
   }
 
   private string getSourceArgString(DataFlow::Node src) {
     defaultSource(src) and
-    result = src.asExpr().(CallExpr).getArgList().getArg(0).toString()
+    result = src.asExpr().(CallExprCfgNode).getArgument(0).toString()
   }
 
   bindingset[src, sink]
diff --git a/rust/schema/annotations.py b/rust/schema/annotations.py
index d8e9835b16a..9ee94e99c25 100644
--- a/rust/schema/annotations.py
+++ b/rust/schema/annotations.py
@@ -1,6 +1,19 @@
 from misc.codegen.lib.schemadefs import *
 from .ast import *
 
+class LabelableExpr(Expr):
+    """
+    The base class for expressions that can be labeled (`LoopExpr`, `ForExpr`, `WhileExpr` or `BlockExpr`).
+    """
+    label: optional[Label] | child
+
+class LoopingExpr(LabelableExpr):
+    """
+    The base class for expressions that loop (`LoopExpr`, `ForExpr` or `WhileExpr`).
+    """
+    loop_body: optional["BlockExpr"] | child
+
+
 
 @annotate(Module)
 @rust.doc_test_signature(None)
@@ -18,14 +31,14 @@ class _:
     """
 
 
-@annotate(Expr)
+@annotate(Expr, cfg = True)
 class _:
     """
     The base class for expressions.
     """
 
 
-@annotate(Pat)
+@annotate(Pat, cfg = True)
 class _:
     """
     The base class for patterns.
@@ -52,7 +65,7 @@ class _:
     """
 
 
-@annotate(TypeRef)
+@annotate(TypeRepr)
 class _:
     """
     The base class for type references.
@@ -68,6 +81,7 @@ class _:
     """
     A path. For example:
     ```rust
+    use some_crate::some_module::some_item;
     foo::bar;
     ```
     """
@@ -106,7 +120,8 @@ class PathExprBase(Expr):
     """
 
 
-@annotate(PathExpr, replace_bases={Expr: PathExprBase})
+@annotate(PathExpr, replace_bases={Expr: PathExprBase}, cfg = True)
+@qltest.test_with(Path)
 class _:
     """
     A path expression. For example:
@@ -114,12 +129,12 @@ class _:
     let x = variable;
     let x = foo::bar;
     let y = <T>::foo;
-    let z = <TypeRef as Trait>::foo;
+    let z = <TypeRepr as Trait>::foo;
     ```
     """
 
 
-@annotate(IfExpr)
+@annotate(IfExpr, cfg = True)
 class _:
     """
     An `if` expression. For example:
@@ -138,7 +153,7 @@ class _:
     """
 
 
-@annotate(LetExpr)
+@annotate(LetExpr, cfg = True)
 @rust.doc_test_signature("(maybe_some: Option<String>) -> ()")
 class _:
     """
@@ -151,7 +166,7 @@ class _:
     """
 
 
-@annotate(BlockExpr)
+@annotate(BlockExpr, replace_bases={Expr: LabelableExpr}, cfg = True)
 class _:
     """
     A block expression. For example:
@@ -167,9 +182,10 @@ class _:
     }
     ```
     """
+    label: drop
 
 
-@annotate(LoopExpr)
+@annotate(LoopExpr, replace_bases={Expr: LoopingExpr}, cfg = True)
 class _:
     """
     A loop expression. For example:
@@ -195,6 +211,8 @@ class _:
     };
     ```
     """
+    label: drop
+    loop_body: drop
 
 
 class CallExprBase(Expr):
@@ -205,7 +223,7 @@ class CallExprBase(Expr):
     attrs: list["Attr"] | child
 
 
-@annotate(CallExpr, replace_bases={Expr: CallExprBase})
+@annotate(CallExpr, replace_bases={Expr: CallExprBase}, cfg = True)
 class _:
     """
     A function call expression. For example:
@@ -220,7 +238,7 @@ class _:
     attrs: drop
 
 
-@annotate(MethodCallExpr, replace_bases={Expr: CallExprBase}, add_bases=(Resolvable,))
+@annotate(MethodCallExpr, replace_bases={Expr: CallExprBase}, add_bases=(Resolvable,), cfg = True)
 class _:
     """
     A method call expression. For example:
@@ -253,7 +271,7 @@ class _:
     """
 
 
-@annotate(MatchExpr)
+@annotate(MatchExpr, cfg = True)
 @rust.doc_test_signature("(x: i32) -> i32")
 class _:
     """
@@ -271,9 +289,10 @@ class _:
     }
     ```
     """
+    scrutinee: _ | doc("scrutinee (the expression being matched) of this match expression")
 
 
-@annotate(ContinueExpr)
+@annotate(ContinueExpr, cfg = True)
 class _:
     """
     A continue expression. For example:
@@ -294,7 +313,7 @@ class _:
     """
 
 
-@annotate(BreakExpr)
+@annotate(BreakExpr, cfg = True)
 class _:
     """
     A break expression. For example:
@@ -323,7 +342,7 @@ class _:
   """
 
 
-@annotate(ReturnExpr)
+@annotate(ReturnExpr, cfg = True)
 @rust.doc_test_signature(None)
 class _:
     """
@@ -341,7 +360,7 @@ class _:
     """
 
 
-@annotate(BecomeExpr)
+@annotate(BecomeExpr, cfg = True)
 @rust.doc_test_signature(None)
 class _:
     """
@@ -358,7 +377,7 @@ class _:
     """
 
 
-@annotate(YieldExpr)
+@annotate(YieldExpr, cfg = True)
 class _:
     """
     A `yield` expression. For example:
@@ -371,7 +390,7 @@ class _:
     """
 
 
-@annotate(YeetExpr)
+@annotate(YeetExpr, cfg = True)
 class _:
     """
     A `yeet` expression. For example:
@@ -393,7 +412,7 @@ class _:
     """
 
 
-@annotate(RecordExpr)
+@annotate(RecordExpr, cfg = True)
 class _:
     """
     A record expression. For example:
@@ -406,7 +425,7 @@ class _:
     """
 
 
-@annotate(FieldExpr)
+@annotate(FieldExpr, cfg = True)
 class _:
     """
     A field access expression. For example:
@@ -416,7 +435,7 @@ class _:
     """
 
 
-@annotate(AwaitExpr)
+@annotate(AwaitExpr, cfg = True)
 class _:
     """
     An `await` expression. For example:
@@ -439,7 +458,7 @@ class _:
     """
 
 
-@annotate(RefExpr)
+@annotate(RefExpr, cfg = True)
 class _:
     """
     A reference expression. For example:
@@ -452,7 +471,7 @@ class _:
     """
 
 
-@annotate(PrefixExpr)
+@annotate(PrefixExpr, cfg = True)
 class _:
     """
     A unary operation expression. For example:
@@ -464,7 +483,7 @@ class _:
     """
 
 
-@annotate(BinaryExpr)
+@annotate(BinaryExpr, cfg = True)
 class _:
     """
     A binary operation expression. For example:
@@ -478,7 +497,7 @@ class _:
     """
 
 
-@annotate(RangeExpr)
+@annotate(RangeExpr, cfg = True)
 class _:
     """
     A range expression. For example:
@@ -493,7 +512,7 @@ class _:
     """
 
 
-@annotate(IndexExpr)
+@annotate(IndexExpr, cfg = True)
 class _:
     """
     An index expression. For example:
@@ -520,7 +539,7 @@ class _:
     """
 
 
-@annotate(TupleExpr)
+@annotate(TupleExpr, cfg = True)
 class _:
     """
     A tuple expression. For example:
@@ -531,18 +550,48 @@ class _:
     """
 
 
-@annotate(ArrayExpr)
+@annotate(ArrayExprInternal)
+@ql.internal
+@qltest.skip
 class _:
+    pass
+
+class ArrayExpr(Expr):
     """
-    An array expression. For example:
+    The base class for array expressions. For example:
     ```rust
     [1, 2, 3];
     [1; 10];
     ```
     """
+    exprs: list[Expr] | child
+    attrs: list[Attr] | child
+
+@synth.from_class(ArrayExprInternal)
+class ArrayListExpr(ArrayExpr):
+    """
+    An array expression with a list of elements. For example:
+    ```rust
+    [1, 2, 3];
+    ```
+    """
+    __cfg__ = True
+
+@synth.from_class(ArrayExprInternal)
+class ArrayRepeatExpr(ArrayExpr):
+    """
+    An array expression with a repeat operand and a repeat length. For example:
+    ```rust
+    [1; 10];
+    ```
+    """
+    __cfg__ = True
+
+    repeat_operand: Expr | child
+    repeat_length: Expr | child
 
 
-@annotate(LiteralExpr)
+@annotate(LiteralExpr, cfg = True)
 class _:
     """
     A literal expression. For example:
@@ -559,7 +608,7 @@ class _:
     """
 
 
-@annotate(UnderscoreExpr)
+@annotate(UnderscoreExpr, cfg = True)
 class _:
     """
     An underscore expression. For example:
@@ -569,7 +618,7 @@ class _:
     """
 
 
-@annotate(OffsetOfExpr)
+@annotate(OffsetOfExpr, cfg = True)
 class _:
     """
      An `offset_of` expression. For example:
@@ -579,7 +628,7 @@ class _:
     """
 
 
-@annotate(AsmExpr)
+@annotate(AsmExpr, cfg = True)
 class _:
     """
     An inline assembly expression. For example:
@@ -591,7 +640,7 @@ class _:
     """
 
 
-@annotate(LetStmt)
+@annotate(LetStmt, cfg = True)
 class _:
     """
     A let statement. For example:
@@ -620,7 +669,7 @@ class _:
     """
 
 
-@annotate(WildcardPat)
+@annotate(WildcardPat, cfg = True)
 class _:
     """
     A wildcard pattern. For example:
@@ -630,7 +679,7 @@ class _:
     """
 
 
-@annotate(TuplePat)
+@annotate(TuplePat, cfg = True)
 class _:
     """
     A tuple pattern. For example:
@@ -641,7 +690,7 @@ class _:
     """
 
 
-@annotate(OrPat)
+@annotate(OrPat, cfg = True)
 class _:
     """
     An or pattern. For example:
@@ -663,7 +712,7 @@ class _:
     """
 
 
-@annotate(RecordPat)
+@annotate(RecordPat, cfg = True)
 class _:
     """
     A record pattern. For example:
@@ -676,7 +725,7 @@ class _:
     """
 
 
-@annotate(RangePat)
+@annotate(RangePat, cfg = True)
 class _:
     """
     A range pattern. For example:
@@ -690,7 +739,7 @@ class _:
     """
 
 
-@annotate(SlicePat)
+@annotate(SlicePat, cfg = True)
 class _:
     """
     A slice pattern. For example:
@@ -704,7 +753,8 @@ class _:
     """
 
 
-@annotate(PathPat)
+@annotate(PathPat, cfg = True)
+@qltest.test_with(Path)
 class _:
     """
     A path pattern. For example:
@@ -717,7 +767,7 @@ class _:
     """
 
 
-@annotate(LiteralPat)
+@annotate(LiteralPat, cfg = True)
 class _:
     """
     A literal pattern. For example:
@@ -730,7 +780,7 @@ class _:
     """
 
 
-@annotate(IdentPat)
+@annotate(IdentPat, cfg = True)
 class _:
     """
     A binding pattern. For example:
@@ -749,7 +799,7 @@ class _:
     """
 
 
-@annotate(TupleStructPat)
+@annotate(TupleStructPat, cfg = True)
 class _:
     """
     A tuple struct pattern. For example:
@@ -763,7 +813,7 @@ class _:
     """
 
 
-@annotate(RefPat)
+@annotate(RefPat, cfg = True)
 class _:
     """
     A reference pattern. For example:
@@ -776,7 +826,7 @@ class _:
     """
 
 
-@annotate(BoxPat)
+@annotate(BoxPat, cfg = True)
 class _:
     """
     A box pattern. For example:
@@ -789,7 +839,7 @@ class _:
     """
 
 
-@annotate(ConstBlockPat)
+@annotate(ConstBlockPat, cfg = True)
 class _:
     """
     A const block pattern. For example:
@@ -822,10 +872,10 @@ class _:
     """
 
 
-@annotate(ArrayType)
+@annotate(ArrayTypeRepr)
 class _:
     """
-    A ArrayType. For example:
+    A ArrayTypeRepr. For example:
     ```rust
     todo!()
     ```
@@ -910,10 +960,10 @@ class _:
     """
 
 
-@annotate(DynTraitType)
+@annotate(DynTraitTypeRepr)
 class _:
     """
-    A DynTraitType. For example:
+    A DynTraitTypeRepr. For example:
     ```rust
     todo!()
     ```
@@ -980,17 +1030,17 @@ class _:
     """
 
 
-@annotate(FnPtrType)
+@annotate(FnPtrTypeRepr)
 class _:
     """
-    A FnPtrType. For example:
+    A FnPtrTypeRepr. For example:
     ```rust
     todo!()
     ```
     """
 
 
-@annotate(ForExpr)
+@annotate(ForExpr, replace_bases={Expr: LoopingExpr}, cfg = True)
 class _:
     """
     A ForExpr. For example:
@@ -998,12 +1048,14 @@ class _:
     todo!()
     ```
     """
+    label: drop
+    loop_body: drop
 
 
-@annotate(ForType)
+@annotate(ForTypeRepr)
 class _:
     """
-    A ForType. For example:
+    A ForTypeRepr. For example:
     ```rust
     todo!()
     ```
@@ -1011,6 +1063,7 @@ class _:
 
 
 @annotate(FormatArgsArg)
+@qltest.test_with(FormatArgsExpr)
 class _:
     """
     A FormatArgsArg. For example:
@@ -1020,14 +1073,19 @@ class _:
     """
 
 
-@annotate(FormatArgsExpr)
+@annotate(FormatArgsExpr, cfg = True)
 class _:
     """
     A FormatArgsExpr. For example:
     ```rust
-    todo!()
+    format_args!("no args");
+    format_args!("{} foo {:?}", 1, 2);
+    format_args!("{b} foo {a:?}", a=1, b=2);
+    let (x, y) = (1, 42);
+    format_args!("{x}, {y}");
     ```
     """
+    formats: list["Format"] | child | synth
 
 
 @annotate(GenericArg)
@@ -1070,20 +1128,20 @@ class _:
     """
 
 
-@annotate(ImplTraitType)
+@annotate(ImplTraitTypeRepr)
 class _:
     """
-    A ImplTraitType. For example:
+    A ImplTraitTypeRepr. For example:
     ```rust
     todo!()
     ```
     """
 
 
-@annotate(InferType)
+@annotate(InferTypeRepr)
 class _:
     """
-    A InferType. For example:
+    A InferTypeRepr. For example:
     ```rust
     todo!()
     ```
@@ -1150,7 +1208,7 @@ class _:
     """
 
 
-@annotate(MacroCall)
+@annotate(MacroCall, cfg = True)
 class _:
     """
     A MacroCall. For example:
@@ -1171,7 +1229,7 @@ class _:
     """
 
 
-@annotate(MacroExpr)
+@annotate(MacroExpr, cfg = True)
 class _:
     """
     A MacroExpr. For example:
@@ -1194,7 +1252,7 @@ class _:
     """
 
 
-@annotate(MacroPat)
+@annotate(MacroPat, cfg = True)
 class _:
     """
     A MacroPat. For example:
@@ -1227,10 +1285,10 @@ class _:
     """
 
 
-@annotate(MacroType)
+@annotate(MacroTypeRepr)
 class _:
     """
-    A MacroType. For example:
+    A MacroTypeRepr. For example:
     ```rust
     todo!()
     ```
@@ -1287,24 +1345,39 @@ class _:
     """
 
 
-@annotate(NeverType)
+@annotate(NeverTypeRepr)
 class _:
     """
-    A NeverType. For example:
+    A NeverTypeRepr. For example:
     ```rust
     todo!()
     ```
     """
 
 
-@annotate(Param)
+class ParamBase(AstNode):
+    """
+    A normal parameter, `Param`, or a self parameter `SelfParam`.
+    """
+    attrs: list["Attr"] | child
+    type_repr: optional["TypeRepr"] | child
+
+@annotate(ParamBase, cfg = True)
+class _:
+    pass
+
+@annotate(Param, replace_bases={AstNode: ParamBase}, cfg = True)
 class _:
     """
-    A Param. For example:
+    A parameter in a function or method. For example `x` in:
     ```rust
-    todo!()
+    fn new(x: T) -> Foo<T> {
+      // ...
+    }
     ```
     """
+    attrs: drop
+    type_repr: drop
 
 
 @annotate(ParamList)
@@ -1337,10 +1410,10 @@ class _:
     """
 
 
-@annotate(ParenType)
+@annotate(ParenTypeRepr)
 class _:
     """
-    A ParenType. For example:
+    A ParenTypeRepr. For example:
     ```rust
     todo!()
     ```
@@ -1348,29 +1421,29 @@ class _:
 
 
 @annotate(PathSegment)
+@qltest.test_with(Path)
 class _:
     """
-    A PathSegment. For example:
+    A path segment, which is one part of a whole path.
+    """
+
+
+@annotate(PathTypeRepr)
+@qltest.test_with(Path)
+class _:
+    """
+    A type referring to a path. For example:
     ```rust
-    todo!()
+    type X = std::collections::HashMap<i32, i32>;
+    type Y = X::Item;
     ```
     """
 
 
-@annotate(PathType)
+@annotate(PtrTypeRepr)
 class _:
     """
-    A PathType. For example:
-    ```rust
-    todo!()
-    ```
-    """
-
-
-@annotate(PtrType)
-class _:
-    """
-    A PtrType. For example:
+    A PtrTypeRepr. For example:
     ```rust
     todo!()
     ```
@@ -1417,10 +1490,10 @@ class _:
     """
 
 
-@annotate(RefType)
+@annotate(RefTypeRepr)
 class _:
     """
-    A RefType. For example:
+    A RefTypeRepr. For example:
     ```rust
     todo!()
     ```
@@ -1437,7 +1510,7 @@ class _:
     """
 
 
-@annotate(RestPat)
+@annotate(RestPat, cfg = True)
 class _:
     """
     A RestPat. For example:
@@ -1447,10 +1520,10 @@ class _:
     """
 
 
-@annotate(RetType)
+@annotate(RetTypeRepr)
 class _:
     """
-    A RetType. For example:
+    A RetTypeRepr. For example:
     ```rust
     todo!()
     ```
@@ -1467,20 +1540,24 @@ class _:
     """
 
 
-@annotate(SelfParam)
+@annotate(SelfParam, replace_bases={AstNode: ParamBase}, cfg = True)
 class _:
     """
-    A SelfParam. For example:
+    A `self` parameter. For example `self` in:
     ```rust
-    todo!()
+    fn push(&mut self, value: T) {
+      // ...
+    }
     ```
     """
+    attrs: drop
+    type_repr: drop
 
 
-@annotate(SliceType)
+@annotate(SliceTypeRepr)
 class _:
     """
-    A SliceType. For example:
+    A SliceTypeRepr. For example:
     ```rust
     todo!()
     ```
@@ -1564,7 +1641,7 @@ class _:
     """
 
 
-@annotate(TryExpr)
+@annotate(TryExpr, cfg = True)
 class _:
     """
     A TryExpr. For example:
@@ -1594,10 +1671,10 @@ class _:
     """
 
 
-@annotate(TupleType)
+@annotate(TupleTypeRepr)
 class _:
     """
-    A TupleType. For example:
+    A TupleTypeRepr. For example:
     ```rust
     todo!()
     ```
@@ -1694,7 +1771,7 @@ class _:
     """
 
 
-@annotate(Variant)
+@annotate(Variant, replace_bases={AstNode: Addressable})
 class _:
     """
     A Variant. For example:
@@ -1744,7 +1821,7 @@ class _:
     """
 
 
-@annotate(WhileExpr)
+@annotate(WhileExpr, replace_bases={Expr: LoopingExpr}, cfg = True)
 class _:
     """
     A WhileExpr. For example:
@@ -1752,6 +1829,8 @@ class _:
     todo!()
     ```
     """
+    label: drop
+    loop_body: drop
 
 
 @annotate(Function, add_bases=[Callable])
@@ -1766,14 +1845,15 @@ class _:
     attrs: drop
 
 
-@qltest.skip
 @synth.on_arguments(parent="FormatArgsExpr", index=int, kind=int)
+@qltest.test_with(FormatArgsExpr)
 class FormatTemplateVariableAccess(PathExprBase):
     pass
 
 
-@qltest.skip
 @synth.on_arguments(parent=FormatArgsExpr, index=int, text=string, offset=int)
+@qltest.test_with(FormatArgsExpr)
+
 class Format(Locatable):
     """
     A format element in a formatting template. For example the `{}` in:
@@ -1783,10 +1863,11 @@ class Format(Locatable):
     """
     parent: FormatArgsExpr
     index: int
+    argument: optional["FormatArgument"] | child
 
 
-@qltest.skip
 @synth.on_arguments(parent=FormatArgsExpr, index=int, kind=int, name=string, positional=boolean, offset=int)
+@qltest.test_with(FormatArgsExpr)
 class FormatArgument(Locatable):
     """
     An argument in a format element in a formatting template. For example the `width`, `precision`, and `value` in:
@@ -1799,12 +1880,8 @@ class FormatArgument(Locatable):
     ```
     """
     parent: Format
+    variable: optional[FormatTemplateVariableAccess] | child
 
-@annotate(Item)
+@annotate(Item, add_bases=(Addressable,))
 class _:
-    extended_canonical_path: optional[string] | desc("""
-        Either a canonical path (see https://doc.rust-lang.org/reference/paths.html#canonical-paths),
-        or `{<block id>}::name` for addressable items defined in an anonymous block (and only
-        addressable there-in).
-    """) | rust.detach | ql.internal
-    crate_origin: optional[string] | desc("One of `rustc:<name>`, `repo:<repository>:<name>` or `lang:<name>`.") | rust.detach | ql.internal
+    pass
diff --git a/rust/schema/ast.py b/rust/schema/ast.py
index bdbb1990d30..77d52977b4e 100644
--- a/rust/schema/ast.py
+++ b/rust/schema/ast.py
@@ -26,7 +26,7 @@ class Pat(AstNode):
 class Stmt(AstNode):
    pass
 
-class TypeRef(AstNode):
+class TypeRepr(AstNode):
    pass
 
 class Item(Stmt):
@@ -38,13 +38,14 @@ class Abi(AstNode):
 class ArgList(AstNode):
    args: list["Expr"] | child
 
-class ArrayExpr(Expr):
+class ArrayExprInternal(Expr):
    attrs: list["Attr"] | child
    exprs: list["Expr"] | child
+   is_semicolon: predicate
 
-class ArrayType(TypeRef):
+class ArrayTypeRepr(TypeRepr):
    const_arg: optional["ConstArg"] | child
-   ty: optional["TypeRef"] | child
+   element_type_repr: optional["TypeRepr"] | child
 
 class AsmExpr(Expr):
    attrs: list["Attr"] | child
@@ -59,9 +60,9 @@ class AssocTypeArg(GenericArg):
    generic_arg_list: optional["GenericArgList"] | child
    name_ref: optional["NameRef"] | child
    param_list: optional["ParamList"] | child
-   ret_type: optional["RetType"] | child
+   ret_type: optional["RetTypeRepr"] | child
    return_type_syntax: optional["ReturnTypeSyntax"] | child
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
    type_bound_list: optional["TypeBoundList"] | child
 
 class Attr(AstNode):
@@ -103,12 +104,12 @@ class BreakExpr(Expr):
 class CallExpr(Expr):
    arg_list: optional["ArgList"] | child
    attrs: list["Attr"] | child
-   expr: optional["Expr"] | child
+   function: optional["Expr"] | child
 
 class CastExpr(Expr):
    attrs: list["Attr"] | child
    expr: optional["Expr"] | child
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
 
 class ClosureBinder(AstNode):
    generic_param_list: optional["GenericParamList"] | child
@@ -123,7 +124,7 @@ class ClosureExpr(Expr):
    is_move: predicate
    is_static: predicate
    param_list: optional["ParamList"] | child
-   ret_type: optional["RetType"] | child
+   ret_type: optional["RetTypeRepr"] | child
 
 class Const(AssocItem,Item):
    attrs: list["Attr"] | child
@@ -131,7 +132,7 @@ class Const(AssocItem,Item):
    is_const: predicate
    is_default: predicate
    name: optional["Name"] | child
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
    visibility: optional["Visibility"] | child
 
 class ConstArg(GenericArg):
@@ -146,13 +147,13 @@ class ConstParam(GenericParam):
    default_val: optional["ConstArg"] | child
    is_const: predicate
    name: optional["Name"] | child
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
 
 class ContinueExpr(Expr):
    attrs: list["Attr"] | child
    lifetime: optional["Lifetime"] | child
 
-class DynTraitType(TypeRef):
+class DynTraitTypeRepr(TypeRepr):
    type_bound_list: optional["TypeBoundList"] | child
 
 class Enum(Item):
@@ -199,17 +200,17 @@ class Function(AssocItem,ExternItem,Item):
    is_unsafe: predicate
    name: optional["Name"] | child
    param_list: optional["ParamList"] | child
-   ret_type: optional["RetType"] | child
+   ret_type: optional["RetTypeRepr"] | child
    visibility: optional["Visibility"] | child
    where_clause: optional["WhereClause"] | child
 
-class FnPtrType(TypeRef):
+class FnPtrTypeRepr(TypeRepr):
    abi: optional["Abi"] | child
    is_async: predicate
    is_const: predicate
    is_unsafe: predicate
    param_list: optional["ParamList"] | child
-   ret_type: optional["RetType"] | child
+   ret_type: optional["RetTypeRepr"] | child
 
 class ForExpr(Expr):
    attrs: list["Attr"] | child
@@ -218,9 +219,9 @@ class ForExpr(Expr):
    loop_body: optional["BlockExpr"] | child
    pat: optional["Pat"] | child
 
-class ForType(TypeRef):
+class ForTypeRepr(TypeRepr):
    generic_param_list: optional["GenericParamList"] | child
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
 
 class FormatArgsArg(AstNode):
    expr: optional["Expr"] | child
@@ -257,12 +258,12 @@ class Impl(Item):
    is_const: predicate
    is_default: predicate
    is_unsafe: predicate
-   self_ty: optional["TypeRef"] | child
-   trait_: optional["TypeRef"] | child
+   self_ty: optional["TypeRepr"] | child
+   trait_: optional["TypeRepr"] | child
    visibility: optional["Visibility"] | child
    where_clause: optional["WhereClause"] | child
 
-class ImplTraitType(TypeRef):
+class ImplTraitTypeRepr(TypeRepr):
    type_bound_list: optional["TypeBoundList"] | child
 
 class IndexExpr(Expr):
@@ -270,7 +271,7 @@ class IndexExpr(Expr):
    base: optional["Expr"] | child
    index: optional["Expr"] | child
 
-class InferType(TypeRef):
+class InferTypeRepr(TypeRepr):
    pass
 
 class ItemList(AstNode):
@@ -285,7 +286,7 @@ class LetElse(AstNode):
 
 class LetExpr(Expr):
    attrs: list["Attr"] | child
-   expr: optional["Expr"] | child
+   scrutinee: optional["Expr"] | child
    pat: optional["Pat"] | child
 
 class LetStmt(Stmt):
@@ -293,7 +294,7 @@ class LetStmt(Stmt):
    initializer: optional["Expr"] | child
    let_else: optional["LetElse"] | child
    pat: optional["Pat"] | child
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
 
 class Lifetime(AstNode):
    text: optional[string]
@@ -349,7 +350,7 @@ class MacroStmts(AstNode):
    expr: optional["Expr"] | child
    statements: list["Stmt"] | child
 
-class MacroType(TypeRef):
+class MacroTypeRepr(TypeRepr):
    macro_call: optional["MacroCall"] | child
 
 class MatchArm(AstNode):
@@ -364,7 +365,7 @@ class MatchArmList(AstNode):
 
 class MatchExpr(Expr):
    attrs: list["Attr"] | child
-   expr: optional["Expr"] | child
+   scrutinee: optional["Expr"] | child
    match_arm_list: optional["MatchArmList"] | child
 
 class MatchGuard(AstNode):
@@ -395,13 +396,13 @@ class Name(AstNode):
 class NameRef(AstNode):
    text: optional[string]
 
-class NeverType(TypeRef):
+class NeverTypeRepr(TypeRepr):
    pass
 
 class OffsetOfExpr(Expr):
    attrs: list["Attr"] | child
    fields: list["NameRef"] | child
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
 
 class OrPat(Pat):
    pats: list["Pat"] | child
@@ -409,7 +410,7 @@ class OrPat(Pat):
 class Param(AstNode):
    attrs: list["Attr"] | child
    pat: optional["Pat"] | child
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
 
 class ParamList(AstNode):
    params: list["Param"] | child
@@ -422,8 +423,8 @@ class ParenExpr(Expr):
 class ParenPat(Pat):
    pat: optional["Pat"] | child
 
-class ParenType(TypeRef):
-   ty: optional["TypeRef"] | child
+class ParenTypeRepr(TypeRepr):
+   type_repr: optional["TypeRepr"] | child
 
 class Path(AstNode):
    qualifier: optional["Path"] | child
@@ -440,12 +441,12 @@ class PathSegment(AstNode):
    generic_arg_list: optional["GenericArgList"] | child
    name_ref: optional["NameRef"] | child
    param_list: optional["ParamList"] | child
-   path_type: optional["PathType"] | child
-   ret_type: optional["RetType"] | child
+   path_type: optional["PathTypeRepr"] | child
+   ret_type: optional["RetTypeRepr"] | child
    return_type_syntax: optional["ReturnTypeSyntax"] | child
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
 
-class PathType(TypeRef):
+class PathTypeRepr(TypeRepr):
    path: optional["Path"] | child
 
 class PrefixExpr(Expr):
@@ -453,10 +454,10 @@ class PrefixExpr(Expr):
    expr: optional["Expr"] | child
    operator_name: optional[string]
 
-class PtrType(TypeRef):
+class PtrTypeRepr(TypeRepr):
    is_const: predicate
    is_mut: predicate
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
 
 class RangeExpr(Expr):
    attrs: list["Attr"] | child
@@ -486,7 +487,7 @@ class RecordExprFieldList(AstNode):
 class RecordField(AstNode):
    attrs: list["Attr"] | child
    name: optional["Name"] | child
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
    visibility: optional["Visibility"] | child
 
 class RecordFieldList(FieldList):
@@ -516,10 +517,10 @@ class RefPat(Pat):
    is_mut: predicate
    pat: optional["Pat"] | child
 
-class RefType(TypeRef):
+class RefTypeRepr(TypeRepr):
    is_mut: predicate
    lifetime: optional["Lifetime"] | child
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
 
 class Rename(AstNode):
    name: optional["Name"] | child
@@ -527,8 +528,8 @@ class Rename(AstNode):
 class RestPat(Pat):
    attrs: list["Attr"] | child
 
-class RetType(AstNode):
-   ty: optional["TypeRef"] | child
+class RetTypeRepr(AstNode):
+   type_repr: optional["TypeRepr"] | child
 
 class ReturnExpr(Expr):
    attrs: list["Attr"] | child
@@ -542,13 +543,13 @@ class SelfParam(AstNode):
    is_mut: predicate
    lifetime: optional["Lifetime"] | child
    name: optional["Name"] | child
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
 
 class SlicePat(Pat):
    pats: list["Pat"] | child
 
-class SliceType(TypeRef):
-   ty: optional["TypeRef"] | child
+class SliceTypeRepr(TypeRepr):
+   type_repr: optional["TypeRepr"] | child
 
 class SourceFile(AstNode):
    attrs: list["Attr"] | child
@@ -560,7 +561,7 @@ class Static(ExternItem,Item):
    is_mut: predicate
    is_static: predicate
    name: optional["Name"] | child
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
    visibility: optional["Visibility"] | child
 
 class StmtList(AstNode):
@@ -608,7 +609,7 @@ class TupleExpr(Expr):
 
 class TupleField(AstNode):
    attrs: list["Attr"] | child
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
    visibility: optional["Visibility"] | child
 
 class TupleFieldList(FieldList):
@@ -621,35 +622,35 @@ class TupleStructPat(Pat):
    fields: list["Pat"] | child
    path: optional["Path"] | child
 
-class TupleType(TypeRef):
-   fields: list["TypeRef"] | child
+class TupleTypeRepr(TypeRepr):
+   fields: list["TypeRepr"] | child
 
 class TypeAlias(AssocItem,ExternItem,Item):
    attrs: list["Attr"] | child
    generic_param_list: optional["GenericParamList"] | child
    is_default: predicate
    name: optional["Name"] | child
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
    type_bound_list: optional["TypeBoundList"] | child
    visibility: optional["Visibility"] | child
    where_clause: optional["WhereClause"] | child
 
 class TypeArg(GenericArg):
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
 
 class TypeBound(AstNode):
    generic_param_list: optional["GenericParamList"] | child
    is_async: predicate
    is_const: predicate
    lifetime: optional["Lifetime"] | child
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
 
 class TypeBoundList(AstNode):
    bounds: list["TypeBound"] | child
 
 class TypeParam(GenericParam):
    attrs: list["Attr"] | child
-   default_type: optional["TypeRef"] | child
+   default_type: optional["TypeRepr"] | child
    name: optional["Name"] | child
    type_bound_list: optional["TypeBoundList"] | child
 
@@ -696,7 +697,7 @@ class WhereClause(AstNode):
 class WherePred(AstNode):
    generic_param_list: optional["GenericParamList"] | child
    lifetime: optional["Lifetime"] | child
-   ty: optional["TypeRef"] | child
+   type_repr: optional["TypeRepr"] | child
    type_bound_list: optional["TypeBoundList"] | child
 
 class WhileExpr(Expr):
diff --git a/rust/schema/prelude.py b/rust/schema/prelude.py
index 60de626e59c..5b050872609 100644
--- a/rust/schema/prelude.py
+++ b/rust/schema/prelude.py
@@ -3,6 +3,7 @@ from misc.codegen.lib.schemadefs import *
 include("../shared/tree-sitter-extractor/src/generator/prefix.dbscheme")
 include("prefix.dbscheme")
 
+File = imported("File", "codeql.files.FileSystem")
 
 @qltest.skip
 class Element:
@@ -73,9 +74,31 @@ class Callable(AstNode):
     attrs: list["Attr"] | child
 
 
+class Addressable(AstNode):
+    """
+    Something that can be addressed by a path.
+
+    TODO: This does not yet include all possible cases.
+    """
+    extended_canonical_path: optional[string] | desc("""
+        Either a canonical path (see https://doc.rust-lang.org/reference/paths.html#canonical-paths),
+        or `{<block id>}::name` for addressable items defined in an anonymous block (and only
+        addressable there-in).
+    """) | rust.detach | ql.internal
+    crate_origin: optional[string] | desc("One of `rustc:<name>`, `repo:<repository>:<name>` or `lang:<name>`.") | rust.detach | ql.internal
+
+
 class Resolvable(AstNode):
     """
     Either a `Path`, or a `MethodCallExpr`.
     """
     resolved_path: optional[string] | rust.detach | ql.internal
     resolved_crate_origin: optional[string] | rust.detach | ql.internal
+
+
+@qltest.skip
+@ql.internal
+class ExtractorStep(Element):
+    action: string
+    file: File
+    duration_ms: int
diff --git a/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll b/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
index d4c73c234be..96184a607f0 100644
--- a/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
+++ b/shared/dataflow/codeql/dataflow/internal/DataFlowImpl.qll
@@ -343,7 +343,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
     bindingset[n, cc]
     pragma[inline_late]
     private predicate isUnreachableInCall1(NodeEx n, LocalCallContextSpecificCall cc) {
-      cc.unreachable(n.asNode())
+      cc.unreachable(n)
     }
 
     /**
@@ -423,7 +423,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
 
     pragma[nomagic]
     private predicate readSetEx(NodeEx node1, ContentSet c, NodeEx node2) {
-      readSet(pragma[only_bind_into](node1.asNode()), c, pragma[only_bind_into](node2.asNode())) and
+      readEx(node1, c, node2) and
       stepFilter(node1, node2)
       or
       exists(Node n |
@@ -450,20 +450,19 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
     bindingset[c]
     private predicate expectsContentEx(NodeEx n, Content c) {
       exists(ContentSet cs |
-        expectsContentCached(n.asNode(), cs) and
+        expectsContentSet(n, cs) and
         pragma[only_bind_out](c) = pragma[only_bind_into](cs).getAReadContent()
       )
     }
 
     pragma[nomagic]
-    private predicate notExpectsContent(NodeEx n) { not expectsContentCached(n.asNode(), _) }
+    private predicate notExpectsContent(NodeEx n) { not expectsContentSet(n, _) }
 
     pragma[nomagic]
-    private predicate storeExUnrestricted(
+    private predicate storeUnrestricted(
       NodeEx node1, Content c, NodeEx node2, DataFlowType contentType, DataFlowType containerType
     ) {
-      store(pragma[only_bind_into](node1.asNode()), c, pragma[only_bind_into](node2.asNode()),
-        contentType, containerType) and
+      storeEx(node1, c, node2, contentType, containerType) and
       stepFilter(node1, node2)
     }
 
@@ -471,23 +470,13 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
     private predicate hasReadStep(Content c) { read(_, c, _) }
 
     pragma[nomagic]
-    private predicate storeEx(
+    private predicate store(
       NodeEx node1, Content c, NodeEx node2, DataFlowType contentType, DataFlowType containerType
     ) {
-      storeExUnrestricted(node1, c, node2, contentType, containerType) and
+      storeUnrestricted(node1, c, node2, contentType, containerType) and
       hasReadStep(c)
     }
 
-    pragma[nomagic]
-    private predicate viableReturnPosOutEx(DataFlowCall call, ReturnPosition pos, NodeEx out) {
-      viableReturnPosOut(call, pos, out.asNode())
-    }
-
-    pragma[nomagic]
-    private predicate viableParamArgEx(DataFlowCall call, ParamNodeEx p, ArgNodeEx arg) {
-      viableParamArg(call, p.asNode(), arg.asNode())
-    }
-
     /**
      * Holds if field flow should be used for the given configuration.
      */
@@ -520,7 +509,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
       exists(ParameterPosition pos | p.isParameterOf(_, pos) |
         not kind.(ParamUpdateReturnKind).getPosition() = pos
         or
-        allowParameterReturnInSelfCached(p.asNode())
+        allowParameterReturnInSelfEx(p)
       )
     }
 
@@ -558,7 +547,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
         exists(NodeEx mid |
           useFieldFlow() and
           fwdFlow(mid, cc) and
-          storeEx(mid, _, node, _, _)
+          store(mid, _, node, _, _)
         )
         or
         // read
@@ -653,7 +642,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
           not fullBarrier(node) and
           useFieldFlow() and
           fwdFlow(mid, _) and
-          storeEx(mid, c, node, _, _)
+          store(mid, c, node, _, _)
         )
       }
 
@@ -796,7 +785,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
         exists(NodeEx mid |
           revFlow(mid, toReturn) and
           fwdFlowConsCand(c) and
-          storeEx(node, c, mid, _, _)
+          store(node, c, mid, _, _)
         )
       }
 
@@ -893,7 +882,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
       ) {
         revFlowIsReadAndStored(c) and
         revFlow(node2) and
-        storeEx(node1, c, node2, contentType, containerType) and
+        store(node1, c, node2, contentType, containerType) and
         exists(ap1)
       }
 
@@ -1152,7 +1141,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
         flowOutOfCallNodeCand1(call, ret, _, out) and
         c = ret.getEnclosingCallable()
       |
-        scope = getSecondLevelScopeCached(ret.asNode())
+        scope = getSecondLevelScopeEx(ret)
         or
         ret = TParamReturnNode(_, scope)
       )
@@ -1496,7 +1485,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
           PrevStage::revFlow(node, state, apa) and
           filter(node, state, t0, ap, t) and
           (
-            if castingNodeEx(node)
+            if node instanceof CastingNodeEx
             then
               ap instanceof ApNil or
               compatibleContainer(getHeadContent(ap), node.getDataFlowType()) or
@@ -2627,10 +2616,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
             FlowCheckNode() {
               revFlow(this, _, _) and
               (
-                castNode(this.asNode()) or
-                clearsContentCached(this.asNode(), _) or
-                expectsContentCached(this.asNode(), _) or
-                neverSkipInPathGraph(this.asNode()) or
+                flowCheckNode(this) or
                 Config::neverSkip(this.asNode())
               )
             }
@@ -2665,7 +2651,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
               or
               node instanceof ParamNodeEx
               or
-              node.asNode() instanceof OutNodeExt
+              node instanceof OutNodeEx
               or
               storeStepCand(_, _, _, node, _, _)
               or
@@ -2899,15 +2885,9 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
 
             predicate isHidden() {
               not Config::includeHiddenNodes() and
-              (
-                hiddenNode(this.getNodeEx().asNode()) and
-                not this.isSource() and
-                not this instanceof PathNodeSink
-                or
-                this.getNodeEx() instanceof TNodeImplicitRead
-                or
-                hiddenNode(this.getNodeEx().asParamReturnNode())
-              )
+              hiddenNode(this.getNodeEx()) and
+              not this.isSource() and
+              not this instanceof PathNodeSink
             }
 
             /** Gets a textual representation of this element. */
@@ -3770,11 +3750,6 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
 
     private module Stage2 = MkStage<Stage1>::Stage<Stage2Param>;
 
-    pragma[nomagic]
-    private predicate castingNodeEx(NodeEx node) {
-      node.asNode() instanceof CastingNode or exists(node.asParamReturnNode())
-    }
-
     private module Stage3Param implements MkStage<Stage2>::StageParam {
       private module PrevStage = Stage2;
 
@@ -3888,7 +3863,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
 
     bindingset[node, t0]
     private predicate strengthenType(NodeEx node, DataFlowType t0, DataFlowType t) {
-      if castingNodeEx(node)
+      if node instanceof CastingNodeEx
       then
         exists(DataFlowType nt | nt = node.getDataFlowType() |
           if typeStrongerThanFilter(nt, t0)
@@ -3945,7 +3920,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
       pragma[nomagic]
       private predicate clearSet(NodeEx node, ContentSet c) {
         PrevStage::revFlow(node) and
-        clearsContentCached(node.asNode(), c)
+        clearsContentSet(node, c)
       }
 
       pragma[nomagic]
@@ -5024,7 +4999,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
       bindingset[c]
       private predicate clearsContentEx(NodeEx n, Content c) {
         exists(ContentSet cs |
-          clearsContentCached(n.asNode(), cs) and
+          clearsContentSet(n, cs) and
           pragma[only_bind_out](c) = pragma[only_bind_into](cs).getAReadContent()
         )
       }
@@ -5377,7 +5352,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
           midNode = mid.getNodeEx() and
           t1 = mid.getType() and
           ap1 = mid.getAp() and
-          storeExUnrestricted(midNode, c, node, contentType, t2) and
+          storeUnrestricted(midNode, c, node, contentType, t2) and
           ap2.getHead() = c and
           ap2.len() = unbindInt(ap1.len() + 1) and
           compatibleTypesFilter(t1, contentType)
@@ -5442,9 +5417,8 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
         PartialAccessPath ap
       ) {
         exists(ReturnKindExt kind, DataFlowCall call |
-          partialPathOutOfCallable1(mid, call, kind, state, cc, t, ap)
-        |
-          out.asNode() = kind.getAnOutNode(call)
+          partialPathOutOfCallable1(mid, call, kind, state, cc, t, ap) and
+          out = kind.getAnOutNodeEx(call)
         )
       }
 
@@ -5529,7 +5503,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
       ) {
         exists(DataFlowCall call, ReturnKindExt kind |
           partialPathThroughCallable0(call, mid, kind, state, cc, t, ap) and
-          out.asNode() = kind.getAnOutNode(call)
+          out = kind.getAnOutNodeEx(call)
         )
       }
 
@@ -5549,7 +5523,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
           not outBarrier(node, state) and
           // if a node is not the target of a store, we can check `clearsContent` immediately
           (
-            storeExUnrestricted(_, _, node, _, _)
+            storeUnrestricted(_, _, node, _, _)
             or
             not clearsContentEx(node, ap.getHead())
           )
@@ -5690,7 +5664,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
         exists(NodeEx midNode |
           midNode = mid.getNodeEx() and
           ap = mid.getAp() and
-          storeExUnrestricted(node, c, midNode, _, _) and
+          storeUnrestricted(node, c, midNode, _, _) and
           ap.getHead() = c
         )
       }
@@ -5745,7 +5719,7 @@ module MakeImpl<LocationSig Location, InputSig<Location> Lang> {
       ) {
         exists(DataFlowCall call, ArgumentPosition pos |
           revPartialPathThroughCallable0(call, mid, pos, state, ap) and
-          node.asNode().(ArgNode).argumentOf(call, pos)
+          node.argumentOf(call, pos)
         )
       }
 
diff --git a/shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll b/shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll
index 81f9946126d..75d68cf247c 100644
--- a/shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll
+++ b/shared/dataflow/codeql/dataflow/internal/DataFlowImplCommon.qll
@@ -286,7 +286,7 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
     ) {
       revLambdaFlow0(lambdaCall, kind, node, t, toReturn, toJump, lastCall) and
       not expectsContent(node, _) and
-      if castNode(node) or node instanceof ArgNode or node instanceof ReturnNode
+      if node instanceof CastNode or node instanceof ArgNode or node instanceof ReturnNode
       then compatibleTypesFilter(t, getNodeDataFlowType(node))
       else any()
     }
@@ -372,7 +372,7 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
     ) {
       revLambdaFlow(lambdaCall, kind, out, t, _, toJump, lastCall) and
       exists(ReturnKindExt rk |
-        out = rk.getAnOutNode(call) and
+        out = getAnOutNodeExt(call, rk) and
         lambdaCall(call, _, _)
       )
     }
@@ -678,6 +678,8 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
 
       class CcNoCall = CallContextNoCall;
 
+      class CcReturn = CallContextReturn;
+
       Cc ccNone() { result instanceof CallContextAny }
 
       CcCall ccSomeCall() { result instanceof CallContextSomeCall }
@@ -899,20 +901,36 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
     Location getLocation() { result = this.projectToNode().getLocation() }
   }
 
-  final class ArgNodeEx extends NodeEx {
-    ArgNodeEx() { this.asNode() instanceof ArgNode }
+  /**
+   * A `Node` at which a cast can occur such that the type should be checked.
+   */
+  final class CastingNodeEx extends NodeEx {
+    CastingNodeEx() { castingNodeEx(this) }
+  }
 
-    DataFlowCall getCall() { this.asNode().(ArgNode).argumentOf(result, _) }
+  final class ArgNodeEx extends NodeEx {
+    private DataFlowCall call_;
+    private ArgumentPosition pos_;
+
+    ArgNodeEx() { this.asNode().(ArgNode).argumentOf(call_, pos_) }
+
+    predicate argumentOf(DataFlowCall call, ArgumentPosition pos) {
+      call = call_ and
+      pos = pos_
+    }
+
+    DataFlowCall getCall() { result = call_ }
   }
 
   final class ParamNodeEx extends NodeEx {
-    ParamNodeEx() { this.asNode() instanceof ParamNode }
+    private DataFlowCallable c_;
+    private ParameterPosition pos_;
 
-    predicate isParameterOf(DataFlowCallable c, ParameterPosition pos) {
-      this.asNode().(ParamNode).isParameterOf(c, pos)
-    }
+    ParamNodeEx() { this.asNode().(ParamNode).isParameterOf(c_, pos_) }
 
-    ParameterPosition getPosition() { this.isParameterOf(_, result) }
+    predicate isParameterOf(DataFlowCallable c, ParameterPosition pos) { c = c_ and pos = pos_ }
+
+    ParameterPosition getPosition() { result = pos_ }
   }
 
   /**
@@ -929,6 +947,18 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
     ReturnKindExt getKind() { result = pos.getKind() }
   }
 
+  final class OutNodeEx extends NodeEx {
+    OutNodeEx() { this.asNode() instanceof OutNodeExt }
+  }
+
+  pragma[nomagic]
+  private SndLevelScopeOption getSecondLevelScope0(Node n) {
+    result = SndLevelScopeOption::some(getSecondLevelScope(n))
+    or
+    result instanceof SndLevelScopeOption::None and
+    not exists(getSecondLevelScope(n))
+  }
+
   cached
   private module Cached {
     /**
@@ -940,11 +970,8 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
     predicate forceCachingInSameStage() { any() }
 
     cached
-    SndLevelScopeOption getSecondLevelScopeCached(Node n) {
-      result = SndLevelScopeOption::some(getSecondLevelScope(n))
-      or
-      result instanceof SndLevelScopeOption::None and
-      not exists(getSecondLevelScope(n))
+    SndLevelScopeOption getSecondLevelScopeEx(NodeEx n) {
+      result = getSecondLevelScope0(n.asNode())
     }
 
     cached
@@ -976,11 +1003,14 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
     predicate jumpStepCached(Node node1, Node node2) { jumpStep(node1, node2) }
 
     cached
-    predicate clearsContentCached(Node n, ContentSet c) { clearsContent(n, c) }
+    predicate clearsContentSet(NodeEx n, ContentSet c) { clearsContent(n.asNode(), c) }
 
     cached
     predicate expectsContentCached(Node n, ContentSet c) { expectsContent(n, c) }
 
+    cached
+    predicate expectsContentSet(NodeEx n, ContentSet c) { expectsContent(n.asNode(), c) }
+
     cached
     predicate isUnreachableInCallCached(NodeRegion nr, DataFlowCall call) {
       isUnreachableInCall(nr, call)
@@ -994,16 +1024,15 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
     }
 
     cached
-    predicate hiddenNode(Node n) { nodeIsHidden(n) }
+    predicate hiddenNode(NodeEx n) {
+      nodeIsHidden([n.asNode(), n.asParamReturnNode()])
+      or
+      n instanceof TNodeImplicitRead
+    }
 
     cached
-    OutNodeExt getAnOutNodeExt(DataFlowCall call, ReturnKindExt k) {
-      result = getAnOutNode(call, k.(ValueReturnKind).getKind())
-      or
-      exists(ArgNode arg |
-        result.(PostUpdateNode).getPreUpdateNode() = arg and
-        arg.argumentOf(call, k.(ParamUpdateReturnKind).getAMatchingArgumentPosition())
-      )
+    OutNodeEx getAnOutNodeEx(DataFlowCall call, ReturnKindExt k) {
+      result.asNode() = getAnOutNodeExt(call, k)
     }
 
     pragma[nomagic]
@@ -1014,22 +1043,22 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
         parameterValueFlowsToPreUpdate(p, n) and
         p.isParameterOf(_, pos) and
         k = TParamUpdate(pos) and
-        scope = getSecondLevelScopeCached(n)
+        scope = getSecondLevelScope0(n)
       )
     }
 
     cached
-    predicate castNode(Node n) { n instanceof CastNode }
+    predicate flowCheckNode(NodeEx n) {
+      n.asNode() instanceof CastNode or
+      clearsContentSet(n, _) or
+      expectsContentSet(n, _) or
+      neverSkipInPathGraph(n.asNode())
+    }
 
     cached
-    predicate castingNode(Node n) {
-      castNode(n) or
-      n instanceof ParamNode or
-      n instanceof OutNodeExt or
-      // For reads, `x.f`, we want to check that the tracked type after the read (which
-      // is obtained by popping the head of the access path stack) is compatible with
-      // the type of `x.f`.
-      readSet(_, _, n)
+    predicate castingNodeEx(NodeEx n) {
+      n.asNode() instanceof CastingNode or
+      exists(n.asParamReturnNode())
     }
 
     cached
@@ -1206,6 +1235,15 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
       )
     }
 
+    /**
+     * Holds if `arg` is a possible argument to `p` in `call`, taking virtual
+     * dispatch into account.
+     */
+    cached
+    predicate viableParamArgEx(DataFlowCall call, ParamNodeEx p, ArgNodeEx arg) {
+      viableParamArg(call, p.asNode(), arg.asNode())
+    }
+
     pragma[nomagic]
     private ReturnPosition viableReturnPos(DataFlowCall call, ReturnKindExt kind) {
       viableCallableExt(call) = result.getCallable() and
@@ -1217,13 +1255,22 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
      * taking virtual dispatch into account.
      */
     cached
-    predicate viableReturnPosOut(DataFlowCall call, ReturnPosition pos, Node out) {
+    predicate viableReturnPosOut(DataFlowCall call, ReturnPosition pos, OutNodeExt out) {
       exists(ReturnKindExt kind |
         pos = viableReturnPos(call, kind) and
-        out = kind.getAnOutNode(call)
+        out = getAnOutNodeExt(call, kind)
       )
     }
 
+    /**
+     * Holds if a value at return position `pos` can be returned to `out` via `call`,
+     * taking virtual dispatch into account.
+     */
+    cached
+    predicate viableReturnPosOutEx(DataFlowCall call, ReturnPosition pos, OutNodeEx out) {
+      viableReturnPosOut(call, pos, out.asNode())
+    }
+
     /** Provides predicates for calculating flow-through summaries. */
     private module FlowThrough {
       /**
@@ -1338,6 +1385,7 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
        *   or summarized as a single read step with before and after types recorded
        *   in the `ReadStepTypesOption` parameter.
        * - Types are checked using the `compatibleTypes()` relation.
+       * - Call contexts are taken into account.
        */
       private module Final {
         /**
@@ -1348,8 +1396,12 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
          * If a read step was taken, then `read` captures the `Content`, the
          * container type, and the content type.
          */
-        predicate parameterValueFlow(ParamNode p, Node node, ReadStepTypesOption read, string model) {
-          parameterValueFlow0(p, node, read, model) and
+        predicate parameterValueFlow(
+          ParamNode p, Node node, ReadStepTypesOption read, string model,
+          CachedCallContextSensitivity::CcNoCall ctx
+        ) {
+          parameterValueFlow0(p, node, read, model, ctx) and
+          Cand::cand(p, node) and
           if node instanceof CastingNode
           then
             // normal flow through
@@ -1369,16 +1421,18 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
 
         pragma[nomagic]
         private predicate parameterValueFlow0(
-          ParamNode p, Node node, ReadStepTypesOption read, string model
+          ParamNode p, Node node, ReadStepTypesOption read, string model,
+          CachedCallContextSensitivity::CcNoCall ctx
         ) {
           p = node and
           Cand::cand(p, _) and
           read = TReadStepTypesNone() and
-          model = ""
+          model = "" and
+          CachedCallContextSensitivity::viableImplNotCallContextReducedReverse(ctx)
           or
           // local flow
           exists(Node mid, string model1, string model2 |
-            parameterValueFlow(p, mid, read, model1) and
+            parameterValueFlow(p, mid, read, model1, ctx) and
             simpleLocalFlowStep(mid, node, model2) and
             validParameterAliasStep(mid, node) and
             model = mergeModels(model1, model2)
@@ -1386,50 +1440,106 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
           or
           // read
           exists(Node mid |
-            parameterValueFlow(p, mid, TReadStepTypesNone(), model) and
+            parameterValueFlow(p, mid, TReadStepTypesNone(), model, ctx) and
             readStepWithTypes(mid, read.getContainerType(), read.getContent(), node,
               read.getContentType()) and
             Cand::parameterValueFlowReturnCand(p, _, true) and
             compatibleTypesFilter(getNodeDataFlowType(p), read.getContainerType())
           )
           or
-          parameterValueFlow0_0(TReadStepTypesNone(), p, node, read, model)
+          parameterValueFlow0_0(TReadStepTypesNone(), p, node, read, model, ctx)
+        }
+
+        bindingset[ctx1, ctx2]
+        pragma[inline_late]
+        private CachedCallContextSensitivity::CcNoCall mergeContexts(
+          CachedCallContextSensitivity::CcNoCall ctx1, CachedCallContextSensitivity::CcNoCall ctx2
+        ) {
+          if CachedCallContextSensitivity::viableImplNotCallContextReducedReverse(ctx1)
+          then result = ctx2
+          else
+            if CachedCallContextSensitivity::viableImplNotCallContextReducedReverse(ctx2)
+            then result = ctx1
+            else
+              // check that `ctx1` is compatible with `ctx2` for at least _some_ outer call,
+              // and then (arbitrarily) continue with `ctx2`
+              exists(DataFlowCall someOuterCall, DataFlowCallable callable |
+                someOuterCall =
+                  CachedCallContextSensitivity::viableImplCallContextReducedReverse(callable, ctx1) and
+                someOuterCall =
+                  CachedCallContextSensitivity::viableImplCallContextReducedReverse(callable, ctx2) and
+                result = ctx2
+              )
         }
 
         pragma[nomagic]
         private predicate parameterValueFlow0_0(
           ReadStepTypesOption mustBeNone, ParamNode p, Node node, ReadStepTypesOption read,
-          string model
+          string model, CachedCallContextSensitivity::CcNoCall ctx
         ) {
-          // flow through: no prior read
-          exists(ArgNode arg, string model1, string model2 |
-            parameterValueFlowArg(p, arg, mustBeNone, model1) and
-            argumentValueFlowsThrough(arg, read, node, model2) and
-            model = mergeModels(model1, model2)
-          )
-          or
-          // flow through: no read inside method
-          exists(ArgNode arg, string model1, string model2 |
-            parameterValueFlowArg(p, arg, read, model1) and
-            argumentValueFlowsThrough(arg, mustBeNone, node, model2) and
-            model = mergeModels(model1, model2)
+          exists(
+            ArgNode arg, string model1, string model2, CachedCallContextSensitivity::CcNoCall ctx1,
+            CachedCallContextSensitivity::CcNoCall ctx2
+          |
+            model = mergeModels(model1, model2) and
+            ctx = mergeContexts(ctx1, ctx2)
+          |
+            // flow through: no prior read
+            parameterValueFlowArg(p, arg, mustBeNone, model1, ctx1) and
+            argumentValueFlowsThrough(arg, read, node, model2, ctx2)
+            or
+            // flow through: no read inside method
+            parameterValueFlowArg(p, arg, read, model1, ctx1) and
+            argumentValueFlowsThrough(arg, mustBeNone, node, model2, ctx2)
           )
         }
 
         pragma[nomagic]
         private predicate parameterValueFlowArg(
-          ParamNode p, ArgNode arg, ReadStepTypesOption read, string model
+          ParamNode p, ArgNode arg, ReadStepTypesOption read, string model,
+          CachedCallContextSensitivity::CcNoCall ctx
         ) {
-          parameterValueFlow(p, arg, read, model) and
+          parameterValueFlow(p, arg, read, model, ctx) and
           Cand::argumentValueFlowsThroughCand(arg, _, _)
         }
 
         pragma[nomagic]
         private predicate argumentValueFlowsThrough0(
-          DataFlowCall call, ArgNode arg, ReturnKind kind, ReadStepTypesOption read, string model
+          DataFlowCall call, ArgNode arg, ReturnKind kind, ReadStepTypesOption read, string model,
+          CachedCallContextSensitivity::CcNoCall outerCtx
         ) {
-          exists(ParamNode param | viableParamArg(call, param, arg) |
-            parameterValueFlowReturn(param, kind, read, model)
+          exists(
+            ParamNode param, DataFlowCallable callable,
+            CachedCallContextSensitivity::CcNoCall innerCtx
+          |
+            viableParamArg(call, param, arg) and
+            parameterValueFlowReturn(param, kind, read, model, innerCtx) and
+            callable = nodeGetEnclosingCallable(param) and
+            outerCtx = CachedCallContextSensitivity::getCallContextReturn(callable, call)
+          |
+            CachedCallContextSensitivity::viableImplNotCallContextReducedReverse(innerCtx)
+            or
+            call =
+              CachedCallContextSensitivity::viableImplCallContextReducedReverse(callable, innerCtx)
+          )
+        }
+
+        pragma[nomagic]
+        private predicate argumentValueFlowsThrough(
+          ArgNode arg, ReadStepTypesOption read, Node out, string model,
+          CachedCallContextSensitivity::CcNoCall ctx
+        ) {
+          exists(DataFlowCall call, ReturnKind kind |
+            argumentValueFlowsThrough0(call, arg, kind, read, model, ctx) and
+            out = getAnOutNode(call, kind)
+          |
+            // normal flow through
+            read = TReadStepTypesNone() and
+            compatibleTypesFilter(getNodeDataFlowType(arg), getNodeDataFlowType(out))
+            or
+            // getter
+            compatibleTypesFilter(getNodeDataFlowType(arg), read.getContainerType()) and
+            compatibleTypesFilter(read.getContentType(), getNodeDataFlowType(out))
           )
         }
 
@@ -1445,18 +1555,7 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
         predicate argumentValueFlowsThrough(
           ArgNode arg, ReadStepTypesOption read, Node out, string model
         ) {
-          exists(DataFlowCall call, ReturnKind kind |
-            argumentValueFlowsThrough0(call, arg, kind, read, model) and
-            out = getAnOutNode(call, kind)
-          |
-            // normal flow through
-            read = TReadStepTypesNone() and
-            compatibleTypesFilter(getNodeDataFlowType(arg), getNodeDataFlowType(out))
-            or
-            // getter
-            compatibleTypesFilter(getNodeDataFlowType(arg), read.getContainerType()) and
-            compatibleTypesFilter(read.getContentType(), getNodeDataFlowType(out))
-          )
+          argumentValueFlowsThrough(arg, read, out, model, _)
         }
 
         /**
@@ -1479,10 +1578,11 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
          * container type, and the content type.
          */
         private predicate parameterValueFlowReturn(
-          ParamNode p, ReturnKind kind, ReadStepTypesOption read, string model
+          ParamNode p, ReturnKind kind, ReadStepTypesOption read, string model,
+          CachedCallContextSensitivity::CcNoCall ctx
         ) {
           exists(ReturnNode ret |
-            parameterValueFlow(p, ret, read, model) and
+            parameterValueFlow(p, ret, read, model, ctx) and
             kind = ret.getKind()
           )
         }
@@ -1498,12 +1598,17 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
      * node `n`, in the same callable, using only value-preserving steps.
      */
     private predicate parameterValueFlowsToPreUpdate(ParamNode p, PostUpdateNode n) {
-      parameterValueFlow(p, n.getPreUpdateNode(), TReadStepTypesNone(), _)
+      parameterValueFlow(p, n.getPreUpdateNode(), TReadStepTypesNone(), _, _)
     }
 
     cached
     predicate readSet(Node node1, ContentSet c, Node node2) { readStep(node1, c, node2) }
 
+    cached
+    predicate readEx(NodeEx node1, ContentSet c, NodeEx node2) {
+      readSet(pragma[only_bind_into](node1.asNode()), c, pragma[only_bind_into](node2.asNode()))
+    }
+
     cached
     predicate storeSet(
       Node node1, ContentSet c, Node node2, DataFlowType contentType, DataFlowType containerType
@@ -1532,11 +1637,13 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
      * been stored into, in order to handle cases like `x.f1.f2 = y`.
      */
     cached
-    predicate store(
-      Node node1, Content c, Node node2, DataFlowType contentType, DataFlowType containerType
+    predicate storeEx(
+      NodeEx node1, Content c, NodeEx node2, DataFlowType contentType, DataFlowType containerType
     ) {
       exists(ContentSet cs |
-        c = cs.getAStoreContent() and storeSet(node1, cs, node2, contentType, containerType)
+        c = cs.getAStoreContent() and
+        storeSet(pragma[only_bind_into](node1.asNode()), cs, pragma[only_bind_into](node2.asNode()),
+          contentType, containerType)
       )
     }
 
@@ -1572,7 +1679,7 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
     }
 
     cached
-    predicate allowParameterReturnInSelfCached(ParamNode p) { allowParameterReturnInSelf(p) }
+    predicate allowParameterReturnInSelfEx(ParamNodeEx p) { allowParameterReturnInSelf(p.asNode()) }
 
     cached
     predicate paramMustFlow(ParamNode p, ArgNode arg) { localMustFlowStep+(p, arg) }
@@ -1602,7 +1709,9 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
       string toString() { result = "Unreachable" }
 
       cached
-      predicate contains(Node n) { exists(NodeRegion nr | super.contains(nr) and nr.contains(n)) }
+      predicate contains(NodeEx n) {
+        exists(NodeRegion nr | super.contains(nr) and nr.contains(n.asNode()))
+      }
 
       cached
       DataFlowCallable getEnclosingCallable() {
@@ -2154,7 +2263,15 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
    * A `Node` at which a cast can occur such that the type should be checked.
    */
   class CastingNode extends NodeFinal {
-    CastingNode() { castingNode(this) }
+    CastingNode() {
+      this instanceof CastNode or
+      this instanceof ParamNode or
+      this instanceof OutNodeExt or
+      // For reads, `x.f`, we want to check that the tracked type after the read (which
+      // is obtained by popping the head of the access path stack) is compatible with
+      // the type of `x.f`.
+      readSet(_, _, this)
+    }
   }
 
   private predicate readStepWithTypes(
@@ -2211,7 +2328,7 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
     }
 
     /** Holds if this call context makes `n` unreachable. */
-    predicate unreachable(Node n) { ns.contains(n) }
+    predicate unreachable(NodeEx n) { ns.contains(n) }
   }
 
   private DataFlowCallable getNodeRegionEnclosingCallable(NodeRegion nr) {
@@ -2252,6 +2369,16 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
     OutNodeExt() { outNodeExt(this) }
   }
 
+  pragma[nomagic]
+  OutNodeExt getAnOutNodeExt(DataFlowCall call, ReturnKindExt k) {
+    result = getAnOutNode(call, k.(ValueReturnKind).getKind())
+    or
+    exists(ArgNode arg |
+      result.(PostUpdateNode).getPreUpdateNode() = arg and
+      arg.argumentOf(call, k.(ParamUpdateReturnKind).getAMatchingArgumentPosition())
+    )
+  }
+
   /**
    * An extended return kind. A return kind describes how data can be returned
    * from a callable. This can either be through a returned value or an updated
@@ -2262,7 +2389,7 @@ module MakeImplCommon<LocationSig Location, InputSig<Location> Lang> {
     abstract string toString();
 
     /** Gets a node corresponding to data flow out of `call`. */
-    final OutNodeExt getAnOutNode(DataFlowCall call) { result = getAnOutNodeExt(call, this) }
+    final OutNodeEx getAnOutNodeEx(DataFlowCall call) { result = getAnOutNodeEx(call, this) }
   }
 
   class ValueReturnKind extends ReturnKindExt, TValueReturn {
diff --git a/shared/dataflow/codeql/dataflow/internal/FlowSummaryImpl.qll b/shared/dataflow/codeql/dataflow/internal/FlowSummaryImpl.qll
index 4f6a88b6b28..e1770ca482a 100644
--- a/shared/dataflow/codeql/dataflow/internal/FlowSummaryImpl.qll
+++ b/shared/dataflow/codeql/dataflow/internal/FlowSummaryImpl.qll
@@ -1207,6 +1207,11 @@ module Make<
         )
       }
 
+      /** Holds if the value of `succ` is uniquely determined by the value of `pred`. */
+      predicate summaryLocalMustFlowStep(SummaryNode pred, SummaryNode succ) {
+        pred = unique(SummaryNode n1 | summaryLocalStep(n1, succ, true, _))
+      }
+
       /**
        * Holds if there is a read step of content `c` from `pred` to `succ`, which
        * is synthesized from a flow summary.
@@ -1355,7 +1360,7 @@ module Make<
         exists(DataFlowCall call, ReturnKindExt rk |
           result = summaryArgParam(call, arg, sc) and
           summaryReturnNodeExt(ret, pragma[only_bind_into](rk)) and
-          out = pragma[only_bind_into](rk).getAnOutNode(call)
+          out = getAnOutNodeExt(call, pragma[only_bind_into](rk))
         )
       }
 
diff --git a/shared/mad/codeql/mad/modelgenerator/internal/ModelGeneratorImpl.qll b/shared/mad/codeql/mad/modelgenerator/internal/ModelGeneratorImpl.qll
index 2e22ae2c2ba..5b53943ff83 100644
--- a/shared/mad/codeql/mad/modelgenerator/internal/ModelGeneratorImpl.qll
+++ b/shared/mad/codeql/mad/modelgenerator/internal/ModelGeneratorImpl.qll
@@ -464,8 +464,10 @@ module MakeModelGenerator<
     predicate isAdditionalFlowStep(
       DataFlow::Node node1, FlowState state1, DataFlow::Node node2, FlowState state2
     ) {
-      exists(DataFlow::ContentSet c |
-        DataFlow::store(node1, c.getAStoreContent(), node2, _, _) and
+      exists(DataFlow::NodeEx n1, DataFlow::NodeEx n2, DataFlow::ContentSet c |
+        node1 = n1.asNode() and
+        node2 = n2.asNode() and
+        DataFlow::storeEx(n1, c.getAStoreContent(), n2, _, _) and
         isRelevantContent0(c) and
         (
           state1 instanceof TaintRead and state2.(TaintStore).getStep() = 1
diff --git a/shared/util/change-notes/2024-12-03-remove-deprected-inline-expecation-test-classes.md b/shared/util/change-notes/2024-12-03-remove-deprected-inline-expecation-test-classes.md
new file mode 100644
index 00000000000..6126e37b619
--- /dev/null
+++ b/shared/util/change-notes/2024-12-03-remove-deprected-inline-expecation-test-classes.md
@@ -0,0 +1,4 @@
+---
+category: breaking
+---
+* Deleted the old deprecated inline expectation test API that was based on the `InlineExpectationsTest` class.
diff --git a/shared/util/codeql/util/AlertFiltering.qll b/shared/util/codeql/util/AlertFiltering.qll
index d1778304b73..6ca62e50af2 100644
--- a/shared/util/codeql/util/AlertFiltering.qll
+++ b/shared/util/codeql/util/AlertFiltering.qll
@@ -17,6 +17,9 @@ private import codeql.util.Location
  * - endLine: End line number (starting with 1, inclusive) to restrict alerts to.
  *
  * If startLine and endLine are both 0, accept alerts anywhere in the file.
+ *
+ * A query should either completely ignore this predicate (i.e., perform no filtering whatsoever),
+ * or only return alerts that meet the filtering criteria as specified above.
  */
 extensible predicate restrictAlertsTo(string filePath, int startLine, int endLine);
 
diff --git a/shared/util/codeql/util/DenseRank.qll b/shared/util/codeql/util/DenseRank.qll
index d1ba4ae4b62..0dccbbd4880 100644
--- a/shared/util/codeql/util/DenseRank.qll
+++ b/shared/util/codeql/util/DenseRank.qll
@@ -58,12 +58,12 @@ module DenseRank<DenseRankInputSig Input> {
     rnk = rank[result](int rnk0 | rnk0 = getRank(_) | rnk0)
   }
 
-  /** Gets the dense rank of `r`. */
-  int denseRank(Ranked r) { result = rankRank(r, getRank(r)) }
+  /** Gets the `Ranked` value for which the dense rank is `rnk`. */
+  Ranked denseRank(int rnk) { rnk = rankRank(result, getRank(result)) }
 }
 
-/** Provides the input to `DenseRank2`. */
-signature module DenseRankInputSig2 {
+/** Provides the input to `DenseRank1`. */
+signature module DenseRankInputSig1 {
   /** A ranking context. */
   bindingset[this]
   class C;
@@ -77,7 +77,7 @@ signature module DenseRankInputSig2 {
 }
 
 /** Same as `DenseRank`, but allows for a context consisting of one element. */
-module DenseRank2<DenseRankInputSig2 Input> {
+module DenseRank1<DenseRankInputSig1 Input> {
   private import Input
 
   private int rankRank(C c, Ranked r, int rnk) {
@@ -85,17 +85,15 @@ module DenseRank2<DenseRankInputSig2 Input> {
     rnk = rank[result](int rnk0 | rnk0 = getRank(c, _) | rnk0)
   }
 
-  /** Gets the dense rank of `r` in the context provided by `c`. */
-  int denseRank(C c, Ranked r) {
-    exists(int rnk |
-      result = rankRank(c, r, rnk) and
-      rnk = getRank(c, r)
-    )
-  }
+  /**
+   * Gets the `Ranked` value for which the dense rank in the context provided by
+   * `c` is `rnk`.
+   */
+  Ranked denseRank(C c, int rnk) { rnk = rankRank(c, result, getRank(c, result)) }
 }
 
-/** Provides the input to `DenseRank3`. */
-signature module DenseRankInputSig3 {
+/** Provides the input to `DenseRank2`. */
+signature module DenseRankInputSig2 {
   /** A ranking context. */
   bindingset[this]
   class C1;
@@ -113,7 +111,7 @@ signature module DenseRankInputSig3 {
 }
 
 /** Same as `DenseRank`, but allows for a context consisting of two elements. */
-module DenseRank3<DenseRankInputSig3 Input> {
+module DenseRank2<DenseRankInputSig2 Input> {
   private import Input
 
   private int rankRank(C1 c1, C2 c2, Ranked r, int rnk) {
@@ -121,11 +119,11 @@ module DenseRank3<DenseRankInputSig3 Input> {
     rnk = rank[result](int rnk0 | rnk0 = getRank(c1, c2, _) | rnk0)
   }
 
-  /** Gets the dense rank of `r` in the context provided by `c1` and `c2`. */
-  int denseRank(C1 c1, C2 c2, Ranked r) {
-    exists(int rnk |
-      result = rankRank(c1, c2, r, rnk) and
-      rnk = getRank(c1, c2, r)
-    )
+  /**
+   * Gets the `Ranked` value for which the dense rank in the context provided by
+   * `c1` and `c2` is `rnk`.
+   */
+  Ranked denseRank(C1 c1, C2 c2, int rnk) {
+    rnk = rankRank(c1, c2, result, getRank(c1, c2, result))
   }
 }
diff --git a/shared/util/codeql/util/Option.qll b/shared/util/codeql/util/Option.qll
index 31df747afe8..8ba4d8e840b 100644
--- a/shared/util/codeql/util/Option.qll
+++ b/shared/util/codeql/util/Option.qll
@@ -2,6 +2,7 @@
 
 /** A type with `toString`. */
 private signature class TypeWithToString {
+  bindingset[this]
   string toString();
 }
 
diff --git a/shared/util/codeql/util/test/InlineExpectationsTest.qll b/shared/util/codeql/util/test/InlineExpectationsTest.qll
index bd51ad1c2bd..415450c1603 100644
--- a/shared/util/codeql/util/test/InlineExpectationsTest.qll
+++ b/shared/util/codeql/util/test/InlineExpectationsTest.qll
@@ -500,55 +500,6 @@ module Make<InlineExpectationsTestSig Impl> {
     }
   }
 
-  deprecated private module LegacyImpl implements TestSig {
-    string getARelevantTag() { result = any(InlineExpectationsTest t).getARelevantTag() }
-
-    predicate hasActualResult(Impl::Location location, string element, string tag, string value) {
-      any(InlineExpectationsTest t).hasActualResult(location, element, tag, value)
-    }
-
-    predicate hasOptionalResult(Impl::Location location, string element, string tag, string value) {
-      any(InlineExpectationsTest t).hasOptionalResult(location, element, tag, value)
-    }
-  }
-
-  /**
-   * DEPRECATED: Use the InlineExpectationsTest module.
-   *
-   * The base class for tests with inline expectations. The test extends this class to provide the actual
-   * results of the query, which are then compared with the expected results in comments to produce a
-   * list of failure messages that point out where the actual results differ from the expected
-   * results.
-   */
-  abstract deprecated class InlineExpectationsTest extends string {
-    bindingset[this]
-    InlineExpectationsTest() { any() }
-
-    abstract string getARelevantTag();
-
-    abstract predicate hasActualResult(
-      Impl::Location location, string element, string tag, string value
-    );
-
-    predicate hasOptionalResult(Impl::Location location, string element, string tag, string value) {
-      none()
-    }
-  }
-
-  deprecated import MakeTest<LegacyImpl> as LegacyTest
-
-  deprecated query predicate failures = LegacyTest::testFailures/2;
-
-  deprecated class ActualResult = LegacyTest::ActualTestResult;
-
-  deprecated class GoodExpectation = LegacyTest::GoodTestExpectation;
-
-  deprecated class FalsePositiveExpectation = LegacyTest::FalsePositiveTestExpectation;
-
-  deprecated class FalseNegativeExpectation = LegacyTest::FalseNegativeTestExpectation;
-
-  deprecated class InvalidExpectation = LegacyTest::InvalidTestExpectation;
-
   /**
    * Holds if the expectation `tag=value` is found in one or more expectation comments.
    *
diff --git a/swift/ql/.generated.list b/swift/ql/.generated.list
index da39f2f2fe7..60120579321 100644
--- a/swift/ql/.generated.list
+++ b/swift/ql/.generated.list
@@ -712,7 +712,7 @@ lib/codeql/swift/generated/OtherAvailabilitySpec.qll d9feaa2a71acff3184ca389045b
 lib/codeql/swift/generated/ParentChild.qll d1814f2bad4c2ba9242ce49fe6fb8564ac99fc1fd3a7d12aa55e5c6dd7bb529b 1a2075b731d07a5e3c6a69d001796c8de925069d839671a294c9cba6c3db724a
 lib/codeql/swift/generated/PlatformVersionAvailabilitySpec.qll dc17b49a90a18a8f7607adf2433bc8f0c194fa3e803aa3822f809d4d4fbd6793 be48ea9f8ae17354c8508aaed24337a9e57ce01f288fece3dcecd99776cabcec
 lib/codeql/swift/generated/PureSynthConstructors.qll bc31a6c4d142fa3fbdcae69d5ba6f1cec00eb9ad92b46c8d7b91ebfa7ef6c1f4 bc31a6c4d142fa3fbdcae69d5ba6f1cec00eb9ad92b46c8d7b91ebfa7ef6c1f4
-lib/codeql/swift/generated/Raw.qll 118b43fedd4265b5aa15c33ef01a2f5a5db6e5597f95bef1078a01c3ff8da983 075aec2c8b232f0361ebf63f07ae9b66163f3975e6023583fb0fa2e40b979a33
+lib/codeql/swift/generated/Raw.qll a47950495630c10c00afee734d779e5e3e7f8e3e65ae3f04b9a1254e3e73921e 075aec2c8b232f0361ebf63f07ae9b66163f3975e6023583fb0fa2e40b979a33
 lib/codeql/swift/generated/Synth.qll 31e318c6e156848c85a2a2664695b48b5e93c57c9bb22fa29d027069907b3ab0 8655ffcf772f55284b93f1d7f8e1b3d497a9744d5f2e0c17bc322c1fdf8bdba8
 lib/codeql/swift/generated/SynthConstructors.qll 3e53c7853096020219c01dae85681fe80b34938d198a0ff359a209dda41c5ed7 3e53c7853096020219c01dae85681fe80b34938d198a0ff359a209dda41c5ed7
 lib/codeql/swift/generated/UnknownFile.qll 247ddf2ebb49ce5ed4bf7bf91a969ddff37de6c78d43d8affccaf7eb586e06f2 452b29f0465ef45e978ef8b647b75e5a2a1e53f2a568fc003bc8f52f73b3fa4d
diff --git a/swift/ql/lib/change-notes/2024-12-03-remove-dataflow-config-class-api.md b/swift/ql/lib/change-notes/2024-12-03-remove-dataflow-config-class-api.md
new file mode 100644
index 00000000000..d09ec528c99
--- /dev/null
+++ b/swift/ql/lib/change-notes/2024-12-03-remove-dataflow-config-class-api.md
@@ -0,0 +1,4 @@
+---
+category: breaking
+---
+* Deleted the old deprecated data flow API that was based on extending a configuration class. See https://github.blog/changelog/2023-08-14-new-dataflow-api-for-writing-custom-codeql-queries for instructions on migrating your queries to use the new API.
diff --git a/swift/ql/lib/codeql/swift/dataflow/DataFlow.qll b/swift/ql/lib/codeql/swift/dataflow/DataFlow.qll
index 670a94babd9..fd99bfd1999 100644
--- a/swift/ql/lib/codeql/swift/dataflow/DataFlow.qll
+++ b/swift/ql/lib/codeql/swift/dataflow/DataFlow.qll
@@ -7,5 +7,5 @@ module DataFlow {
   private import codeql.dataflow.DataFlow
   private import codeql.swift.elements.Location
   import DataFlowMake<Location, SwiftDataFlow>
-  import internal.DataFlowImpl1
+  import Public
 }
diff --git a/swift/ql/lib/codeql/swift/dataflow/TaintTracking.qll b/swift/ql/lib/codeql/swift/dataflow/TaintTracking.qll
index e46cd18abb4..1998e25abd7 100644
--- a/swift/ql/lib/codeql/swift/dataflow/TaintTracking.qll
+++ b/swift/ql/lib/codeql/swift/dataflow/TaintTracking.qll
@@ -3,11 +3,10 @@
  * global (inter-procedural) taint-tracking analyses.
  */
 module TaintTracking {
-  import codeql.swift.dataflow.internal.tainttracking1.TaintTrackingParameter::Public
+  import codeql.swift.dataflow.internal.TaintTrackingPublic
   private import codeql.swift.dataflow.internal.DataFlowImplSpecific
   private import codeql.swift.dataflow.internal.TaintTrackingImplSpecific
   private import codeql.dataflow.TaintTracking
   private import codeql.swift.elements.Location
   import TaintFlowMake<Location, SwiftDataFlow, SwiftTaintTracking>
-  import codeql.swift.dataflow.internal.tainttracking1.TaintTrackingImpl
 }
diff --git a/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl1.qll b/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl1.qll
deleted file mode 100644
index 17def0c431d..00000000000
--- a/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowImpl1.qll
+++ /dev/null
@@ -1,361 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides a `Configuration` class backwards-compatible interface to the data
- * flow library.
- */
-
-private import DataFlowImplCommon
-private import DataFlowImplSpecific::Private
-import DataFlowImplSpecific::Public
-private import DataFlowImpl
-import DataFlowImplCommonPublic
-deprecated import FlowStateString
-private import codeql.util.Unit
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural data flow analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the global data flow library must define its own unique extension
- * of this abstract class. To create a configuration, extend this class with
- * a subclass whose characteristic predicate is a unique singleton string.
- * For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends DataFlow::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isBarrier`.
- *   // Optionally override `isAdditionalFlowStep`.
- * }
- * ```
- * Conceptually, this defines a graph where the nodes are `DataFlow::Node`s and
- * the edges are those data-flow steps that preserve the value of the node
- * along with any additional edges defined by `isAdditionalFlowStep`.
- * Specifying nodes in `isBarrier` will remove those nodes from the graph, and
- * specifying nodes in `isBarrierIn` and/or `isBarrierOut` will remove in-going
- * and/or out-going edges from those nodes, respectively.
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but two classes extending
- * `DataFlow::Configuration` should never depend on each other. One of them
- * should instead depend on a `DataFlow2::Configuration`, a
- * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`.
- */
-abstract deprecated class Configuration extends string {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant data flow source.
-   */
-  predicate isSource(Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant data flow source with the given initial
-   * `state`.
-   */
-  predicate isSource(Node source, FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink.
-   */
-  predicate isSink(Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant data flow sink accepting `state`.
-   */
-  predicate isSink(Node sink, FlowState state) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited. This completely removes
-   * `node` from the data flow graph.
-   */
-  predicate isBarrier(Node node) { none() }
-
-  /**
-   * Holds if data flow through `node` is prohibited when the flow state is
-   * `state`.
-   */
-  predicate isBarrier(Node node, FlowState state) { none() }
-
-  /** Holds if data flow into `node` is prohibited. */
-  predicate isBarrierIn(Node node) { none() }
-
-  /** Holds if data flow out of `node` is prohibited. */
-  predicate isBarrierOut(Node node) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   */
-  predicate isAdditionalFlowStep(Node node1, Node node2) { none() }
-
-  /**
-   * Holds if data may flow from `node1` to `node2` in addition to the normal data-flow steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalFlowStep(Node node1, FlowState state1, Node node2, FlowState state2) {
-    none()
-  }
-
-  /**
-   * Holds if an arbitrary number of implicit read steps of content `c` may be
-   * taken at `node`.
-   */
-  predicate allowImplicitRead(Node node, ContentSet c) { none() }
-
-  /**
-   * Gets the virtual dispatch branching limit when calculating field flow.
-   * This can be overridden to a smaller value to improve performance (a
-   * value of 0 disables field flow), or a larger value to get more results.
-   */
-  int fieldFlowBranchLimit() { result = 2 }
-
-  /**
-   * Gets a data flow configuration feature to add restrictions to the set of
-   * valid flow paths.
-   *
-   * - `FeatureHasSourceCallContext`:
-   *    Assume that sources have some existing call context to disallow
-   *    conflicting return-flow directly following the source.
-   * - `FeatureHasSinkCallContext`:
-   *    Assume that sinks have some existing call context to disallow
-   *    conflicting argument-to-parameter flow directly preceding the sink.
-   * - `FeatureEqualSourceSinkCallContext`:
-   *    Implies both of the above and additionally ensures that the entire flow
-   *    path preserves the call context.
-   *
-   * These features are generally not relevant for typical end-to-end data flow
-   * queries, but should only be used for constructing paths that need to
-   * somehow be pluggable in another path context.
-   */
-  FlowFeature getAFeature() { none() }
-
-  /** Holds if sources should be grouped in the result of `hasFlowPath`. */
-  predicate sourceGrouping(Node source, string sourceGroup) { none() }
-
-  /** Holds if sinks should be grouped in the result of `hasFlowPath`. */
-  predicate sinkGrouping(Node sink, string sinkGroup) { none() }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   */
-  predicate hasFlow(Node source, Node sink) { hasFlow(source, sink, this) }
-
-  /**
-   * Holds if data may flow from `source` to `sink` for this configuration.
-   *
-   * The corresponding paths are generated from the end-points and the graph
-   * included in the module `PathGraph`.
-   */
-  predicate hasFlowPath(PathNode source, PathNode sink) { hasFlowPath(source, sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowTo(Node sink) { hasFlowTo(sink, this) }
-
-  /**
-   * Holds if data may flow from some source to `sink` for this configuration.
-   */
-  predicate hasFlowToExpr(DataFlowExpr sink) { this.hasFlowTo(exprNode(sink)) }
-
-  /**
-   * Holds if hidden nodes should be included in the data flow graph.
-   *
-   * This feature should only be used for debugging or when the data flow graph
-   * is not visualized (for example in a `path-problem` query).
-   */
-  predicate includeHiddenNodes() { none() }
-}
-
-/**
- * This class exists to prevent mutual recursion between the user-overridden
- * member predicates of `Configuration` and the rest of the data-flow library.
- * Good performance cannot be guaranteed in the presence of such recursion, so
- * it should be replaced by using more than one copy of the data flow library.
- */
-abstract deprecated private class ConfigurationRecursionPrevention extends Configuration {
-  bindingset[this]
-  ConfigurationRecursionPrevention() { any() }
-
-  override predicate hasFlow(Node source, Node sink) {
-    strictcount(Node n | this.isSource(n)) < 0
-    or
-    strictcount(Node n | this.isSource(n, _)) < 0
-    or
-    strictcount(Node n | this.isSink(n)) < 0
-    or
-    strictcount(Node n | this.isSink(n, _)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, n2)) < 0
-    or
-    strictcount(Node n1, Node n2 | this.isAdditionalFlowStep(n1, _, n2, _)) < 0
-    or
-    super.hasFlow(source, sink)
-  }
-}
-
-deprecated private FlowState relevantState(Configuration config) {
-  config.isSource(_, result) or
-  config.isSink(_, result) or
-  config.isBarrier(_, result) or
-  config.isAdditionalFlowStep(_, result, _, _) or
-  config.isAdditionalFlowStep(_, _, _, result)
-}
-
-private newtype TConfigState =
-  deprecated TMkConfigState(Configuration config, FlowState state) {
-    state = relevantState(config) or state instanceof FlowStateEmpty
-  }
-
-deprecated private Configuration getConfig(TConfigState state) { state = TMkConfigState(result, _) }
-
-deprecated private FlowState getState(TConfigState state) { state = TMkConfigState(_, result) }
-
-deprecated private predicate singleConfiguration() { 1 = strictcount(Configuration c) }
-
-deprecated private module Config implements FullStateConfigSig {
-  class FlowState = TConfigState;
-
-  predicate isSource(Node source, FlowState state) {
-    getConfig(state).isSource(source, getState(state))
-    or
-    getConfig(state).isSource(source) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isSink(Node sink) { none() }
-
-  predicate isSink(Node sink, FlowState state) {
-    getConfig(state).isSink(sink, getState(state))
-    or
-    getConfig(state).isSink(sink) and getState(state) instanceof FlowStateEmpty
-  }
-
-  predicate isBarrier(Node node) { none() }
-
-  predicate isBarrier(Node node, FlowState state) {
-    getConfig(state).isBarrier(node, getState(state)) or
-    getConfig(state).isBarrier(node)
-  }
-
-  predicate isBarrierIn(Node node) { any(Configuration config).isBarrierIn(node) }
-
-  predicate isBarrierOut(Node node) { any(Configuration config).isBarrierOut(node) }
-
-  predicate isBarrierIn(Node node, FlowState state) { none() }
-
-  predicate isBarrierOut(Node node, FlowState state) { none() }
-
-  predicate isAdditionalFlowStep(Node node1, Node node2, string model) {
-    singleConfiguration() and
-    any(Configuration config).isAdditionalFlowStep(node1, node2) and
-    model = ""
-  }
-
-  predicate isAdditionalFlowStep(
-    Node node1, FlowState state1, Node node2, FlowState state2, string model
-  ) {
-    getConfig(state1).isAdditionalFlowStep(node1, getState(state1), node2, getState(state2)) and
-    getConfig(state2) = getConfig(state1) and
-    model = ""
-    or
-    not singleConfiguration() and
-    getConfig(state1).isAdditionalFlowStep(node1, node2) and
-    state2 = state1 and
-    model = ""
-  }
-
-  predicate allowImplicitRead(Node node, ContentSet c) {
-    any(Configuration config).allowImplicitRead(node, c)
-  }
-
-  predicate neverSkip(Node node) { none() }
-
-  int fieldFlowBranchLimit() { result = min(any(Configuration config).fieldFlowBranchLimit()) }
-
-  int accessPathLimit() { result = 5 }
-
-  FlowFeature getAFeature() { result = any(Configuration config).getAFeature() }
-
-  predicate includeHiddenNodes() { any(Configuration config).includeHiddenNodes() }
-
-  predicate observeDiffInformedIncrementalMode() { none() }
-}
-
-deprecated private import Impl<Config> as I
-
-/**
- * A `Node` augmented with a call context (except for sinks), an access path, and a configuration.
- * Only those `PathNode`s that are reachable from a source, and which can reach a sink, are generated.
- */
-deprecated class PathNode instanceof I::PathNode {
-  /** Gets a textual representation of this element. */
-  final string toString() { result = super.toString() }
-
-  /**
-   * Gets a textual representation of this element, including a textual
-   * representation of the call context.
-   */
-  final string toStringWithContext() { result = super.toStringWithContext() }
-
-  /**
-   * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
-   * For more information, see
-   * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
-   */
-  final predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    super.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-
-  /** Gets the underlying `Node`. */
-  final Node getNode() { result = super.getNode() }
-
-  /** Gets the `FlowState` of this node. */
-  deprecated final FlowState getState() { result = getState(super.getState()) }
-
-  /** Gets the associated configuration. */
-  deprecated final Configuration getConfiguration() { result = getConfig(super.getState()) }
-
-  /** Gets a successor of this node, if any. */
-  final PathNode getASuccessor() { result = super.getASuccessor() }
-
-  /** Holds if this node is a source. */
-  final predicate isSource() { super.isSource() }
-
-  /** Holds if this node is a grouping of source nodes. */
-  final predicate isSourceGroup(string group) { super.isSourceGroup(group) }
-
-  /** Holds if this node is a grouping of sink nodes. */
-  final predicate isSinkGroup(string group) { super.isSinkGroup(group) }
-}
-
-deprecated module PathGraph = I::PathGraph;
-
-deprecated private predicate hasFlow(Node source, Node sink, Configuration config) {
-  exists(PathNode source0, PathNode sink0 |
-    hasFlowPath(source0, sink0, config) and
-    source0.getNode() = source and
-    sink0.getNode() = sink
-  )
-}
-
-deprecated private predicate hasFlowPath(PathNode source, PathNode sink, Configuration config) {
-  I::flowPath(source, sink) and source.getConfiguration() = config
-}
-
-deprecated private predicate hasFlowTo(Node sink, Configuration config) { hasFlow(_, sink, config) }
-
-deprecated predicate flowsTo = hasFlow/3;
diff --git a/swift/ql/lib/codeql/swift/dataflow/internal/tainttracking1/TaintTrackingImpl.qll b/swift/ql/lib/codeql/swift/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
deleted file mode 100644
index 75e7856fd26..00000000000
--- a/swift/ql/lib/codeql/swift/dataflow/internal/tainttracking1/TaintTrackingImpl.qll
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * Provides an implementation of global (interprocedural) taint tracking.
- * This file re-exports the local (intraprocedural) taint-tracking analysis
- * from `TaintTrackingParameter::Public` and adds a global analysis, mainly
- * exposed through the `Configuration` class. For some languages, this file
- * exists in several identical copies, allowing queries to use multiple
- * `Configuration` classes that depend on each other without introducing
- * mutual recursion among those configurations.
- */
-
-import TaintTrackingParameter::Public
-private import TaintTrackingParameter::Private
-
-/**
- * DEPRECATED: Use `Global` and `GlobalWithState` instead.
- *
- * A configuration of interprocedural taint tracking analysis. This defines
- * sources, sinks, and any other configurable aspect of the analysis. Each
- * use of the taint tracking library must define its own unique extension of
- * this abstract class.
- *
- * A taint-tracking configuration is a special data flow configuration
- * (`DataFlow::Configuration`) that allows for flow through nodes that do not
- * necessarily preserve values but are still relevant from a taint tracking
- * perspective. (For example, string concatenation, where one of the operands
- * is tainted.)
- *
- * To create a configuration, extend this class with a subclass whose
- * characteristic predicate is a unique singleton string. For example, write
- *
- * ```ql
- * class MyAnalysisConfiguration extends TaintTracking::Configuration {
- *   MyAnalysisConfiguration() { this = "MyAnalysisConfiguration" }
- *   // Override `isSource` and `isSink`.
- *   // Optionally override `isSanitizer`.
- *   // Optionally override `isSanitizerIn`.
- *   // Optionally override `isSanitizerOut`.
- *   // Optionally override `isSanitizerGuard`.
- *   // Optionally override `isAdditionalTaintStep`.
- * }
- * ```
- *
- * Then, to query whether there is flow between some `source` and `sink`,
- * write
- *
- * ```ql
- * exists(MyAnalysisConfiguration cfg | cfg.hasFlow(source, sink))
- * ```
- *
- * Multiple configurations can coexist, but it is unsupported to depend on
- * another `TaintTracking::Configuration` or a `DataFlow::Configuration` in the
- * overridden predicates that define sources, sinks, or additional steps.
- * Instead, the dependency should go to a `TaintTracking2::Configuration` or a
- * `DataFlow2::Configuration`, `DataFlow3::Configuration`, etc.
- */
-abstract deprecated class Configuration extends DataFlow::Configuration {
-  bindingset[this]
-  Configuration() { any() }
-
-  /**
-   * Holds if `source` is a relevant taint source.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source) { none() }
-
-  /**
-   * Holds if `source` is a relevant taint source with the given initial
-   * `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSource(DataFlow::Node source, DataFlow::FlowState state) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink) { none() }
-
-  /**
-   * Holds if `sink` is a relevant taint sink accepting `state`.
-   *
-   * The smaller this predicate is, the faster `hasFlow()` will converge.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate isSink(DataFlow::Node sink, DataFlow::FlowState state) { none() }
-
-  /** Holds if the node `node` is a taint sanitizer. */
-  predicate isSanitizer(DataFlow::Node node) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node) {
-    this.isSanitizer(node) or
-    defaultTaintSanitizer(node)
-  }
-
-  /**
-   * Holds if the node `node` is a taint sanitizer when the flow state is
-   * `state`.
-   */
-  predicate isSanitizer(DataFlow::Node node, DataFlow::FlowState state) { none() }
-
-  final override predicate isBarrier(DataFlow::Node node, DataFlow::FlowState state) {
-    this.isSanitizer(node, state)
-  }
-
-  /** Holds if taint propagation into `node` is prohibited. */
-  predicate isSanitizerIn(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierIn(DataFlow::Node node) { this.isSanitizerIn(node) }
-
-  /** Holds if taint propagation out of `node` is prohibited. */
-  predicate isSanitizerOut(DataFlow::Node node) { none() }
-
-  final override predicate isBarrierOut(DataFlow::Node node) { this.isSanitizerOut(node) }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   */
-  predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) { none() }
-
-  final override predicate isAdditionalFlowStep(DataFlow::Node node1, DataFlow::Node node2) {
-    this.isAdditionalTaintStep(node1, node2) or
-    defaultAdditionalTaintStep(node1, node2, _)
-  }
-
-  /**
-   * Holds if taint may propagate from `node1` to `node2` in addition to the normal data-flow and taint steps.
-   * This step is only applicable in `state1` and updates the flow state to `state2`.
-   */
-  predicate isAdditionalTaintStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    none()
-  }
-
-  final override predicate isAdditionalFlowStep(
-    DataFlow::Node node1, DataFlow::FlowState state1, DataFlow::Node node2,
-    DataFlow::FlowState state2
-  ) {
-    this.isAdditionalTaintStep(node1, state1, node2, state2)
-  }
-
-  override predicate allowImplicitRead(DataFlow::Node node, DataFlow::ContentSet c) {
-    (
-      this.isSink(node) or
-      this.isSink(node, _) or
-      this.isAdditionalTaintStep(node, _) or
-      this.isAdditionalTaintStep(node, _, _, _)
-    ) and
-    defaultImplicitTaintRead(node, c)
-  }
-
-  /**
-   * Holds if taint may flow from `source` to `sink` for this configuration.
-   */
-  // overridden to provide taint-tracking specific qldoc
-  override predicate hasFlow(DataFlow::Node source, DataFlow::Node sink) {
-    super.hasFlow(source, sink)
-  }
-}
diff --git a/swift/ql/lib/codeql/swift/dataflow/internal/tainttracking1/TaintTrackingParameter.qll b/swift/ql/lib/codeql/swift/dataflow/internal/tainttracking1/TaintTrackingParameter.qll
deleted file mode 100644
index 1cd9cab0e54..00000000000
--- a/swift/ql/lib/codeql/swift/dataflow/internal/tainttracking1/TaintTrackingParameter.qll
+++ /dev/null
@@ -1,7 +0,0 @@
-import codeql.swift.dataflow.internal.TaintTrackingPublic as Public
-
-module Private {
-  import codeql.swift.dataflow.DataFlow::DataFlow as DataFlow
-  import codeql.swift.dataflow.internal.DataFlowImpl as DataFlowInternal
-  import codeql.swift.dataflow.internal.TaintTrackingPrivate
-}
diff --git a/swift/ql/test/library-tests/dataflow/capture/FlowInline.expected b/swift/ql/test/library-tests/dataflow/capture/FlowInline.expected
index 48de9172b36..e69de29bb2d 100644
--- a/swift/ql/test/library-tests/dataflow/capture/FlowInline.expected
+++ b/swift/ql/test/library-tests/dataflow/capture/FlowInline.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/swift/ql/test/library-tests/dataflow/dataflow/DataFlowInline.expected b/swift/ql/test/library-tests/dataflow/dataflow/DataFlowInline.expected
index 48de9172b36..e69de29bb2d 100644
--- a/swift/ql/test/library-tests/dataflow/dataflow/DataFlowInline.expected
+++ b/swift/ql/test/library-tests/dataflow/dataflow/DataFlowInline.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/swift/ql/test/library-tests/dataflow/flowsources/FlowSourcesInline.expected b/swift/ql/test/library-tests/dataflow/flowsources/FlowSourcesInline.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/swift/ql/test/library-tests/dataflow/flowsources/FlowSourcesInline.expected
+++ b/swift/ql/test/library-tests/dataflow/flowsources/FlowSourcesInline.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/swift/ql/test/library-tests/dataflow/taint/core/TaintInline.expected b/swift/ql/test/library-tests/dataflow/taint/core/TaintInline.expected
index 48de9172b36..e69de29bb2d 100644
--- a/swift/ql/test/library-tests/dataflow/taint/core/TaintInline.expected
+++ b/swift/ql/test/library-tests/dataflow/taint/core/TaintInline.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/swift/ql/test/library-tests/dataflow/taint/libraries/TaintInline.expected b/swift/ql/test/library-tests/dataflow/taint/libraries/TaintInline.expected
index 48de9172b36..e69de29bb2d 100644
--- a/swift/ql/test/library-tests/dataflow/taint/libraries/TaintInline.expected
+++ b/swift/ql/test/library-tests/dataflow/taint/libraries/TaintInline.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/swift/ql/test/library-tests/regex/regex.expected b/swift/ql/test/library-tests/regex/regex.expected
index 8ec8033d086..e69de29bb2d 100644
--- a/swift/ql/test/library-tests/regex/regex.expected
+++ b/swift/ql/test/library-tests/regex/regex.expected
@@ -1,2 +0,0 @@
-testFailures
-failures
diff --git a/swift/ql/test/query-tests/Security/CWE-022/PathInjection/PathInjectionTest.expected b/swift/ql/test/query-tests/Security/CWE-022/PathInjection/PathInjectionTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/swift/ql/test/query-tests/Security/CWE-022/PathInjection/PathInjectionTest.expected
+++ b/swift/ql/test/query-tests/Security/CWE-022/PathInjection/PathInjectionTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/swift/ql/test/query-tests/Security/CWE-312/CleartextLoggingTest.expected b/swift/ql/test/query-tests/Security/CWE-312/CleartextLoggingTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/swift/ql/test/query-tests/Security/CWE-312/CleartextLoggingTest.expected
+++ b/swift/ql/test/query-tests/Security/CWE-312/CleartextLoggingTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/swift/ql/test/query-tests/Security/CWE-611/XXETest.expected b/swift/ql/test/query-tests/Security/CWE-611/XXETest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/swift/ql/test/query-tests/Security/CWE-611/XXETest.expected
+++ b/swift/ql/test/query-tests/Security/CWE-611/XXETest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures
diff --git a/swift/ql/test/query-tests/Security/CWE-946/PredicateInjectionTest.expected b/swift/ql/test/query-tests/Security/CWE-946/PredicateInjectionTest.expected
index 48de9172b36..e69de29bb2d 100644
--- a/swift/ql/test/query-tests/Security/CWE-946/PredicateInjectionTest.expected
+++ b/swift/ql/test/query-tests/Security/CWE-946/PredicateInjectionTest.expected
@@ -1,2 +0,0 @@
-failures
-testFailures